Changeset 7112 for dotfiles/vim

Timestamp:

02/25/08 02:38:17 (5 years ago)

Author:

kana

Message:

dotfiles/vim/kana:
* Fix incorrect {rhs} for "t'z".
* Revise the placement of s:SID_PREFIX().
* Add s:vcs_branch_name().
* Modify 'tabline' to show s:vcs_branch_name().

Files:

• dotfiles/vim/kana/dot.vimrc (modified) (7 diffs)

dotfiles/vim/kana/dot.vimrc

@@ -83 +83 @@
 
 set nocompatible  " to use many extensions of Vim.
+
+
+function! s:SID_PREFIX()
+ return matchstr(expand('<sfile>'), '<SNR>\d\+_')
+endfunction
 
 
@@ -192 +197 @@
 set viminfo=<50,'10,h,r/a,n~/.viminfo
 
-function! s:SID_PREFIX()
- return matchstr(expand('<sfile>'), '<SNR>\d\+_')
-endfunction
-
 " default 'statusline' with 'fileencoding'.
 let &statusline = ''
@@ -201 +202 @@
 let &statusline .= '%='
   "" temporary disabled.
-  "let &statusline .= '(%{' . s:SID_PREFIX() . 'ReposBranch(getcwd())}) '
+  "let &statusline .= '(%{' . s:SID_PREFIX() . 'vcs_branch_name(getcwd())}) '
 let &statusline .= '[%{&fileencoding == "" ? &encoding : &fileencoding}]'
 let &statusline .= '  %-14.(%l,%c%V%) %P'
@@ -229 +230 @@
 
   let s .= '%#TabLineFill#%T'
-  let s .= '%=%#TabLine#%999Xx%X'
+  let s .= '%=%#TabLine#'
+  let branch_name = s:vcs_branch_name(getcwd())
+  if branch_name != ''
+    let s .= '(' . branch_name . ') '
+  endif
+  let s .= '%999Xx%X'
   return s
 endfunction "}}}
@@ -649 +655 @@
 
 
+" VCS branch name  "{{{2
+" Returns the name of the current branch of the given directory.
+" BUGS: git is only supported.
+let s:_vcs_branch_name_cache = {}  " dir_path = [branch_name, key_file_mtime]
+
+
+function! s:vcs_branch_name(dir)
+  let cache_entry = get(s:_vcs_branch_name_cache, a:dir, 0)
+  if cache_entry is 0
+   \ || cache_entry[1] < getftime(s:_vcs_branch_name_key_file(a:dir))
+    unlet cache_entry
+    let cache_entry = s:_vcs_branch_name(a:dir)
+    let s:_vcs_branch_name_cache[a:dir] = cache_entry
+  endif
+
+  return cache_entry[0]
+endfunction
+
+
+function! s:_vcs_branch_name_key_file(dir)
+  return a:dir . '/.git/HEAD'
+endfunction
+
+
+function! s:_vcs_branch_name(dir)
+  let head_file = s:_vcs_branch_name_key_file(a:dir)
+  let branch_name = ''
+
+  if filereadable(head_file)
+    let ref_info = s:first_line(head_file)
+    if ref_info =~ '^\x\{40}$'
+      let remote_branches = split(glob(a:dir . '/.git/refs/remotes/*'), "\n")
+      call filter(remote_branches, 's:first_line(v:val) ==# ref_info')
+      if 1 <= len(remote_branches)
+        let branch_name = matchlist(remote_branches[0], '/\([^/]*\)$')[1]
+      endif
+    else
+      let branch_name = matchlist(ref_info, '^ref: refs/heads/\(\S\+\)$')[1]
+      if branch_name == ''
+        let branch_name = ref_info
+      endif
+    endif
+  endif
+
+  return [branch_name, getftime(head_file)]
+endfunction
+
+
+
+
 " Misc.  "{{{2
 
@@ -781 +837 @@
 
 
-" Returns the name of the current branch of the given directory.
-" BUGS: git is only supported.
-function! s:ReposBranch(dir)
-  let head_file = a:dir . '/.git/HEAD'
-  let branch_name = '?'
-
-  if filereadable(head_file)
-    let ref_info = s:first_line(head_file)
-    if ref_info =~ '^\x\{40}$'
-      let remote_branches = split(glob(a:dir . '/.git/refs/remotes/*'), "\n")
-      call filter(remote_branches, 's:first_line(v:val) ==# ref_info')
-      if 1 <= len(remote_branches)
-        let branch_name = matchlist(remote_branches[0], '/\([^/]*\)$')[1]
-      endif
-    else
-      let branch_name = matchlist(ref_info, '^ref: refs/heads/\(\S\+\)$')[1]
-      if branch_name == ''
-        let branch_name = ref_info
-      endif
-    endif
-  endif
-
-  return branch_name
-endfunction
-
-
 function! s:first_line(file)
   let lines = readfile(a:file, '', 1)
@@ -867 +897 @@
 " BUGS: t'' is not related to the default meaning of ''.
 nnoremap <silent> t'c        :<C-u>pclose<Return>
-nmap              t'z        t'z
+nmap              t'z        t'c
 nmap              t''        t'c