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

Fix jump after dp on untracked file

Browse Source
This commit is contained in:
Tim Pope
2011-08-21 13:45:21 -04:00
parent c2569c5de4
commit a09263f9d0
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
plugin/fugitive.vim
View File

@@ -576,6 +576,18 @@ function! fugitive#reload_status() abort
endfor endfor
endfunction endfunction
function! s:StageReloadSeek(target,lnum1,lnum2)
let jump = a:target
let f = matchstr(getline(a:lnum1-1),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.*')
if f !=# '' | let jump = f | endif
let f = matchstr(getline(a:lnum2+1),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.*')
if f !=# '' | let jump = f | endif
silent! edit!
1
redraw
call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.jump.'\%( (new commits)\)\=\$','W')
endfunction
function! s:StageDiff(diff) abort function! s:StageDiff(diff) abort
let section = getline(search('^# .*:$','bcnW')) let section = getline(search('^# .*:$','bcnW'))
let line = getline('.') let line = getline('.')
@@ -601,13 +613,24 @@ function! s:StageDiffEdit() abort
let section = getline(search('^# .*:$','bcnW')) let section = getline(search('^# .*:$','bcnW'))
let line = getline('.') let line = getline('.')
let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (new commits)\)\=$') let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (new commits)\)\=$')
let args = (filename ==# '' ? '.' : s:shellesc(filename)) let arg = (filename ==# '' ? '.' : filename)
if section ==# '# Changes to be committed:' if section ==# '# Changes to be committed:'
return 'Git! diff --cached '.args return 'Git! diff --cached '.s:shellesc(arg)
elseif section ==# '# Untracked files:' elseif section ==# '# Untracked files:'
return 'Git add -N '.args let repo = s:repo()
call repo.git_chomp_in_tree('add','--intent-to-add',arg)
if arg ==# '.'
silent! edit!
1
if !search('^# Change\%(d but not updated\|s not staged for commit\):$','W')
call search('^# Change','W')
endif
else else
return 'Git! diff '.args call s:StageReloadSeek(arg,line('.'),line('.'))
endif
return ''
else
return 'Git! diff '.s:shellesc(arg)
endif endif
endfunction endfunction
@@ -634,13 +657,10 @@ function! s:StageToggle(lnum1,lnum2) abort
endif endif
return '' return ''
elseif line ==# '# Untracked files:' elseif line ==# '# Untracked files:'
" Work around Vim parser idiosyncrasy call repo.git_chomp_in_tree('add','.')
call repo.git_chomp_in_tree('add','-N','.')
silent! edit! silent! edit!
1 1
if !search('^# Change\%(d but not updated\|s not staged for commit\):$','W')
call search('^# Change','W') call search('^# Change','W')
endif
return '' return ''
endif endif
let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (\a\+ [[:alpha:], ]\+)\)\=$') let filename = matchstr(line,'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( (\a\+ [[:alpha:], ]\+)\)\=$')
@@ -665,15 +685,7 @@ function! s:StageToggle(lnum1,lnum2) abort
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
if exists('first_filename') if exists('first_filename')
let jump = first_filename call s:StageReloadSeek(first_filename,a:lnum1,a:lnum2)
let f = matchstr(getline(a:lnum1-1),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.*')
if f !=# '' | let jump = f | endif
let f = matchstr(getline(a:lnum2+1),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.*')
if f !=# '' | let jump = f | endif
silent! edit!
1
redraw
call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.jump.'\%( (new commits)\)\=\$','W')
endif endif
echo s:sub(s:gsub(output,'\n+','\n'),'\n$','') echo s:sub(s:gsub(output,'\n+','\n'),'\n$','')
catch /^fugitive:/ catch /^fugitive:/