vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Open :Gstatus for :Gcommit -i and :Gcommit -p

Browse Source
This commit is contained in:
Tim Pope 2019-08-08 17:41:40 -04:00
parent f0acf3e883
commit 8227503714
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
autoload/fugitive.vim
View File

@ -2245,7 +2245,8 @@ function! s:StatusCommand(line1, line2, range, count, bang, mods, reg, arg, args
exe winnr . 'wincmd w' exe winnr . 'wincmd w'
endif endif
let w:fugitive_status = dir let w:fugitive_status = dir
return 1 1
return ''
endif endif
endfor endfor
if a:count ==# 0 if a:count ==# 0
@ -3228,6 +3229,16 @@ endfunction
" Section: :Gcommit, :Grevert " Section: :Gcommit, :Grevert
function! s:CommitInteractive(line1, line2, range, bang, mods, args, patch) abort
let status = s:StatusCommand(a:line1, a:line2, a:range, a:line2, a:bang, a:mods, '', '', [])
let status = len(status) ? status . '|' : ''
if a:patch
return status . 'if search("^Unstaged")|exe "+"|endif'
else
return status . 'if search("^Untracked\\|^Unstaged")|exe "+"|endif'
endif
endfunction
function! s:CommitSubcommand(line1, line2, range, bang, mods, args, ...) abort function! s:CommitSubcommand(line1, line2, range, bang, mods, args, ...) abort
let mods = substitute(s:Mods(a:mods), '\C\<tab\>', '-tab', 'g') let mods = substitute(s:Mods(a:mods), '\C\<tab\>', '-tab', 'g')
let dir = a:0 ? a:1 : s:Dir() let dir = a:0 ? a:1 : s:Dir()
@ -3256,16 +3267,14 @@ function! s:CommitSubcommand(line1, line2, range, bang, mods, args, ...) abort
endif endif
endwhile endwhile
let command .= s:UserCommand(dir) . ' commit ' . s:shellesc(argv) let command .= s:UserCommand(dir) . ' commit ' . s:shellesc(argv)
if s:HasOpt(argv, '-i', '--interactive', '-p', '--patch') && &shell !~# 'csh' if (&autowrite || &autowriteall) && !a:0
let errorfile = tempname() silent! wall
noautocmd execute '!'.command.' 2> '.errorfile endif
let errors = readfile(errorfile) if s:HasOpt(argv, '-i', '--interactive')
let exec_error = v:shell_error return s:CommitInteractive(a:line1, a:line2, a:range, a:bang, a:mods, argv, 0)
call delete(errorfile) elseif s:HasOpt(argv, '-p', '--patch')
return s:CommitInteractive(a:line1, a:line2, a:range, a:bang, a:mods, argv, 1)
else else
if (&autowrite || &autowriteall) && !a:0
silent! wall
endif
let [error_string, exec_error] = s:TempCmd(outfile, command) let [error_string, exec_error] = s:TempCmd(outfile, command)
let errors = split(error_string, "\n") let errors = split(error_string, "\n")
endif endif