mirror of
https://github.com/amix/vimrc
synced 2025-07-10 03:25:00 +08:00
Update plugins from upstream.
This commit is contained in:
Kurtis Moxley
File diff suppressed because it is too large
Load Diff
@ -157,6 +157,9 @@ plus |:grep|.
|
||||
*:Gpedit*
|
||||
:Gpedit [object] |:pedit| a |fugitive-object|.
|
||||
|
||||
*:Gdrop*
|
||||
:Gdrop [object] |:drop| a |fugitive-object|.
|
||||
|
||||
*:Gread* *fugitive-:Gr*
|
||||
:Gread [object] Empty the buffer and |:read| a |fugitive-object|.
|
||||
When the argument is omitted, this is similar to
|
||||
@ -165,12 +168,6 @@ plus |:grep|.
|
||||
|
||||
:{range}Gread [object] |:read| in a |fugitive-object| after {range}.
|
||||
|
||||
*:Gread!* *fugitive-:Gr!*
|
||||
:Gread! [args] Empty the buffer and |:read| the output of a Git
|
||||
command. For example, :Gread! show HEAD:%.
|
||||
|
||||
:{range}Gread! [args] |:read| the output of a Git command after {range}.
|
||||
|
||||
*:Gwrite* *fugitive-:Gw*
|
||||
:Gwrite Write to the current file's path and stage the results.
|
||||
When run in a work tree file, it is effectively git
|
||||
@ -718,7 +715,7 @@ version.
|
||||
|
||||
*User_Fugitive*
|
||||
Fugitive used to support `:autocmd User Fugitive` to run an autocommand after
|
||||
loading any buffer belonging to a Git repository, but this is being phased
|
||||
loading any buffer belonging to a Git repository, but this has been phased
|
||||
out. Instead, one can leverage regular autocommand events like |BufNewFile|
|
||||
and |BufReadPost|, and check !empty(FugitiveGitDir()) to confirm Fugitive has
|
||||
found a repository. See also |fugitive-autocommands| for other, more
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
" fugitive.vim - A Git wrapper so awesome, it should be illegal
|
||||
" Maintainer: Tim Pope <http://tpo.pe/>
|
||||
" Version: 3.6
|
||||
" Version: 3.7
|
||||
" GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
|
||||
|
||||
if exists('g:loaded_fugitive')
|
||||
@ -16,7 +16,7 @@ let s:bad_git_dir = '/$\|^fugitive:'
|
||||
" Fugitive is active in the current buffer. Do not rely on this for direct
|
||||
" filesystem access; use FugitiveFind('.git/whatever') instead.
|
||||
function! FugitiveGitDir(...) abort
|
||||
if v:version < 703
|
||||
if v:version < 704
|
||||
return ''
|
||||
elseif !a:0 || type(a:1) == type(0) && a:1 < 0 || a:1 is# get(v:, 'true', -1)
|
||||
if exists('g:fugitive_event')
|
||||
@ -39,7 +39,7 @@ function! FugitiveGitDir(...) abort
|
||||
elseif type(a:1) == type('')
|
||||
return substitute(s:Slash(a:1), '/$', '', '')
|
||||
elseif type(a:1) == type({})
|
||||
return get(a:1, 'git_dir', '')
|
||||
return get(a:1, 'fugitive_dir', get(a:1, 'git_dir', ''))
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
@ -58,7 +58,7 @@ function! FugitiveReal(...) abort
|
||||
if type(file) ==# type({})
|
||||
let dir = FugitiveGitDir(file)
|
||||
let tree = s:Tree(dir)
|
||||
return FugitiveVimPath(empty(tree) ? dir : tree)
|
||||
return s:VimSlash(empty(tree) ? dir : tree)
|
||||
elseif file =~# '^\a\a\+:' || a:0 > 1
|
||||
return call('fugitive#Real', [file] + a:000[1:-1])
|
||||
elseif file =~# '^/\|^\a:\|^$'
|
||||
@ -88,15 +88,14 @@ endfunction
|
||||
" the inverse of FugitiveFind().
|
||||
function! FugitiveParse(...) abort
|
||||
let path = s:Slash(a:0 ? a:1 : @%)
|
||||
if path !~# '^fugitive:'
|
||||
if path !~# '^fugitive://'
|
||||
return ['', '']
|
||||
endif
|
||||
let vals = matchlist(path, '\c^fugitive:\%(//\)\=\(.\{-\}\)\%(//\|::\)\(\x\{40,\}\|[0-3]\)\(/.*\)\=$')
|
||||
if len(vals)
|
||||
return [(vals[2] =~# '^.$' ? ':' : '') . vals[2] . substitute(vals[3], '^/', ':', ''), vals[1]]
|
||||
let [rev, dir] = fugitive#Parse(path)
|
||||
if !empty(dir)
|
||||
return [rev, dir]
|
||||
endif
|
||||
let v:errmsg = 'fugitive: invalid Fugitive URL ' . path
|
||||
throw v:errmsg
|
||||
throw 'fugitive: invalid Fugitive URL ' . path
|
||||
endfunction
|
||||
|
||||
" FugitiveGitVersion() queries the version of Git in use. Pass up to 3
|
||||
@ -152,19 +151,6 @@ function! FugitiveShellCommand(...) abort
|
||||
return call('fugitive#ShellCommand', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitivePrepare() is a deprecated alias for FugitiveShellCommand(). If you
|
||||
" are using this in conjunction with system(), consider using
|
||||
" FugitiveExecute() instead.
|
||||
function! FugitivePrepare(...) abort
|
||||
if !exists('s:did_prepare_warning')
|
||||
let s:did_prepare_warning = 1
|
||||
echohl WarningMsg
|
||||
unsilent echomsg 'FugitivePrepare() has been superseded by FugitiveShellCommand()'
|
||||
echohl NONE
|
||||
endif
|
||||
return call('fugitive#ShellCommand', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveConfig() get returns an opaque structure that can be passed to other
|
||||
" FugitiveConfig functions in lieu of a Git directory. This can be faster
|
||||
" when performing multiple config queries. Do not rely on the internal
|
||||
@ -283,9 +269,21 @@ function! FugitiveStatusline(...) abort
|
||||
return fugitive#Statusline()
|
||||
endfunction
|
||||
|
||||
let s:resolved_git_dirs = {}
|
||||
function! FugitiveActualDir(...) abort
|
||||
let dir = call('FugitiveGitDir', a:000)
|
||||
if empty(dir)
|
||||
return ''
|
||||
endif
|
||||
if !has_key(s:resolved_git_dirs, dir)
|
||||
let s:resolved_git_dirs[dir] = s:ResolveGitDir(dir)
|
||||
endif
|
||||
return empty(s:resolved_git_dirs[dir]) ? dir : s:resolved_git_dirs[dir]
|
||||
endfunction
|
||||
|
||||
let s:commondirs = {}
|
||||
function! FugitiveCommonDir(...) abort
|
||||
let dir = FugitiveGitDir(a:0 ? a:1 : -1)
|
||||
let dir = call('FugitiveActualDir', a:000)
|
||||
if empty(dir)
|
||||
return ''
|
||||
endif
|
||||
@ -327,6 +325,9 @@ function! FugitiveIsGitDir(...) abort
|
||||
endfunction
|
||||
|
||||
function! s:ReadFile(path, line_count) abort
|
||||
if v:version < 800 && !filereadable(a:path)
|
||||
return []
|
||||
endif
|
||||
try
|
||||
return readfile(a:path, 'b', a:line_count)
|
||||
catch
|
||||
@ -337,28 +338,28 @@ endfunction
|
||||
let s:worktree_for_dir = {}
|
||||
let s:dir_for_worktree = {}
|
||||
function! s:Tree(path) abort
|
||||
let dir = a:path
|
||||
if dir =~# '/\.git$'
|
||||
return len(dir) ==# 5 ? '/' : dir[0:-6]
|
||||
elseif dir ==# ''
|
||||
if a:path =~# '/\.git$'
|
||||
return len(a:path) ==# 5 ? '/' : a:path[0:-6]
|
||||
elseif a:path ==# ''
|
||||
return ''
|
||||
endif
|
||||
let dir = FugitiveActualDir(a:path)
|
||||
if !has_key(s:worktree_for_dir, dir)
|
||||
let s:worktree_for_dir[dir] = ''
|
||||
let ext_wtc_pat = 'v:val =~# "^\\s*worktreeConfig *= *\\%(true\\|yes\\|on\\|1\\) *$"'
|
||||
let config = s:ReadFile(dir . '/config', 10)
|
||||
let config = s:ReadFile(dir . '/config', 50)
|
||||
if len(config)
|
||||
let ext_wtc_config = filter(copy(config), ext_wtc_pat)
|
||||
if len(ext_wtc_config) == 1 && filereadable(dir . '/config.worktree')
|
||||
let config += s:ReadFile(dir . '/config.worktree', 10)
|
||||
let config += s:ReadFile(dir . '/config.worktree', 50)
|
||||
endif
|
||||
else
|
||||
let worktree = fnamemodify(FugitiveVimPath(get(s:ReadFile(dir . '/gitdir', 1), '0', '')), ':h')
|
||||
if worktree ==# '.'
|
||||
unlet! worktree
|
||||
endif
|
||||
if len(filter(s:ReadFile(FugitiveCommonDir(dir) . '/config', 10), ext_wtc_pat))
|
||||
let config = s:ReadFile(dir . '/config.worktree', 10)
|
||||
if len(filter(s:ReadFile(FugitiveCommonDir(dir) . '/config', 50), ext_wtc_pat))
|
||||
let config = s:ReadFile(dir . '/config.worktree', 50)
|
||||
endif
|
||||
endif
|
||||
if len(config)
|
||||
@ -401,30 +402,42 @@ function! s:CeilingDirectories() abort
|
||||
return s:ceiling_directories + get(g:, 'ceiling_directories', [s:Slash(fnamemodify(expand('~'), ':h'))])
|
||||
endfunction
|
||||
|
||||
function! s:ResolveGitDir(git_dir) abort
|
||||
let type = getftype(a:git_dir)
|
||||
if type ==# 'dir' && FugitiveIsGitDir(a:git_dir)
|
||||
return a:git_dir
|
||||
elseif type ==# 'link' && FugitiveIsGitDir(a:git_dir)
|
||||
return resolve(a:git_dir)
|
||||
elseif type !=# ''
|
||||
let line = get(s:ReadFile(a:git_dir, 1), 0, '')
|
||||
let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
|
||||
if file_dir !~# '^/\|^\a:\|^$' && a:git_dir =~# '/\.git$' && FugitiveIsGitDir(a:git_dir[0:-5] . file_dir)
|
||||
return simplify(a:git_dir[0:-5] . file_dir)
|
||||
elseif file_dir =~# '^/\|^\a:' && FugitiveIsGitDir(file_dir)
|
||||
return file_dir
|
||||
endif
|
||||
endif
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
function! FugitiveExtractGitDir(path) abort
|
||||
if type(a:path) ==# type({})
|
||||
return get(a:path, 'git_dir', '')
|
||||
return get(a:path, 'fugitive_dir', get(a:path, 'git_dir', ''))
|
||||
elseif type(a:path) == type(0)
|
||||
let path = s:Slash(a:path > 0 ? bufname(a:path) : bufname(''))
|
||||
else
|
||||
let path = s:Slash(a:path)
|
||||
endif
|
||||
if path =~# '^fugitive:'
|
||||
return matchstr(path, '\C^fugitive:\%(//\)\=\zs.\{-\}\ze\%(//\|::\|$\)')
|
||||
if path =~# '^fugitive://'
|
||||
return fugitive#Parse(path)[1]
|
||||
elseif empty(path)
|
||||
return ''
|
||||
else
|
||||
let path = fnamemodify(path, ':p:h')
|
||||
endif
|
||||
let pre = substitute(matchstr(path, '^\a\a\+\ze:'), '^.', '\u&', '')
|
||||
if len(pre) && exists('*' . pre . 'Real')
|
||||
let path ={pre}Real(path)
|
||||
endif
|
||||
let path = s:Slash(path)
|
||||
let root = resolve(path)
|
||||
if root !=# path
|
||||
silent! exe (haslocaldir() ? 'lcd' : exists(':tcd') && haslocaldir(-1) ? 'tcd' : 'cd') '.'
|
||||
let path = {pre}Real(path)
|
||||
endif
|
||||
let root = s:Slash(fnamemodify(path, ':p:h'))
|
||||
let previous = ""
|
||||
let env_git_dir = len($GIT_DIR) ? s:Slash(simplify(fnamemodify(FugitiveVimPath($GIT_DIR), ':p:s?[\/]$??'))) : ''
|
||||
call s:Tree(env_git_dir)
|
||||
@ -439,20 +452,12 @@ function! FugitiveExtractGitDir(path) abort
|
||||
return s:dir_for_worktree[root]
|
||||
endif
|
||||
let dir = substitute(root, '[\/]$', '', '') . '/.git'
|
||||
let type = getftype(dir)
|
||||
if type ==# 'dir' && FugitiveIsGitDir(dir)
|
||||
return dir
|
||||
elseif type ==# 'link' && FugitiveIsGitDir(dir)
|
||||
return resolve(dir)
|
||||
elseif type !=# ''
|
||||
let line = get(s:ReadFile(dir, 1), 0, '')
|
||||
let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
|
||||
if file_dir !~# '^/\|^\a:\|^$' && FugitiveIsGitDir(root . '/' . file_dir)
|
||||
return simplify(root . '/' . file_dir)
|
||||
elseif len(file_dir) && FugitiveIsGitDir(file_dir)
|
||||
return file_dir
|
||||
endif
|
||||
let resolved = s:ResolveGitDir(dir)
|
||||
if !empty(resolved)
|
||||
let s:resolved_git_dirs[dir] = resolved
|
||||
return dir is# resolved || s:Tree(resolved) is# 0 ? dir : resolved
|
||||
elseif FugitiveIsGitDir(root)
|
||||
let s:resolved_git_dirs[root] = root
|
||||
return root
|
||||
endif
|
||||
let previous = root
|
||||
@ -462,57 +467,56 @@ function! FugitiveExtractGitDir(path) abort
|
||||
endfunction
|
||||
|
||||
function! FugitiveDetect(...) abort
|
||||
if v:version < 703
|
||||
if v:version < 704
|
||||
return ''
|
||||
endif
|
||||
if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir
|
||||
unlet b:git_dir
|
||||
endif
|
||||
if a:0 > 1 && a:2 is# 0 && !exists('#User#Fugitive')
|
||||
return ''
|
||||
endif
|
||||
if !exists('b:git_dir')
|
||||
let b:git_dir = FugitiveExtractGitDir(a:0 ? a:1 : bufnr(''))
|
||||
endif
|
||||
if empty(b:git_dir) || !exists('#User#Fugitive')
|
||||
return ''
|
||||
endif
|
||||
if v:version >= 704 || (v:version == 703 && has('patch442'))
|
||||
doautocmd <nomodeline> User Fugitive
|
||||
elseif &modelines > 0
|
||||
let modelines = &modelines
|
||||
try
|
||||
set modelines=0
|
||||
doautocmd User Fugitive
|
||||
finally
|
||||
let &modelines = modelines
|
||||
endtry
|
||||
else
|
||||
doautocmd User Fugitive
|
||||
endif
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
function! FugitiveVimPath(path) abort
|
||||
if exists('+shellslash') && !&shellslash
|
||||
return tr(a:path, '/', '\')
|
||||
else
|
||||
return a:path
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! FugitiveGitPath(path) abort
|
||||
return s:Slash(a:path)
|
||||
endfunction
|
||||
|
||||
if exists('+shellslash')
|
||||
|
||||
function! s:Slash(path) abort
|
||||
return tr(a:path, '\', '/')
|
||||
endfunction
|
||||
|
||||
function! s:VimSlash(path) abort
|
||||
return tr(a:path, '\/', &shellslash ? '//' : '\\')
|
||||
endfunction
|
||||
|
||||
function FugitiveVimPath(path) abort
|
||||
return tr(a:path, '\/', &shellslash ? '//' : '\\')
|
||||
endfunction
|
||||
|
||||
else
|
||||
|
||||
function! s:Slash(path) abort
|
||||
return a:path
|
||||
endfunction
|
||||
|
||||
function! s:VimSlash(path) abort
|
||||
return a:path
|
||||
endfunction
|
||||
|
||||
if has('win32unix') && filereadable('/git-bash.exe')
|
||||
function! FugitiveVimPath(path) abort
|
||||
return substitute(a:path, '^\(\a\):', '/\l\1', '')
|
||||
endfunction
|
||||
else
|
||||
function! FugitiveVimPath(path) abort
|
||||
return a:path
|
||||
endfunction
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
function! s:ProjectionistDetect() abort
|
||||
@ -545,9 +549,6 @@ command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete Git exe
|
||||
if exists(':Gstatus') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bang -bar -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
\ '|echohl WarningMSG|echomsg ":Gstatus is deprecated in favor of :Git (with no arguments)"|echohl NONE'
|
||||
elseif exists(':Gstatus') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bang -bar -range=-1' s:addr_other 'Gstatus'
|
||||
\ ' echoerr ":Gstatus has been removed in favor of :Git (with no arguments)"'
|
||||
endif
|
||||
|
||||
for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'Blame']
|
||||
@ -555,9 +556,6 @@ for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'B
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
|
||||
\ 'echohl WarningMSG|echomsg ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '"|echohl NONE|'
|
||||
\ 'exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "' . tolower(s:cmd) . ' " . <q-args>)'
|
||||
elseif exists(':G' . tolower(s:cmd)) != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
|
||||
\ 'echoerr ":G' . tolower(s:cmd) . ' has been removed in favor of :Git ' . tolower(s:cmd) . '"'
|
||||
endif
|
||||
endfor
|
||||
unlet s:cmd
|
||||
@ -568,13 +566,6 @@ exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd
|
||||
exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Ggrep exe fugitive#GrepCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Glgrep exe fugitive#GrepCommand(0, <count> > 0 ? <count> : 0, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
|
||||
if exists(':Glog') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
|
||||
\ '|echohl WarningMSG|echomsg ":Glog is deprecated in favor of :Gclog"|echohl NONE'
|
||||
elseif exists(':Glog') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog'
|
||||
\ ' echoerr ":Glog has been removed in favor of :Gclog"'
|
||||
endif
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gclog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GcLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gllog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
|
||||
@ -582,10 +573,11 @@ exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete
|
||||
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ge exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gedit exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#ReadComplete Gpedit exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete Gsplit exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete Gvsplit exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs '-complete=customlist,fugitive#ReadComplete Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gpedit exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#EditComplete Gsplit exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#EditComplete Gvsplit exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs '-complete=customlist,fugitive#EditComplete Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdrop exe fugitive#DropCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
|
||||
if exists(':Gr') != 2
|
||||
exe 'command! -bar -bang -nargs=* -range=-1 -complete=customlist,fugitive#ReadComplete Gr exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
@ -641,7 +633,7 @@ elseif exists(':Gbrowse') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
\ 'echoerr ":Gbrowse has been removed in favor of :GBrowse"'
|
||||
endif
|
||||
|
||||
if v:version < 703
|
||||
if v:version < 704
|
||||
finish
|
||||
endif
|
||||
|
||||
@ -665,8 +657,15 @@ let g:io_fugitive = {
|
||||
augroup fugitive
|
||||
autocmd!
|
||||
|
||||
autocmd BufNewFile,BufReadPost * call FugitiveDetect(+expand('<abuf>'), 0)
|
||||
autocmd FileType netrw call FugitiveDetect(+expand('<abuf>'), 0)
|
||||
autocmd BufNewFile,BufReadPost *
|
||||
\ if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir |
|
||||
\ unlet b:git_dir |
|
||||
\ endif
|
||||
autocmd FileType netrw
|
||||
\ if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir |
|
||||
\ unlet b:git_dir |
|
||||
\ endif
|
||||
autocmd BufFilePost * unlet! b:git_dir
|
||||
|
||||
autocmd FileType git
|
||||
\ call fugitive#MapCfile()
|
||||
@ -699,15 +698,15 @@ augroup fugitive
|
||||
\ silent doautocmd BufNewFile |
|
||||
\ endif
|
||||
|
||||
autocmd BufReadCmd fugitive://*//* nested exe fugitive#BufReadCmd() |
|
||||
autocmd BufReadCmd fugitive://* nested exe fugitive#BufReadCmd() |
|
||||
\ if &path =~# '^\.\%(,\|$\)' |
|
||||
\ let &l:path = substitute(&path, '^\.,\=', '', '') |
|
||||
\ endif
|
||||
autocmd BufWriteCmd fugitive://*//[0-3]/* nested exe fugitive#BufWriteCmd()
|
||||
autocmd FileReadCmd fugitive://*//* nested exe fugitive#FileReadCmd()
|
||||
autocmd FileWriteCmd fugitive://*//[0-3]/* nested exe fugitive#FileWriteCmd()
|
||||
autocmd BufWriteCmd fugitive://* nested exe fugitive#BufWriteCmd()
|
||||
autocmd FileReadCmd fugitive://* nested exe fugitive#FileReadCmd()
|
||||
autocmd FileWriteCmd fugitive://* nested exe fugitive#FileWriteCmd()
|
||||
if exists('##SourceCmd')
|
||||
autocmd SourceCmd fugitive://*//* nested exe fugitive#SourceCmd()
|
||||
autocmd SourceCmd fugitive://* nested exe fugitive#SourceCmd()
|
||||
endif
|
||||
|
||||
autocmd User Flags call Hoist('buffer', function('FugitiveStatusline'))
|
||||
@ -715,14 +714,15 @@ augroup fugitive
|
||||
autocmd User ProjectionistDetect call s:ProjectionistDetect()
|
||||
augroup END
|
||||
|
||||
nmap <script><silent> <Plug>fugitive:y<C-G> :<C-U>call setreg(v:register, fugitive#Object(@%))<CR>
|
||||
nmap <script> <Plug>fugitive: <Nop>
|
||||
|
||||
if get(g:, 'fugitive_no_maps')
|
||||
finish
|
||||
endif
|
||||
|
||||
let s:nowait = v:version >= 704 ? '<nowait>' : ''
|
||||
|
||||
function! s:Map(mode, lhs, rhs, flags) abort
|
||||
let flags = a:flags . (a:rhs =~# '<Plug>' ? '' : '<script>')
|
||||
let flags = a:flags . (a:rhs =~# '<Plug>' ? '' : '<script>') . '<nowait>'
|
||||
let head = a:lhs
|
||||
let tail = ''
|
||||
let keys = get(g:, a:mode.'remap', {})
|
||||
@ -740,11 +740,9 @@ function! s:Map(mode, lhs, rhs, flags) abort
|
||||
endwhile
|
||||
endif
|
||||
if empty(mapcheck(head.tail, a:mode))
|
||||
exe a:mode.'map' s:nowait flags head.tail a:rhs
|
||||
exe a:mode.'map' flags head.tail a:rhs
|
||||
endif
|
||||
endfunction
|
||||
|
||||
call s:Map('c', '<C-R><C-G>', 'fnameescape(fugitive#Object(@%))', '<expr>')
|
||||
call s:Map('n', 'y<C-G>', ':<C-U>call setreg(v:register, fugitive#Object(@%))<CR>', '<silent>')
|
||||
nmap <script><silent> <Plug>fugitive:y<C-G> :<C-U>call setreg(v:register, fugitive#Object(@%))<CR>
|
||||
nmap <script> <Plug>fugitive: <Nop>
|
||||
|
||||
Reference in New Issue
Block a user