From 3bd69748c3dca574bc74ca9b68c3c63b81e96533 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Sat, 29 Feb 2020 19:29:43 -0500 Subject: [PATCH] Remove remaining :Gsubcmd calls from implementation --- autoload/fugitive.vim | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index c17c83f..4d0cdc2 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -1948,7 +1948,7 @@ function! fugitive#BufReadStatus() abort if &bufhidden ==# '' setlocal bufhidden=delete endif - let b:dispatch = ':Gfetch --all' + let b:dispatch = ':Git fetch --all' call fugitive#MapJumps() call s:Map('n', '-', ":execute Do('Toggle',0)", '') call s:Map('x', '-', ":execute Do('Toggle',1)", '') @@ -3722,7 +3722,7 @@ function! s:StagePatch(lnum1,lnum2) abort return s:ReloadStatus() endfunction -" Section: :Gcommit, :Grevert +" Section: :Git commit, :Git revert function! s:CommitInteractive(line1, line2, range, bang, mods, options, patch) abort let status = s:StatusCommand(a:line1, a:line2, a:range, a:line2, a:bang, a:mods, '', '', [], a:options.dir) @@ -3779,7 +3779,7 @@ function! fugitive#RevertComplete(A, L, P) abort return s:CompleteSub('revert', a:A, a:L, a:P, function('s:CompleteRevision')) endfunction -" Section: :Gmerge, :Grebase, :Gpull +" Section: :Git merge, :Git rebase, :Git pull function! fugitive#MergeComplete(A, L, P) abort return s:CompleteSub('merge', a:A, a:L, a:P, function('s:CompleteRevision')) @@ -4539,7 +4539,7 @@ function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, args) abor elseif expand('%:t') == 'COMMIT_EDITMSG' && $GIT_INDEX_FILE != '' return 'wq' elseif get(b:, 'fugitive_type', '') ==# 'index' - return 'Gcommit' + return 'Git commit' elseif &buftype ==# 'nowrite' && getline(4) =~# '^[+-]\{3\} ' return 'echoerr ' . string('fugitive: :Gwrite from :Git diff has been removed in favor of :Git add --edit') endif @@ -4677,7 +4677,7 @@ function! fugitive#WqCommand(...) abort endif endfunction -" Section: :Gpush, :Gfetch +" Section: :Git push, :Git fetch function! fugitive#PushComplete(A, L, P) abort return s:CompleteSub('push', a:A, a:L, a:P, function('s:CompleteRemote')) @@ -5072,7 +5072,7 @@ function! fugitive#DeleteCommand(line1, line2, range, bang, mods, arg, args) abo return s:Remove('bdelete', a:bang) endfunction -" Section: :Gblame +" Section: :Git blame function! s:Keywordprg() abort let args = ' --git-dir='.escape(s:Dir(),"\\\"' ") @@ -5556,7 +5556,7 @@ function! s:BlameFileType() abort call s:Map('n', '', ':help :Git_blame', '') call s:Map('n', 'g?', ':help :Git_blame', '') if mapcheck('q', 'n') =~# '^$\|bdelete' - call s:Map('n', 'q', ':exe BlameQuit()echohl WarningMsgecho ":Gblame q is deprecated in favor of gq"echohl NONE', '') + call s:Map('n', 'q', ':exe BlameQuit()echohl WarningMsgecho ":Git blame q is deprecated in favor of gq"echohl NONE', '') endif call s:Map('n', 'gq', ':exe BlameQuit()', '') call s:Map('n', '<2-LeftMouse>', ':exe BlameCommit("exe BlameLeave()edit")', '') @@ -5871,7 +5871,7 @@ endfunction function! fugitive#MapJumps(...) abort if !&modifiable if get(b:, 'fugitive_type', '') ==# 'blob' - let blame_map = 'Gblame=v:count ? " --reverse" : ""' + let blame_map = 'Git blame=v:count ? " --reverse" : ""' call s:Map('n', '<2-LeftMouse>', ':0,1' . blame_map, '') call s:Map('n', '', ':0,1' . blame_map, '') call s:Map('n', 'o', ':0,2' . blame_map, '') @@ -5935,15 +5935,15 @@ function! fugitive#MapJumps(...) abort nnoremap c :Git commit nnoremap cv :tab Git commit -v nnoremap cv :tab Git commit -v - nnoremap ca :Gcommit --amend - nnoremap cc :Gcommit - nnoremap ce :Gcommit --amend --no-edit - nnoremap cw :Gcommit --amend --only - nnoremap cva :tab Gcommit -v --amend - nnoremap cvc :tab Gcommit -v - nnoremap cRa :Gcommit --reset-author --amend - nnoremap cRe :Gcommit --reset-author --amend --no-edit - nnoremap cRw :Gcommit --reset-author --amend --only + nnoremap ca :Git commit --amend + nnoremap cc :Git commit + nnoremap ce :Git commit --amend --no-edit + nnoremap cw :Git commit --amend --only + nnoremap cva :tab Git commit -v --amend + nnoremap cvc :tab Git commit -v + nnoremap cRa :Git commit --reset-author --amend + nnoremap cRe :Git commit --reset-author --amend --no-edit + nnoremap cRw :Git commit --reset-author --amend --only nnoremap cf :Git commit --fixup==SquashArgument() nnoremap cF :Git rebase --autosquash=RebaseArgument()Git commit --fixup==SquashArgument() nnoremap cs :Git commit --no-edit --squash==SquashArgument() @@ -5953,8 +5953,8 @@ function! fugitive#MapJumps(...) abort nnoremap cr :Git revert nnoremap cr :Git revert - nnoremap crc :Grevert =SquashArgument() - nnoremap crn :Grevert --no-commit =SquashArgument() + nnoremap crc :Git revert =SquashArgument() + nnoremap crn :Git revert --no-commit =SquashArgument() nnoremap cr? :help fugitive_cr nnoremap cm :Git merge @@ -5984,19 +5984,19 @@ function! fugitive#MapJumps(...) abort nnoremap r :Git rebase nnoremap r :Git rebase - nnoremap ri :Grebase --interactive=RebaseArgument() - nnoremap rf :Grebase --autosquash=RebaseArgument() - nnoremap ru :Grebase --interactive @{upstream} - nnoremap rp :Grebase --interactive @{push} - nnoremap rw :Grebase --interactive=RebaseArgument()s/^pick/reword/e - nnoremap rm :Grebase --interactive=RebaseArgument()s/^pick/edit/e - nnoremap rd :Grebase --interactive=RebaseArgument()s/^pick/drop/e - nnoremap rk :Grebase --interactive=RebaseArgument()s/^pick/drop/e - nnoremap rx :Grebase --interactive=RebaseArgument()s/^pick/drop/e - nnoremap rr :Grebase --continue - nnoremap rs :Grebase --skip - nnoremap re :Grebase --edit-todo - nnoremap ra :Grebase --abort + nnoremap ri :Git rebase --interactive=RebaseArgument() + nnoremap rf :Git rebase --autosquash=RebaseArgument() + nnoremap ru :Git rebase --interactive @{upstream} + nnoremap rp :Git rebase --interactive @{push} + nnoremap rw :Git rebase --interactive=RebaseArgument()s/^pick/reword/e + nnoremap rm :Git rebase --interactive=RebaseArgument()s/^pick/edit/e + nnoremap rd :Git rebase --interactive=RebaseArgument()s/^pick/drop/e + nnoremap rk :Git rebase --interactive=RebaseArgument()s/^pick/drop/e + nnoremap rx :Git rebase --interactive=RebaseArgument()s/^pick/drop/e + nnoremap rr :Git rebase --continue + nnoremap rs :Git rebase --skip + nnoremap re :Git rebase --edit-todo + nnoremap ra :Git rebase --abort nnoremap r? :help fugitive_r call s:Map('n', '.', ": =fnameescape(fugitive#Real(@%))")