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

Support <mods> on :Gstatus and :Gedit family

Browse Source
This commit is contained in:
Tim Pope
2018-05-28 17:36:59 -04:00
parent d7c377f3ba
commit aa0210a986
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugin/fugitive.vim
View File

@@ -740,7 +740,7 @@ call s:add_methods('buffer',['getvar','setvar','getline','repo','type','spec','n
" Section: Git " Section: Git
call s:command("-bang -nargs=? -complete=customlist,s:GitComplete Git :execute s:Git(<bang>0,<q-args>)") call s:command("-bang -nargs=? -complete=customlist,s:GitComplete Git :execute s:Git(<bang>0,'<mods>',<q-args>)")
function! s:ExecuteInTree(cmd) abort function! s:ExecuteInTree(cmd) abort
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
@@ -753,9 +753,9 @@ function! s:ExecuteInTree(cmd) abort
endtry endtry
endfunction endfunction
function! s:Git(bang, args) abort function! s:Git(bang, mods, args) abort
if a:bang if a:bang
return s:Edit('edit', 1, a:args) return s:Edit('edit', 1, a:mods, a:args)
endif endif
let git = s:git_command() let git = s:git_command()
if has('gui_running') && !has('win32') if has('gui_running') && !has('win32')
@@ -808,7 +808,7 @@ call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :exe
" Section: Gstatus " Section: Gstatus
call s:command("-bar Gstatus :execute s:Status()") call s:command("-bar -bang -range=-1 Gstatus :execute s:Status(<bang>0, <count>, '<mods>')")
augroup fugitive_status augroup fugitive_status
autocmd! autocmd!
if !has('win32') if !has('win32')
@@ -817,9 +817,9 @@ augroup fugitive_status
endif endif
augroup END augroup END
function! s:Status() abort function! s:Status(bang, count, mods) abort
try try
Gpedit : exe (a:mods ==# '<mods>' ? '' : a:mods) 'Gpedit :'
wincmd P wincmd P
setlocal foldmethod=syntax foldlevel=1 setlocal foldmethod=syntax foldlevel=1
nnoremap <buffer> <silent> q :<C-U>bdelete<CR> nnoremap <buffer> <silent> q :<C-U>bdelete<CR>
@@ -1425,7 +1425,8 @@ function! s:UsableWin(nr) abort
\ index(['nofile','help','quickfix'], getbufvar(winbufnr(a:nr), '&buftype')) < 0 \ index(['nofile','help','quickfix'], getbufvar(winbufnr(a:nr), '&buftype')) < 0
endfunction endfunction
function! s:Edit(cmd,bang,...) abort function! s:Edit(cmd, bang, mods, ...) abort
let mods = a:mods ==# '<mods>' ? '' : a:mods
let buffer = s:buffer() let buffer = s:buffer()
if a:cmd !~# 'read' if a:cmd !~# 'read'
if &previewwindow && getbufvar('','fugitive_type') ==# 'index' if &previewwindow && getbufvar('','fugitive_type') ==# 'index'
@@ -1460,7 +1461,7 @@ function! s:Edit(cmd,bang,...) abort
if a:cmd =~# 'read' if a:cmd =~# 'read'
let git = buffer.repo().git_command() let git = buffer.repo().git_command()
let last = line('$') let last = line('$')
silent call s:ExecuteInTree((a:cmd ==# 'read' ? '$read' : a:cmd).'!'.git.' --no-pager '.args) silent call s:ExecuteInTree(mods.' '.(a:cmd ==# 'read' ? 'keepalt $read' : a:cmd).'!'.git.' --no-pager '.args)
if a:cmd ==# 'read' if a:cmd ==# 'read'
silent execute '1,'.last.'delete_' silent execute '1,'.last.'delete_'
endif endif
@@ -1473,11 +1474,11 @@ function! s:Edit(cmd,bang,...) abort
let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t') let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t')
endif endif
let s:temp_files[s:cpath(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist } let s:temp_files[s:cpath(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist }
silent execute a:cmd.' '.temp silent execute mods a:cmd temp
if a:cmd =~# 'pedit' if a:cmd =~# 'pedit'
wincmd P wincmd P
endif endif
let echo = s:Edit('read',1,args) let echo = s:Edit('read', 1, mods, args)
silent write! silent write!
setlocal buftype=nowrite nomodified filetype=git foldmarker=<<<<<<<,>>>>>>> setlocal buftype=nowrite nomodified filetype=git foldmarker=<<<<<<<,>>>>>>>
if getline(1) !~# '^diff ' if getline(1) !~# '^diff '
@@ -1511,9 +1512,9 @@ function! s:Edit(cmd,bang,...) abort
let file = s:sub(file, '/$', '') let file = s:sub(file, '/$', '')
endif endif
if a:cmd ==# 'read' if a:cmd ==# 'read'
return 'silent %delete_|read '.s:fnameescape(file).'|silent 1delete_|diffupdate|'.line('.') return 'silent %delete_|'.mods.' read '.s:fnameescape(file).'|silent 1delete_|diffupdate|'.line('.')
else else
return a:cmd.' '.s:fnameescape(file) return mods.' '.a:cmd.' '.s:fnameescape(file)
endif endif
endfunction endfunction
@@ -1529,13 +1530,13 @@ function! s:EditRunComplete(A,L,P) abort
endif endif
endfunction endfunction
call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Ge :execute s:Edit('edit<bang>',0,<f-args>)") call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Ge :execute s:Edit('edit<bang>',0,'<mods>',<f-args>)")
call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gedit :execute s:Edit('edit<bang>',0,<f-args>)") call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gedit :execute s:Edit('edit<bang>',0,'<mods>',<f-args>)")
call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gpedit :execute s:Edit('pedit',<bang>0,<f-args>)") call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gpedit :execute s:Edit('pedit',<bang>0,'<mods>',<f-args>)")
call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gsplit :execute s:Edit('split',<bang>0,<f-args>)") call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gsplit :execute s:Edit('split',<bang>0,'<mods>',<f-args>)")
call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gvsplit :execute s:Edit('vsplit',<bang>0,<f-args>)") call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gvsplit :execute s:Edit('vsplit',<bang>0,'<mods>',<f-args>)")
call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gtabedit :execute s:Edit('tabedit',<bang>0,<f-args>)") call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gtabedit :execute s:Edit('tabedit',<bang>0,'<mods>',<f-args>)")
call s:command("-bar -bang -nargs=* -range=-1 -complete=customlist,s:EditRunComplete Gread :execute s:Edit((<count> == -1 ? '' : <count>).'read',<bang>0,<f-args>)") call s:command("-bar -bang -nargs=* -range=-1 -complete=customlist,s:EditRunComplete Gread :execute s:Edit((<count> == -1 ? '' : <count>).'read',<bang>0,'<mods>',<f-args>)")
" Section: Gwrite, Gwq " Section: Gwrite, Gwq
@@ -2157,7 +2158,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
endfunction endfunction
function! s:BlameCommit(cmd) abort function! s:BlameCommit(cmd) abort
let cmd = s:Edit(a:cmd, 0, matchstr(getline('.'),'\x\+')) let cmd = s:Edit(a:cmd, 0, '', matchstr(getline('.'),'\x\+'))
if cmd =~# '^echoerr' if cmd =~# '^echoerr'
return cmd return cmd
endif endif
@@ -2214,7 +2215,7 @@ function! s:BlameJump(suffix) abort
if winnr > 0 if winnr > 0
exe winnr.'wincmd w' exe winnr.'wincmd w'
endif endif
execute s:Edit('edit', 0, commit.a:suffix.':'.path) execute s:Edit('edit', 0, '', commit.a:suffix.':'.path)
execute lnum execute lnum
if winnr > 0 if winnr > 0
exe bufnr.'bdelete' exe bufnr.'bdelete'
@@ -3082,7 +3083,7 @@ function! s:GF(mode) abort
return 'echoerr v:errmsg' return 'echoerr v:errmsg'
endtry endtry
if len(results) if len(results)
return s:Edit(a:mode, 0, results[0]).join(map(results[1:-1], '"|".v:val'), '') return s:Edit(a:mode, 0, '', results[0]).join(map(results[1:-1], '"|".v:val'), '')
else else
return '' return ''
endif endif