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

Remove most uses of s:EchoExec()

Browse Source 
This function was intended to avoid the press ENTER prompt for brief
output, but the new :Git job based runner now does that more
effectively.  Remove all old uses of it except the U map, which I am
electing to keep quiet on older versions of Vim.
This commit is contained in:
Tim Pope
2020-02-18 14:14:13 -05:00
parent c452181975
commit 6b40e51008
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
autoload/fugitive.vim
View File

@@ -564,9 +564,13 @@ function! s:TreeChomp(...) abort
endfunction endfunction
function! s:EchoExec(...) abort function! s:EchoExec(...) abort
if s:RunJobs()
return 'Git ' . s:fnameescape(a:000)
else
echo call('s:ChompError', a:000)[0] echo call('s:ChompError', a:000)[0]
call fugitive#ReloadStatus(-1, 1) call fugitive#ReloadStatus(-1, 1)
return 'checktime' return 'checktime'
endif
endfunction endfunction
let s:head_cache = {} let s:head_cache = {}
@@ -5952,18 +5956,18 @@ function! fugitive#MapJumps(...) abort
nnoremap <buffer> cz<Space> :Git stash<Space> nnoremap <buffer> cz<Space> :Git stash<Space>
nnoremap <buffer> cz<CR> :Git stash<CR> nnoremap <buffer> cz<CR> :Git stash<CR>
nnoremap <buffer> <silent> cza :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> cza :<C-U>Git stash apply --quiet --index stash@{<C-R>=v:count<CR>}<CR>
nnoremap <buffer> <silent> czA :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> czA :<C-U>Git stash apply --quiet stash@{<C-R>=v:count<CR>}<CR>
nnoremap <buffer> <silent> czp :<C-U>exe <SID>EchoExec(['stash', 'pop', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> czp :<C-U>Git stash pop --quiet --index stash@{<C-R>=v:count<CR>}<CR>
nnoremap <buffer> <silent> czP :<C-U>exe <SID>EchoExec(['stash', 'pop', '--quiet', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> czP :<C-U>Git stash pop --quiet stash@{<C-R>=v:count<CR>}<CR>
nnoremap <buffer> <silent> czv :<C-U>exe 'Gedit' fugitive#RevParse('stash@{' . v:count . '}')<CR> nnoremap <buffer> <silent> czv :<C-U>exe 'Gedit' fugitive#RevParse('stash@{' . v:count . '}')<CR>
nnoremap <buffer> <silent> czw :<C-U>exe <SID>EchoExec(['stash', '--keep-index'] + (v:count > 1 ? ['--all'] : v:count ? ['--include-untracked'] : []))<CR> nnoremap <buffer> czw :<C-U>Git stash --keep-index<C-R>=v:count > 1 ? ' --all' : v:count ? ' --include-untracked' : ''<CR><CR>
nnoremap <buffer> <silent> czz :<C-U>exe <SID>EchoExec(['stash'] + (v:count > 1 ? ['--all'] : v:count ? ['--include-untracked'] : []))<CR> nnoremap <buffer> czz :<C-U>Git stash <C-R>=v:count > 1 ? ' --all' : v:count ? ' --include-untracked' : ''<CR>
nnoremap <buffer> <silent> cz? :<C-U>help fugitive_cz<CR> nnoremap <buffer> <silent> cz? :<C-U>help fugitive_cz<CR>
nnoremap <buffer> co<Space> :Git checkout<Space> nnoremap <buffer> co<Space> :Git checkout<Space>
nnoremap <buffer> co<CR> :Git checkout<CR> nnoremap <buffer> co<CR> :Git checkout<CR>
nnoremap <buffer> coo :exe <SID>EchoExec(['checkout'] + split(<SID>SquashArgument()) + ['--'])<CR> nnoremap <buffer> coo :<C-U>Git checkout <C-R>=<SID>SquashArgument()<CR> --<CR>
nnoremap <buffer> co? :<C-U>help fugitive_co<CR> nnoremap <buffer> co? :<C-U>help fugitive_co<CR>
nnoremap <buffer> cb<Space> :Git branch<Space> nnoremap <buffer> cb<Space> :Git branch<Space>