Changeset 7152 for dotfiles/vim/kana

Timestamp:

02/26/08 02:59:53 (9 months ago)

Author:

kana

Message:

dotfiles/vim/kana:
* s:_vcs_branch_name():

• Fix the bug that the name of some remote branches weren't correctly gotten.
  
• Revise the style of output for remote branches.
  

* 'tabline': Revise the style.

Files:

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

dotfiles/vim/kana/dot.vimrc

@@ -231 +231 @@
   let s .= '%#TabLineFill#%T'
   let s .= '%=%#TabLine#'
+  let s .= '| '
+  let s .= '%999X'
   let branch_name = s:vcs_branch_name(getcwd())
-  if branch_name != ''
-    let s .= '(' . branch_name . ') '
-  endif
-  let s .= '%999Xx%X'
+  let s .= (branch_name != '' ? branch_name : '?')
+  let s .= '%X'
   return s
 endfunction "}}}
@@ -686 +686 @@
     let ref_info = s:first_line(head_file)
     if ref_info =~ '^\x\{40}$'
-      let remote_branches = split(glob(a:dir . '/.git/refs/remotes/*'), "\n")
+      let remote_refs_dir = a:dir . '/.git/refs/remotes/'
+      let remote_branches = split(glob(remote_refs_dir . '**'), "\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]
+        let branch_name = 'remote: '. remote_branches[0][len(remote_refs_dir):]
       endif
     else