VimPlug/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-12-08 04:54:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support most top level Git options

Browse Source
This commit is contained in:
Tim Pope
2020-02-23 17:58:30 -05:00
parent 5d7516d3c1
commit 3c3e6ea67b
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
autoload/fugitive.vim
View File

@@ -2413,39 +2413,53 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
let config = copy(fugitive#Config(dir)) let config = copy(fugitive#Config(dir))
let [args, after] = s:SplitExpandChain(a:arg, s:Tree(dir)) let [args, after] = s:SplitExpandChain(a:arg, s:Tree(dir))
let flags = [] let flags = []
while len(args) > 1 let pager = -1
if args[0] ==# '-c' while len(args)
if args[0] ==# '-c' && len(args) > 1
call extend(flags, remove(args, 0, 1)) call extend(flags, remove(args, 0, 1))
elseif args[0] =~# '^-p$\|^--paginate$'
let pager = 1
call remove(args, 0)
elseif args[0] =~# '^-P$\|^--no-pager$'
let pager = 0
call remove(args, 0)
elseif args[0] =~# '^--\%([[:lower:]-]\+-pathspecs\|no-optional-locks\)$'
call add(flags, remove(args, 0))
elseif args[0] =~# '^-C$\|^--\%(exec-path=\|git-dir=\|work-tree=\|bare$\)'
return 'echoerr ' . string('fugitive: ' . args[0] . ' is not supported')
else else
break break
endif endif
endwhile endwhile
if empty(args) if pager is# 0
call add(flags, '--no-pager')
endif
if empty(args) && pager is# -1
let cmd = s:StatusCommand(a:line1, a:line2, a:range, a:line2, a:bang, a:mods, '', '', []) let cmd = s:StatusCommand(a:line1, a:line2, a:range, a:line2, a:bang, a:mods, '', '', [])
return (empty(cmd) ? 'exe' : cmd) . after return (empty(cmd) ? 'exe' : cmd) . after
endif endif
let alias = get(s:Aliases(dir), args[0], '!') let alias = fugitive#Config('alias.' . get(args, 0, ''), config)
if get(args, 1, '') !=# '--help' && alias !~# '^!\|[\"'']' && !filereadable(s:ExecPath() . '/git-' . args[0]) if get(args, 1, '') !=# '--help' && alias !~# '^$\|^!\|[\"'']' && !filereadable(s:ExecPath() . '/git-' . args[0])
\ && !(has('win32') && filereadable(s:ExecPath() . '/git-' . args[0] . '.exe')) \ && !(has('win32') && filereadable(s:ExecPath() . '/git-' . args[0] . '.exe'))
call remove(args, 0) call remove(args, 0)
call extend(args, split(alias, '\s\+'), 'keep') call extend(args, split(alias, '\s\+'), 'keep')
endif endif
let name = substitute(args[0], '\%(^\|-\)\(\l\)', '\u\1', 'g') let name = substitute(get(args, 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
let git = split(get(g:, 'fugitive_git_command', g:fugitive_git_executable), '\s\+') let git = split(get(g:, 'fugitive_git_command', g:fugitive_git_executable), '\s\+')
let options = {'git': git, 'dir': dir, 'flags': flags} let options = {'git': git, 'dir': dir, 'flags': flags}
if exists('*s:' . name . 'Subcommand') && get(args, 1, '') !=# '--help' if pager is# -1 && exists('*s:' . name . 'Subcommand') && get(args, 1, '') !=# '--help'
try try
let overrides = s:{name}Subcommand(a:line1, a:line2, a:range, a:bang, a:mods, extend({'command': args[0], 'args': args[1:-1]}, options)) let overrides = s:{name}Subcommand(a:line1, a:line2, a:range, a:bang, a:mods, extend({'command': args[0], 'args': args[1:-1]}, options))
if type(overrides) == type('') if type(overrides) == type('')
return 'exe ' . string(overrides) . after return 'exe ' . string(overrides) . after
endif endif
let args = [get(overrides, 'command', args[0])] + get(overrides, 'insert_args', []) + args[1:-1]
catch /^fugitive:/ catch /^fugitive:/
return 'echoerr ' . string(v:exception) return 'echoerr ' . string(v:exception)
endtry endtry
else else
let overrides = {} let overrides = {}
endif endif
let args = [get(overrides, 'command', args[0])] + get(overrides, 'insert_args', []) + args[1:-1]
let env = get(overrides, 'env', {}) let env = get(overrides, 'env', {})
let i = 0 let i = 0
while i < len(flags) - 1 while i < len(flags) - 1
@@ -2464,15 +2478,13 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
let i += 1 let i += 1
endwhile endwhile
let editcmd = (a:line2 > 0 ? a:line2 : '') . (a:line2 ? 'split' : 'edit') let editcmd = (a:line2 > 0 ? a:line2 : '') . (a:line2 ? 'split' : 'edit')
if args[0] =~# '^-p$\|^--paginate$' if pager is# 1
call remove(args, 0)
let pager = 1
if a:bang && a:line2 >= 0 if a:bang && a:line2 >= 0
let editcmd = 'read' let editcmd = 'read'
elseif a:bang elseif a:bang
let editcmd = 'pedit' let editcmd = 'pedit'
endif endif
else elseif pager is# -1
let pager = fugitive#PagerFor(args, config) let pager = fugitive#PagerFor(args, config)
if a:bang && pager isnot# 1 if a:bang && pager isnot# 1
return 'echoerr ' . string('fugitive: :Git! for temp buffer output has been replaced by :Git --paginate') return 'echoerr ' . string('fugitive: :Git! for temp buffer output has been replaced by :Git --paginate')