mirror of
https://github.com/amix/vimrc
synced 2025-02-28 14:12:51 +08:00
Merge branch 'Linux' of https://github.com/Geezus42/vimrc into Linux
This commit is contained in:
geezus
commit
9191883819
@ -163,6 +163,7 @@ let s:current_ale_version = [3, 1, 0]
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
let s:current_ale_version = [2, 5, 0]
|
||||
=======
|
||||
let s:current_ale_version = [2, 6, 0]
|
||||
@ -173,7 +174,13 @@ let s:current_ale_version = [3, 0, 0]
|
||||
=======
|
||||
let s:current_ale_version = [3, 1, 0]
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
let s:current_ale_version = [3, 1, 0]
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
|
||||
" A function used to check for ALE features in files outside of the project.
|
||||
function! ale#Has(feature) abort
|
||||
|
||||
@ -237,6 +237,7 @@ OPTIONS *lightline-option*
|
||||
16color are available.
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
srcery_drk, ayu_mirage and 16color are available.
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
@ -248,7 +249,14 @@ OPTIONS *lightline-option*
|
||||
simpleblack, srcery_drk, ayu_mirage, ayu_light, ayu_dark,
|
||||
apprentice and 16color are available.
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
simpleblack, srcery_drk, ayu_mirage, ayu_light, ayu_dark,
|
||||
apprentice and 16color are available.
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
The default value is:
|
||||
>
|
||||
let g:lightline.colorscheme = 'default'
|
||||
|
||||
@ -45,6 +45,7 @@ endfunction
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
function! nerdtree#slash()
|
||||
=======
|
||||
"FUNCTION: nerdtree#slash() {{{2
|
||||
@ -53,6 +54,8 @@ function! nerdtree#slash() abort
|
||||
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
" FUNCTION: nerdtree#closeTreeOnOpen() {{{2
|
||||
function! nerdtree#closeTreeOnOpen() abort
|
||||
return g:NERDTreeQuitOnOpen == 1 || g:NERDTreeQuitOnOpen == 3
|
||||
@ -63,8 +66,14 @@ function! nerdtree#closeBookmarksOnOpen() abort
|
||||
return g:NERDTreeQuitOnOpen == 2 || g:NERDTreeQuitOnOpen == 3
|
||||
endfunction
|
||||
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
" FUNCTION: nerdtree#slash() {{{2
|
||||
" Return the path separator used by the underlying file system. Special
|
||||
" consideration is taken for the use of the 'shellslash' option on Windows
|
||||
|
||||
@ -109,8 +109,11 @@ endfunction
|
||||
|
||||
"FUNCTION: s:initCustomOpenArgs() {{{1
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
function! s:initCustomOpenArgs() abort
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
<<<<<<< HEAD
|
||||
" Make sure NERDTreeCustomOpenArgs has needed keys
|
||||
<<<<<<< HEAD
|
||||
@ -122,7 +125,13 @@ function! s:initCustomOpenArgs() abort
|
||||
return extend(g:NERDTreeCustomOpenArgs, {'file':{'reuse': 'all', 'where': 'p'}, 'dir':{}}, 'keep')
|
||||
=======
|
||||
function! s:initCustomOpenArgs() abort
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
function! s:initCustomOpenArgs() abort
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
let l:defaultOpenArgs = {'file': {'reuse': 'all', 'where': 'p', 'keepopen':!nerdtree#closeTreeOnOpen()}, 'dir': {}}
|
||||
try
|
||||
let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
|
||||
@ -134,9 +143,15 @@ function! s:initCustomOpenArgs() abort
|
||||
return g:NERDTreeCustomOpenArgs
|
||||
endtry
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
endfunction
|
||||
|
||||
"FUNCTION: s:activateAll() {{{1
|
||||
|
||||
@ -92,6 +92,7 @@ function! s:DirCheck(...) abort
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if empty(a:0 ? s:Dir(a:1) : s:Dir())
|
||||
return 'return ' . string('echoerr "fugitive: not a Git repository"')
|
||||
@ -110,11 +111,16 @@ function! s:Mods(mods, ...) abort
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
if !empty(a:0 ? s:Dir(a:1) : s:Dir())
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
let vcheck = s:VersionCheck()
|
||||
if !empty(vcheck)
|
||||
return vcheck
|
||||
elseif !empty(a:0 ? s:Dir(a:1) : s:Dir())
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
>>>>>>> master
|
||||
return ''
|
||||
elseif empty(bufname(''))
|
||||
return 'return ' . string('echoerr "fugitive: working directory does not belong to a Git repository"')
|
||||
@ -236,6 +242,7 @@ endfunction
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
" Section: Quickfix
|
||||
|
||||
function! s:QuickfixGet(nr, ...) abort
|
||||
@ -351,6 +358,27 @@ endfunction
|
||||
|
||||
" Section: Git
|
||||
|
||||
=======
|
||||
function! fugitive#Autowrite() abort
|
||||
if &autowrite || &autowriteall
|
||||
try
|
||||
if &confirm
|
||||
let reconfirm = 1
|
||||
setglobal noconfirm
|
||||
endif
|
||||
silent! wall
|
||||
finally
|
||||
if exists('reconfirm')
|
||||
setglobal confirm
|
||||
endif
|
||||
endtry
|
||||
endif
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
" Section: Git
|
||||
|
||||
>>>>>>> master
|
||||
function! s:GitCmd() abort
|
||||
if !exists('g:fugitive_git_executable')
|
||||
return ['git']
|
||||
@ -391,8 +419,14 @@ function! s:UserCommandCwd(dir) abort
|
||||
return len(tree) ? FugitiveVimPath(tree) : getcwd()
|
||||
endfunction
|
||||
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
function! s:UserCommandList(...) abort
|
||||
if !fugitive#GitVersion(1, 8, 5)
|
||||
throw 'fugitive: Git 1.8.5 or higher required'
|
||||
@ -419,6 +453,7 @@ function! s:UserCommandList(...) abort
|
||||
if empty(tree)
|
||||
call add(git, '--git-dir=' . FugitiveGitPath(dir))
|
||||
elseif len(tree) && s:cpath(tree) !=# s:cpath(getcwd())
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if fugitive#GitVersion(1, 8, 5)
|
||||
call extend(git, ['-C', FugitiveGitPath(tree)])
|
||||
@ -431,7 +466,13 @@ function! s:UserCommandList(...) abort
|
||||
=======
|
||||
call extend(git, ['-C', FugitiveGitPath(tree)])
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
call extend(git, ['-C', FugitiveGitPath(tree)])
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
endif
|
||||
endif
|
||||
return git + flags
|
||||
@ -632,6 +673,7 @@ function! s:BuildShell(dir, env, git, args) abort
|
||||
let pre = s:BuildEnvPrefix(a:env)
|
||||
if empty(tree) || index(cmd, '--') == len(cmd) - 1
|
||||
call insert(cmd, '--git-dir=' . FugitiveGitPath(a:dir))
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
elseif fugitive#GitVersion(1, 8, 5)
|
||||
call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
|
||||
@ -640,7 +682,12 @@ function! s:BuildShell(dir, env, git, args) abort
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
=======
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
else
|
||||
call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
|
||||
endif
|
||||
@ -663,16 +710,27 @@ function! s:SystemError(cmd, ...) abort
|
||||
endif
|
||||
endif
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
if exists('+guioptions') && &guioptions =~# '!'
|
||||
let guioptions = &guioptions
|
||||
set guioptions-=!
|
||||
endif
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
let out = call('system', [type(a:cmd) ==# type([]) ? fugitive#Prepare(a:cmd) : a:cmd] + a:000)
|
||||
return [out, v:shell_error]
|
||||
catch /^Vim\%((\a\+)\)\=:E484:/
|
||||
@ -685,7 +743,10 @@ function! s:SystemError(cmd, ...) abort
|
||||
let &shellredir = shellredir
|
||||
endif
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
=======
|
||||
@ -693,7 +754,15 @@ function! s:SystemError(cmd, ...) abort
|
||||
let &guioptions = guioptions
|
||||
endif
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
if exists('guioptions')
|
||||
let &guioptions = guioptions
|
||||
endif
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
endtry
|
||||
endfunction
|
||||
|
||||
@ -893,10 +962,17 @@ function! fugitive#RemoteUrl(...) abort
|
||||
else
|
||||
let url = s:ChompDefault('', [dir, 'remote', 'get-url', url, '--'])
|
||||
endif
|
||||
<<<<<<< HEAD
|
||||
endif
|
||||
if !get(a:, 3, 0)
|
||||
let url = fugitive#ResolveRemote(url)
|
||||
endif
|
||||
=======
|
||||
endif
|
||||
if !get(a:, 3, 0)
|
||||
let url = fugitive#ResolveRemote(url)
|
||||
endif
|
||||
>>>>>>> master
|
||||
return url
|
||||
endfunction
|
||||
|
||||
@ -1123,6 +1199,7 @@ function! s:Owner(path, ...) abort
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if filereadable(actualdir . 'MERGE_HEAD')
|
||||
let merge_head = 'MERGE_HEAD'
|
||||
@ -1135,6 +1212,9 @@ function! s:Owner(path, ...) abort
|
||||
=======
|
||||
let merge_head = s:MergeHead(dir)
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
let merge_head = s:MergeHead(dir)
|
||||
>>>>>>> master
|
||||
if empty(merge_head)
|
||||
return ''
|
||||
endif
|
||||
@ -1329,7 +1409,10 @@ function! fugitive#Find(object, ...) abort
|
||||
if commit !~# '^[0-9a-f]\{40,\}$\|^$'
|
||||
let commit = matchstr(s:ChompDefault('', [dir, 'rev-parse', '--verify', commit . (len(file) ? '^{}' : ''), '--']), '\<[0-9a-f]\{40,\}\>')
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
=======
|
||||
@ -1337,6 +1420,11 @@ function! fugitive#Find(object, ...) abort
|
||||
let commit = repeat('0', 40)
|
||||
endif
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
if empty(commit) && len(file)
|
||||
let commit = repeat('0', 40)
|
||||
endif
|
||||
>>>>>>> master
|
||||
endif
|
||||
if len(commit)
|
||||
let f = 'fugitive://' . dir . '//' . commit . file
|
||||
@ -1497,6 +1585,7 @@ endfunction
|
||||
function! s:SplitExpandChain(string, ...) abort
|
||||
let list = []
|
||||
let string = a:string
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
let handle_bar = a:0 && a:1
|
||||
let dquote = handle_bar ? '"\%([^"]\|""\|\\"\)*"\|' : ''
|
||||
@ -1508,7 +1597,14 @@ function! s:SplitExpandChain(string, ...) abort
|
||||
let dquote = '"\%([^"]\|""\|\\"\)*"\|'
|
||||
let cwd = a:0 ? a:1 : getcwd()
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
let dquote = '"\%([^"]\|""\|\\"\)*"\|'
|
||||
let cwd = a:0 ? a:1 : getcwd()
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
while string =~# '\S'
|
||||
if string =~# '^\s*|'
|
||||
return [list, substitute(string, '^\s*', '', '')]
|
||||
@ -1528,6 +1624,7 @@ function! s:SplitExpandChain(string, ...) abort
|
||||
let seen_separator = 1
|
||||
endif
|
||||
endwhile
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
return handle_bar ? [list, ''] : list
|
||||
endfunction
|
||||
@ -1555,7 +1652,13 @@ function! s:ShellExpandChain(cmd, ...) abort
|
||||
=======
|
||||
return [list, '']
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
return [list, '']
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
endfunction
|
||||
|
||||
let s:trees = {}
|
||||
@ -1879,6 +1982,7 @@ endfunction
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
call s:add_methods('buffer',['getvar','getline','repo','type','spec','name','commit','path','relative'])
|
||||
|
||||
" Section: Completion
|
||||
@ -1898,6 +2002,9 @@ function! s:GlobComplete(lead, pattern) abort
|
||||
=======
|
||||
function! s:GlobComplete(lead, pattern, ...) abort
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
function! s:GlobComplete(lead, pattern, ...) abort
|
||||
>>>>>>> master
|
||||
if a:lead ==# '/'
|
||||
return []
|
||||
elseif v:version >= 704
|
||||
@ -2066,6 +2173,7 @@ function! s:QueryLog(refspec) abort
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
call map(lines, 'split(v:val, "\t")')
|
||||
@ -2074,6 +2182,10 @@ function! s:QueryLog(refspec) abort
|
||||
call map(lines, 'split(v:val, "\t", 1)')
|
||||
call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}')
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
call map(lines, 'split(v:val, "\t", 1)')
|
||||
call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}')
|
||||
>>>>>>> master
|
||||
return lines
|
||||
endfunction
|
||||
|
||||
@ -2691,6 +2803,7 @@ function! s:TempReadPost(file) abort
|
||||
if !has_key(dict, 'job')
|
||||
setlocal nobuflisted
|
||||
endif
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
setlocal foldmarker=<<<<<<<,>>>>>>>
|
||||
if empty(mapcheck('q', 'n'))
|
||||
@ -2703,6 +2816,14 @@ function! s:TempReadPost(file) abort
|
||||
let &l:filetype = dict.filetype
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
endif
|
||||
=======
|
||||
if get(dict, 'filetype', '') ==# 'git'
|
||||
call fugitive#MapJumps()
|
||||
endif
|
||||
if has_key(dict, 'filetype')
|
||||
let &l:filetype = dict.filetype
|
||||
endif
|
||||
>>>>>>> master
|
||||
setlocal foldmarker=<<<<<<<<,>>>>>>>>
|
||||
if !&modifiable
|
||||
if empty(mapcheck('q', 'n'))
|
||||
@ -2760,10 +2881,17 @@ function! s:RunFinished(state, ...) abort
|
||||
let first = join(readfile(a:state.file, '', 2), "\n")
|
||||
if get(a:state, 'filetype', '') ==# 'git' && first =~# '\<\([[:upper:][:digit:]_-]\+(\d\+)\).*\1'
|
||||
let a:state.filetype = 'man'
|
||||
<<<<<<< HEAD
|
||||
endif
|
||||
if !has_key(a:state, 'capture_bufnr')
|
||||
return
|
||||
endif
|
||||
=======
|
||||
endif
|
||||
if !has_key(a:state, 'capture_bufnr')
|
||||
return
|
||||
endif
|
||||
>>>>>>> master
|
||||
call fugitive#ReloadStatus(a:state, 1)
|
||||
endfunction
|
||||
|
||||
@ -3318,8 +3446,27 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
|
||||
\ '|call fugitive#ReloadStatus(' . string(dir) . ', 1)' .
|
||||
\ after
|
||||
endif
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
return 'exe ' . string('!' . escape(pre . s:shellesc(git + a:args), '!#%'))
|
||||
endfunction
|
||||
|
||||
<<<<<<< HEAD
|
||||
function! s:GitCommand(line1, line2, range, count, bang, mods, reg, arg, args) abort
|
||||
let dir = s:Dir()
|
||||
let [args, after] = s:SplitExpandChain(a:arg, s:Tree(dir))
|
||||
return s:GitExec(a:line1, a:line2, a:range, a:count, a:bang, a:mods, a:reg, args, dir) . after
|
||||
endfunction
|
||||
|
||||
function! s:Command(line1, line2, range, count, bang, mods, reg, arg, args, ...) abort
|
||||
let dir = a:0 ? s:Dir(a:1) : s:Dir()
|
||||
let args = s:SplitExpand(a:arg, s:Tree(dir))
|
||||
return s:GitExec(a:line1, a:line2, a:range, a:count, a:bang, a:mods, a:reg, args, dir)
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
endfunction
|
||||
|
||||
=======
|
||||
>>>>>>> master
|
||||
let s:exec_paths = {}
|
||||
function! s:ExecPath() abort
|
||||
let git = s:GitShellCmd()
|
||||
@ -3445,6 +3592,7 @@ function! s:StatusCommand(line1, line2, range, count, bang, mods, reg, arg, args
|
||||
let file = fugitive#Find(':', dir)
|
||||
let arg = ' +setl\ foldmarker=<<<<<<<<,>>>>>>>>\|let\ w:fugitive_status=FugitiveGitDir() ' .
|
||||
\ s:fnameescape(file)
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
for winnr in range(1, winnr('$'))
|
||||
if s:cpath(file, fnamemodify(bufname(winbufnr(winnr)), ':p'))
|
||||
@ -3476,6 +3624,24 @@ function! s:StatusCommand(line1, line2, range, count, bang, mods, reg, arg, args
|
||||
endif
|
||||
endfor
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
for tabnr in [tabpagenr()] + (mods =~# '\<tab\>' ? range(1, tabpagenr('$')) : [])
|
||||
let bufs = tabpagebuflist(tabnr)
|
||||
for winnr in range(1, tabpagewinnr(tabnr, '$'))
|
||||
if s:cpath(file, fnamemodify(bufname(bufs[winnr-1]), ':p'))
|
||||
if tabnr == tabpagenr() && winnr == winnr()
|
||||
call s:ReloadStatus()
|
||||
else
|
||||
call s:ExpireStatus(dir)
|
||||
exe tabnr . 'tabnext'
|
||||
exe winnr . 'wincmd w'
|
||||
endif
|
||||
let w:fugitive_status = dir
|
||||
1
|
||||
return ''
|
||||
endif
|
||||
endfor
|
||||
>>>>>>> master
|
||||
endfor
|
||||
if a:count ==# 0
|
||||
return mods . 'edit' . (a:bang ? '!' : '') . arg
|
||||
@ -3618,6 +3784,7 @@ if !exists('s:last_times')
|
||||
endif
|
||||
|
||||
function! s:ExpireStatus(bufnr) abort
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if a:bufnr == -2
|
||||
<<<<<<< HEAD
|
||||
@ -3627,7 +3794,13 @@ function! s:ExpireStatus(bufnr) abort
|
||||
=======
|
||||
if a:bufnr is# -2
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
if a:bufnr is# -2
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
let s:head_cache = {}
|
||||
let s:last_time = reltime()
|
||||
return ''
|
||||
@ -4229,6 +4402,7 @@ function! s:StageDiff(diff) abort
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if empty(info.paths) && info.section ==# 'Staged'
|
||||
=======
|
||||
@ -4237,6 +4411,9 @@ function! s:StageDiff(diff) abort
|
||||
=======
|
||||
if info.submodule =~# '^S'
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
if info.submodule =~# '^S'
|
||||
>>>>>>> master
|
||||
if info.section ==# 'Staged'
|
||||
return 'Git --paginate diff --no-ext-diff --submodule=log --cached -- ' . info.paths[0]
|
||||
elseif info.submodule =~# '^SC'
|
||||
@ -4253,6 +4430,7 @@ function! s:StageDiff(diff) abort
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
return a:diff.' HEAD:'.s:fnameescape(info.paths[1])
|
||||
elseif info.section ==# 'Staged' && info.sigil ==# '-'
|
||||
@ -4273,6 +4451,9 @@ function! s:StageDiff(diff) abort
|
||||
=======
|
||||
return a:diff . '! @:'.s:fnameescape(info.paths[1])
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
return a:diff . '! @:'.s:fnameescape(info.paths[1])
|
||||
>>>>>>> master
|
||||
elseif info.section ==# 'Staged' && info.sigil ==# '-'
|
||||
execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
|
||||
return a:diff . '! :0:%'
|
||||
@ -5245,6 +5426,7 @@ function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
|
||||
\ args + extra_args + paths + extra_paths)
|
||||
let state.target = path
|
||||
let title = titlepre . (listnr < 0 ? 'Gclog ' : 'Gllog ') . s:fnameescape(args + paths)
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if empty(paths + extra_paths) && empty(a:type) && a:count < 0 && len(s:Relative('/'))
|
||||
let after = '|echohl WarningMsg|echo ' . string('Use :0Glog or :0Gclog for old behavior of targeting current file') . '|echohl NONE' . after
|
||||
@ -5256,7 +5438,13 @@ function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
|
||||
=======
|
||||
return s:QuickfixStream(listnr, 'log', title, s:UserCommandList(dir) + cmd, !a:bang, a:mods, s:function('s:LogParse'), state, dir) . after
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
return s:QuickfixStream(listnr, 'log', title, s:UserCommandList(dir) + cmd, !a:bang, a:mods, s:function('s:LogParse'), state, dir) . after
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
endfunction
|
||||
|
||||
" Section: :Gedit, :Gpedit, :Gsplit, :Gvsplit, :Gtabedit, :Gread
|
||||
@ -5392,6 +5580,7 @@ endfunction
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
function! s:OpenExec(cmd, mods, args, ...) abort
|
||||
<<<<<<< HEAD
|
||||
let dir = s:Dir(a:0 ? a:1 : -1)
|
||||
@ -5441,7 +5630,15 @@ let s:bang_edits = {'split': 'Git', 'vsplit': 'vert Git', 'tabedit': 'tab Git',
|
||||
function! fugitive#Open(cmd, bang, mods, arg, args) abort
|
||||
exe s:VersionCheck()
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
let s:bang_edits = {'split': 'Git', 'vsplit': 'vert Git', 'tabedit': 'tab Git', 'pedit': 'Git!'}
|
||||
function! fugitive#Open(cmd, bang, mods, arg, args) abort
|
||||
exe s:VersionCheck()
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
if a:bang
|
||||
return 'echoerr ' . string(':G' . a:cmd . '! for temp buffer output has been replaced by :' . get(s:bang_edits, a:cmd, 'Git') . ' --paginate')
|
||||
endif
|
||||
@ -5452,6 +5649,7 @@ function! fugitive#Open(cmd, bang, mods, arg, args) abort
|
||||
let [file, pre] = s:OpenParse(a:args, 1)
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
let [file, pre] = s:OpenParse(a:args)
|
||||
let file = s:Generate(file)
|
||||
@ -5461,7 +5659,13 @@ function! fugitive#Open(cmd, bang, mods, arg, args) abort
|
||||
=======
|
||||
let [file, pre] = s:OpenParse(a:arg, 1)
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
let [file, pre] = s:OpenParse(a:arg, 1)
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
catch /^fugitive:/
|
||||
return 'echoerr ' . string(v:exception)
|
||||
endtry
|
||||
@ -5509,6 +5713,7 @@ function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort
|
||||
return 'echoerr ' . string(':Gread! for temp buffer output has been replaced by :{range}Git! --paginate')
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
try
|
||||
let cdback = s:Cd(s:Tree())
|
||||
@ -5545,7 +5750,17 @@ function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort
|
||||
try
|
||||
let [file, pre] = s:OpenParse(a:arg, 0)
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
return 'echoerr ' . string(':Gread! for temp buffer output has been replaced by :{range}Git! --paginate')
|
||||
endif
|
||||
let [read, post] = s:ReadPrepare(a:line1, a:count, a:range, a:mods)
|
||||
try
|
||||
let [file, pre] = s:OpenParse(a:arg, 0)
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
catch /^fugitive:/
|
||||
return 'echoerr ' . string(v:exception)
|
||||
endtry
|
||||
@ -5737,6 +5952,7 @@ endfunction
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
function! s:AskPassArgs(dir) abort
|
||||
if (len($DISPLAY) || len($TERM_PROGRAM) || has('gui_running')) && fugitive#GitVersion(1, 8) &&
|
||||
\ empty($GIT_ASKPASS) && empty($SSH_ASKPASS) && empty(get(fugitive#Config(a:dir), 'core.askpass', []))
|
||||
@ -5825,6 +6041,8 @@ endfunction
|
||||
|
||||
=======
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
=======
|
||||
>>>>>>> master
|
||||
" Section: :Gdiff
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
|
||||
@ -5947,6 +6165,7 @@ function! s:IsConflicted() abort
|
||||
endfunction
|
||||
|
||||
function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
let args = copy(a:args)
|
||||
<<<<<<< HEAD
|
||||
@ -5956,7 +6175,14 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
|
||||
exe s:VersionCheck()
|
||||
let args = s:ArgSplit(a:arg)
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
exe s:VersionCheck()
|
||||
let args = s:ArgSplit(a:arg)
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
let post = ''
|
||||
if get(args, 0) =~# '^+'
|
||||
let post = remove(args, 0)[1:-1]
|
||||
@ -6337,6 +6563,7 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
|
||||
elseif empty(files) && len(matchstr(s:DirCommitFile(@%)[1], '^\x\x\+$'))
|
||||
let cmd += [matchstr(s:DirCommitFile(@%)[1], '^\x\x\+$')]
|
||||
elseif empty(files) && !s:HasOpt(flags, '--reverse')
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
let cmd += ['--contents', '-']
|
||||
<<<<<<< HEAD
|
||||
@ -6354,6 +6581,17 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
|
||||
if exists('delete_in')
|
||||
call delete(tempname . '.in')
|
||||
endif
|
||||
=======
|
||||
let cmd += ['--contents', tempname . '.in']
|
||||
silent execute 'noautocmd keepalt %write ' . s:fnameescape(tempname . '.in')
|
||||
let delete_in = 1
|
||||
endif
|
||||
let basecmd = [{'git': a:options.git, 'dir': dir}] + ['--literal-pathspecs'] + cmd + ['--'] + (len(files) ? files : [file])
|
||||
let [err, exec_error] = s:TempCmd(temp, basecmd)
|
||||
if exists('delete_in')
|
||||
call delete(tempname . '.in')
|
||||
endif
|
||||
>>>>>>> master
|
||||
redraw
|
||||
try
|
||||
if exec_error
|
||||
@ -6466,6 +6704,7 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
|
||||
if exists('+signcolumn')
|
||||
setlocal signcolumn=no
|
||||
endif
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
execute "vertical resize ".(s:linechars('.\{-\}\ze\s\+\d\+)')+1)
|
||||
<<<<<<< HEAD
|
||||
@ -6493,7 +6732,13 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
|
||||
=======
|
||||
execute "vertical resize ".(s:linechars('.\{-\}\s\+\d\+\ze)')+1)
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
execute "vertical resize ".(s:linechars('.\{-\}\s\+\d\+\ze)')+1)
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
call s:Map('n', 'A', ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze [0-9:/+-][0-9:/+ -]* \\d\\+)')+1+v:count)<CR>", '<silent>')
|
||||
call s:Map('n', 'C', ":<C-u>exe 'vertical resize '.(<SID>linechars('^\\S\\+')+1+v:count)<CR>", '<silent>')
|
||||
call s:Map('n', 'D', ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze\\d\\ze\\s\\+\\d\\+)')+1-v:count)<CR>", '<silent>')
|
||||
@ -6924,6 +7169,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
|
||||
if a:count > 0 && empty(a:args) && commit =~# '^\x\{40,\}$'
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if a:count && empty(a:args) && commit =~# '^\x\{40,\}$'
|
||||
=======
|
||||
@ -6932,7 +7178,13 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
|
||||
=======
|
||||
if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$'
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$'
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
let blame_list = tempname()
|
||||
call writefile([commit, ''], blame_list, 'b')
|
||||
let blame_in = tempname()
|
||||
@ -6941,6 +7193,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
|
||||
let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', a:line1.','.a:count, '-S', blame_list, '-s', '--show-number', './' . path])
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
let [blame, exec_error] = s:LinesError(['blame', '--contents', blame_in, '-L', a:line1.','.a:count, '-S', blame_list, '-s', '--show-number', './' . path])
|
||||
=======
|
||||
@ -6949,7 +7202,13 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
|
||||
=======
|
||||
let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', line1.','.line2, '-S', blame_list, '-s', '--show-number', './' . path], dir)
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', line1.','.line2, '-S', blame_list, '-s', '--show-number', './' . path], dir)
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
if !exec_error
|
||||
let blame_regex = '^\^\x\+\s\+\zs\d\+\ze\s'
|
||||
if get(blame, 0) =~# blame_regex && get(blame, -1) =~# blame_regex
|
||||
|
||||
@ -84,8 +84,11 @@ that are part of Git repositories).
|
||||
*:Git_mergetool*
|
||||
:Git mergetool [args] Like |:Git_difftool|, but target merge conflicts.
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
<<<<<<< HEAD
|
||||
*:Git_push*
|
||||
:Git push [args] Invoke git-push, load the results into the |quickfix|
|
||||
@ -121,7 +124,12 @@ that are part of Git repositories).
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
|
||||
=======
|
||||
=======
|
||||
>>>>>>> master
|
||||
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
|
||||
*:Ggrep* *:Gcgrep* *:Git_grep*
|
||||
:Ggrep[!] [args] |:grep|[!] with git-grep as 'grepprg'.
|
||||
:Git[!] grep [args]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user