VimPlug/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-12-07 04:34:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Centralize filename extraction in :Gstatus

Browse Source 
This encapsulates some of the logic that will need to be updated to
solve #228.
This commit is contained in:
Tim Pope
2012-07-16 18:10:27 -04:00
parent d1971558b5
commit 745ccf5066
1 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
plugin/fugitive.vim
View File

@@ -679,19 +679,20 @@ function! fugitive#reload_status() abort
endfor endfor
endfunction endfunction
function! s:stage_section(lnum) abort function! s:stage_info(lnum) abort
let filename = matchstr(getline(a:lnum),'^#\t\zs.\{-\}\ze\%( (new commits)\)\=$')
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) ==# '# Changes to be committed:'
return 'staged' return [matchstr(filename, ': *\zs.*'), 'staged']
elseif getline(lnum) ==# '# Untracked files:' elseif getline(lnum) ==# '# Untracked files:'
return 'untracked' return [filename, 'untracked']
else else
return 'unstaged' return [matchstr(filename, ': *\zs.*'), 'unstaged']
endif endif
endfunction endfunction
@@ -708,14 +709,12 @@ function! s:StageReloadSeek(target,lnum1,lnum2)
endfunction endfunction
function! s:StageDiff(diff) abort function! s:StageDiff(diff) abort
let section = s:stage_section(line('.')) let [filename, section] = s:stage_info(line('.'))
let line = getline('.')
let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (new commits)\)\=$')
if filename ==# '' && section ==# 'staged' if filename ==# '' && section ==# 'staged'
return 'Git! diff --cached' return 'Git! diff --cached'
elseif filename ==# '' elseif filename ==# ''
return 'Git! diff' return 'Git! diff'
elseif line =~# '^#\trenamed:' && filename =~# ' -> ' elseif filename =~# ' -> '
let [old, new] = split(filename,' -> ') let [old, new] = split(filename,' -> ')
execute 'Gedit '.s:fnameescape(':0:'.new) execute 'Gedit '.s:fnameescape(':0:'.new)
return a:diff.' HEAD:'.s:fnameescape(old) return a:diff.' HEAD:'.s:fnameescape(old)
@@ -729,9 +728,7 @@ function! s:StageDiff(diff) abort
endfunction endfunction
function! s:StageDiffEdit() abort function! s:StageDiffEdit() abort
let section = s:stage_section(line('.')) let [filename, section] = s:stage_info(line('.'))
let line = getline('.')
let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (new commits)\)\=$')
let arg = (filename ==# '' ? '.' : filename) let arg = (filename ==# '' ? '.' : filename)
if section ==# 'staged' if section ==# 'staged'
return 'Git! diff --cached '.s:shellesc(arg) return 'Git! diff --cached '.s:shellesc(arg)
@@ -757,10 +754,9 @@ function! s:StageToggle(lnum1,lnum2) abort
try try
let output = '' let output = ''
for lnum in range(a:lnum1,a:lnum2) for lnum in range(a:lnum1,a:lnum2)
let line = getline(lnum) let [filename, section] = s:stage_info(lnum)
let repo = s:repo() let repo = s:repo()
if line =~# '^# .*:$' if getline('.') =~# '^# .*:$'
let section = s:stage_section(lnum)
if section ==# 'staged' if section ==# 'staged'
call repo.git_chomp_in_tree('reset','-q') call repo.git_chomp_in_tree('reset','-q')
silent! edit! silent! edit!
@@ -785,7 +781,6 @@ function! s:StageToggle(lnum1,lnum2) abort
return '' return ''
endif endif
endif endif
let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (\a\+ [[:alpha:], ]\+)\)\=$')
if filename ==# '' if filename ==# ''
continue continue
endif endif
@@ -793,13 +788,12 @@ function! s:StageToggle(lnum1,lnum2) abort
let first_filename = filename let first_filename = filename
endif endif
execute lnum execute lnum
let section = s:stage_section(line('.')) if filename =~ ' -> '
if line =~# '^#\trenamed:' && filename =~ ' -> '
let cmd = ['mv','--'] + reverse(split(filename,' -> ')) let cmd = ['mv','--'] + reverse(split(filename,' -> '))
let filename = cmd[-1] let filename = cmd[-1]
elseif section ==# 'staged' elseif section ==# 'staged'
let cmd = ['reset','-q','--',filename] let cmd = ['reset','-q','--',filename]
elseif line =~# '^#\tdeleted:' elseif getline(lnum) =~# '^#\tdeleted:'
let cmd = ['rm','--',filename] let cmd = ['rm','--',filename]
else else
let cmd = ['add','--',filename] let cmd = ['add','--',filename]
@@ -821,26 +815,25 @@ function! s:StagePatch(lnum1,lnum2) abort
let reset = [] let reset = []
for lnum in range(a:lnum1,a:lnum2) for lnum in range(a:lnum1,a:lnum2)
let line = getline(lnum) let [filename, section] = s:stage_info(lnum)
if line ==# '# Changes to be committed:' if getline('.') =~# '^# .*:$' && section ==# 'staged'
return 'Git reset --patch' return 'Git reset --patch'
elseif line =~# '^# Change\%(d but not updated\|s not staged for commit\):$' elseif getline('.') =~# '^# .*:$' && section ==# 'unstaged'
return 'Git add --patch' return 'Git add --patch'
endif elseif getline('.') =~# '^# .*:$' && section ==# 'untracked'
let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (new commits)\)\=$') return 'Git add -N .'
if filename ==# '' elseif filename ==# ''
continue continue
endif endif
if !exists('first_filename') if !exists('first_filename')
let first_filename = filename let first_filename = filename
endif endif
execute lnum execute lnum
let section = s:stage_section(line('.')) if filename =~ ' -> '
if line =~# '^#\trenamed:' && filename =~ ' -> '
let reset += [split(filename,' -> ')[1]] let reset += [split(filename,' -> ')[1]]
elseif section ==# 'staged' elseif section ==# 'staged'
let reset += [filename] let reset += [filename]
elseif line !~# '^#\tdeleted:' elseif getline(lnum) !~# '^#\tdeleted:'
let add += [filename] let add += [filename]
endif endif
endfor endfor