m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 05:13:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support localized git status

Browse Source 
Closes #228.
This commit is contained in:
Tim Pope
2012-07-28 11:54:52 -04:00
parent 745ccf5066
commit b0c74e2289
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugin/fugitive.vim
View File

@@ -67,7 +67,7 @@ endfunction
function! s:recall() function! s:recall()
let rev = s:sub(s:buffer().rev(), '^/', '') let rev = s:sub(s:buffer().rev(), '^/', '')
if rev ==# ':' if rev ==# ':'
return matchstr(getline('.'),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (new commits)\)\=$\|^\d\{6} \x\{40\} \d\t\zs.*') return matchstr(getline('.'),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$\|^\d\{6} \x\{40\} \d\t\zs.*')
endif endif
return rev return rev
endfunction endfunction
@@ -680,19 +680,19 @@ function! fugitive#reload_status() abort
endfunction endfunction
function! s:stage_info(lnum) abort function! s:stage_info(lnum) abort
let filename = matchstr(getline(a:lnum),'^#\t\zs.\{-\}\ze\%( (new commits)\)\=$') let filename = matchstr(getline(a:lnum),'^#\t\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
let lnum = a:lnum let lnum = a:lnum
while lnum && getline(lnum) !~# '^#.*:$' while lnum && getline(lnum) !~# '^#.*:$'
let lnum -= 1 let lnum -= 1
endwhile endwhile
if !lnum if !lnum
return ['', ''] return ['', '']
elseif getline(lnum) ==# '# Changes to be committed:' elseif getline(lnum+1) =~# '^#.*"git \%(reset\|rm --cached\) '
return [matchstr(filename, ': *\zs.*'), 'staged'] return [matchstr(filename, ': *\zs.*'), 'staged']
elseif getline(lnum) ==# '# Untracked files:' elseif getline(lnum+2) =~# '^#.*"git checkout '
return [filename, 'untracked']
else
return [matchstr(filename, ': *\zs.*'), 'unstaged'] return [matchstr(filename, ': *\zs.*'), 'unstaged']
else
return [filename, 'untracked']
endif endif
endfunction endfunction
@@ -705,7 +705,7 @@ function! s:StageReloadSeek(target,lnum1,lnum2)
silent! edit! silent! edit!
1 1
redraw redraw
call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.jump.'\%( (new commits)\)\=\$','W') call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.jump.'\%( ([^()[:digit:]]\+)\)\=\$','W')
endfunction endfunction
function! s:StageDiff(diff) abort function! s:StageDiff(diff) abort
@@ -738,7 +738,7 @@ function! s:StageDiffEdit() abort
if arg ==# '.' if arg ==# '.'
silent! edit! silent! edit!
1 1
if !search('^# Change\%(d but not updated\|s not staged for commit\):$','W') if !search('^# .*:\n#.*\n#.*"git checkout ','W')
call search('^# .*:$','W') call search('^# .*:$','W')
endif endif
else else
@@ -761,7 +761,7 @@ function! s:StageToggle(lnum1,lnum2) abort
call repo.git_chomp_in_tree('reset','-q') call repo.git_chomp_in_tree('reset','-q')
silent! edit! silent! edit!
1 1
if !search('^# Untracked files:$','W') if !search('^# .*:\n#.*"git add .*\n#\n','W')
call search('^# .*:$','W') call search('^# .*:$','W')
endif endif
return '' return ''
@@ -769,7 +769,7 @@ function! s:StageToggle(lnum1,lnum2) abort
call repo.git_chomp_in_tree('add','-u') call repo.git_chomp_in_tree('add','-u')
silent! edit! silent! edit!
1 1
if !search('^# Untracked files:$','W') if !search('^# .*:\n#.*"git add .*\n#\n','W')
call search('^# .*:$','W') call search('^# .*:$','W')
endif endif
return '' return ''
@@ -795,8 +795,10 @@ function! s:StageToggle(lnum1,lnum2) abort
let cmd = ['reset','-q','--',filename] let cmd = ['reset','-q','--',filename]
elseif getline(lnum) =~# '^#\tdeleted:' elseif getline(lnum) =~# '^#\tdeleted:'
let cmd = ['rm','--',filename] let cmd = ['rm','--',filename]
else elseif getline(lnum) =~# '^#\tmodified:'
let cmd = ['add','--',filename] let cmd = ['add','--',filename]
else
let cmd = ['add','-A','--',filename]
endif endif
let output .= call(repo.git_chomp_in_tree,cmd,s:repo())."\n" let output .= call(repo.git_chomp_in_tree,cmd,s:repo())."\n"
endfor endfor
@@ -848,7 +850,7 @@ function! s:StagePatch(lnum1,lnum2) abort
silent! edit! silent! edit!
1 1
redraw redraw
call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.first_filename.'\%( (new commits)\)\=\$','W') call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.first_filename.'\%( ([^()[:digit:]]\+)\)\=\$','W')
endif endif
catch /^fugitive:/ catch /^fugitive:/
return 'echoerr v:errmsg' return 'echoerr v:errmsg'
@@ -2273,7 +2275,7 @@ function! s:GF(mode) abort
let file = '/'.matchstr(getline('.'),' -> \zs.*') let file = '/'.matchstr(getline('.'),' -> \zs.*')
return s:Edit(a:mode,0,file) return s:Edit(a:mode,0,file)
elseif getline('.') =~# '^#\t[[:alpha:] ]\+: *.' elseif getline('.') =~# '^#\t[[:alpha:] ]\+: *.'
let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( (new commits)\)\=$') let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
return s:Edit(a:mode,0,file) return s:Edit(a:mode,0,file)
elseif getline('.') =~# '^#\t.' elseif getline('.') =~# '^#\t.'
let file = '/'.matchstr(getline('.'),'#\t\zs.*') let file = '/'.matchstr(getline('.'),'#\t\zs.*')