motiejus/dotfiles

Unnamed repository; edit this file 'description' to name the repository.
git clone https://git.jakstys.lt/motiejus/dotfiles.git
Log | Tree | Refs | README | LICENSE

commit 5d11ff75014818da25596a89cea71df680e31788 (tree)
parent dd4d4c75959767b591852091bb73b7c7a85a02e2
Author: Tim Pope <code@tpope.net>
Date:   Fri,  1 Jun 2018 13:46:22 -0400

Extract autoload file

Diffstat:
Aautoload/fugitive.vim | 3076+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mplugin/fugitive.vim | 3065+------------------------------------------------------------------------------
2 files changed, 3077 insertions(+), 3064 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim @@ -0,0 +1,3076 @@ +" Location: autoload/fugitive.vim +" Maintainer: Tim Pope <http://tpo.pe/> + +if exists('g:autoloaded_fugitive') + finish +endif +let g:autoloaded_fugitive = 1 + +if !exists('g:fugitive_git_executable') + let g:fugitive_git_executable = 'git' +endif + +" Section: Utility + +function! s:function(name) abort + return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),'')) +endfunction + +function! s:sub(str,pat,rep) abort + return substitute(a:str,'\v\C'.a:pat,a:rep,'') +endfunction + +function! s:gsub(str,pat,rep) abort + return substitute(a:str,'\v\C'.a:pat,a:rep,'g') +endfunction + +function! s:winshell() abort + return &shell =~? 'cmd' || exists('+shellslash') && !&shellslash +endfunction + +function! s:shellesc(arg) abort + if a:arg =~ '^[A-Za-z0-9_/.-]\+$' + return a:arg + elseif s:winshell() + return '"'.s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"').'"' + else + return shellescape(a:arg) + endif +endfunction + +function! s:fnameescape(file) abort + if exists('*fnameescape') + return fnameescape(a:file) + else + return escape(a:file," \t\n*?[{`$\\%#'\"|!<") + endif +endfunction + +function! s:throw(string) abort + let v:errmsg = 'fugitive: '.a:string + throw v:errmsg +endfunction + +function! s:warn(str) abort + echohl WarningMsg + echomsg a:str + echohl None + let v:warningmsg = a:str +endfunction + +function! s:shellslash(path) abort + if s:winshell() + return tr(a:path, '\', '/') + else + return a:path + endif +endfunction + +let s:executables = {} + +function! s:executable(binary) abort + if !has_key(s:executables, a:binary) + let s:executables[a:binary] = executable(a:binary) + endif + return s:executables[a:binary] +endfunction + +let s:git_versions = {} + +function! s:git_command() abort + return get(g:, 'fugitive_git_command', g:fugitive_git_executable) +endfunction + +function! fugitive#git_version(...) abort + if !has_key(s:git_versions, g:fugitive_git_executable) + let s:git_versions[g:fugitive_git_executable] = matchstr(system(g:fugitive_git_executable.' --version'), "\\S\\+\n") + endif + return s:git_versions[g:fugitive_git_executable] +endfunction + +function! s:recall() abort + let rev = s:sub(s:buffer().rev(), '^/', '') + if rev ==# ':' + return matchstr(getline('.'),'^.\=\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$\|^\d\{6} \x\{40\} \d\t\zs.*') + elseif s:buffer().type('tree') + let file = matchstr(getline('.'), '\t\zs.*') + if empty(file) && line('.') > 2 + let file = s:sub(getline('.'), '/$', '') + endif + if !empty(file) && rev !~# ':$' + return rev . '/' . file + else + return rev . file + endif + endif + return rev +endfunction + +function! s:map(mode, lhs, rhs, ...) abort + let flags = (a:0 ? a:1 : '') . (a:rhs =~# '^<Plug>' ? '' : '<script>') + let head = a:lhs + let tail = '' + let keys = get(g:, a:mode.'remap', {}) + if type(keys) == type([]) + return + endif + while !empty(head) + if has_key(keys, head) + let head = keys[head] + if empty(head) + return + endif + break + endif + let tail = matchstr(head, '<[^<>]*>$\|.$') . tail + let head = substitute(head, '<[^<>]*>$\|.$', '', '') + endwhile + if flags !~# '<unique>' || empty(mapcheck(head.tail, a:mode)) + exe a:mode.'map <buffer>' flags head.tail a:rhs + endif +endfunction + +function! s:add_methods(namespace, method_names) abort + for name in a:method_names + let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name) + endfor +endfunction + +let s:commands = [] +function! s:command(definition) abort + let s:commands += [a:definition] +endfunction + +function! s:define_commands() abort + for command in s:commands + exe 'command! -buffer '.command + endfor +endfunction + +let s:abstract_prototype = {} + +" Section: Initialization + +function! fugitive#Init() abort + if exists('#User#FugitiveBoot') + try + let [save_mls, &modelines] = [&mls, 0] + doautocmd User FugitiveBoot + finally + let &mls = save_mls + endtry + endif + if !exists('g:fugitive_no_maps') + call s:map('c', '<C-R><C-G>', 'fnameescape(<SID>recall())', '<expr>') + call s:map('n', 'y<C-G>', ':call setreg(v:register, <SID>recall())<CR>', '<silent>') + endif + let buffer = fugitive#buffer() + if expand('%:p') =~# '://' + call buffer.setvar('&path', s:sub(buffer.getvar('&path'), '^\.%(,|$)', '')) + endif + if stridx(buffer.getvar('&tags'), escape(b:git_dir, ', ')) == -1 + if filereadable(b:git_dir.'/tags') + call buffer.setvar('&tags', escape(b:git_dir.'/tags', ', ').','.buffer.getvar('&tags')) + endif + if &filetype !=# '' && filereadable(b:git_dir.'/'.&filetype.'.tags') + call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags')) + endif + endif + try + let [save_mls, &modelines] = [&mls, 0] + call s:define_commands() + doautocmd User Fugitive + finally + let &mls = save_mls + endtry +endfunction + +function! fugitive#is_git_dir(path) abort + return FugitiveIsGitDir(a:path) +endfunction + +function! fugitive#extract_git_dir(path) abort + return FugitiveExtractGitDir(a:path) +endfunction + +function! fugitive#detect(path) abort + return FugitiveDetect(a:path) +endfunction + +" Section: Repository + +let s:repo_prototype = {} +let s:repos = {} + +function! s:repo(...) abort + let dir = a:0 ? a:1 : (exists('b:git_dir') && b:git_dir !=# '' ? b:git_dir : FugitiveExtractGitDir(expand('%:p'))) + if dir !=# '' + if has_key(s:repos, dir) + let repo = get(s:repos, dir) + else + let repo = {'git_dir': dir} + let s:repos[dir] = repo + endif + return extend(extend(repo, s:repo_prototype, 'keep'), s:abstract_prototype, 'keep') + endif + call s:throw('not a git repository: '.expand('%:p')) +endfunction + +function! fugitive#repo(...) abort + return call('s:repo', a:000) +endfunction + +function! s:repo_dir(...) dict abort + return join([self.git_dir]+a:000,'/') +endfunction + +function! s:repo_tree(...) dict abort + let dir = FugitiveTreeForGitDir(self.git_dir) + if dir ==# '' + call s:throw('no work tree') + else + return join([dir]+a:000,'/') + endif +endfunction + +function! s:repo_bare() dict abort + if self.dir() =~# '/\.git$' + return 0 + else + return FugitiveTreeForGitDir(self.git_dir) ==# '' + endif +endfunction + +function! s:repo_translate(spec) dict abort + let refs = self.dir('refs/') + if filereadable(self.dir('commondir')) + let refs = simplify(self.dir(get(readfile(self.dir('commondir'), 1), 0, ''))) . '/refs/' + endif + if a:spec ==# '.' || a:spec ==# '/.' + return self.bare() ? self.dir() : self.tree() + elseif a:spec =~# '^/\=\.git$' && self.bare() + return self.dir() + elseif a:spec =~# '^/\=\.git/' + return self.dir(s:sub(a:spec, '^/=\.git/', '')) + elseif a:spec =~# '^/' + return self.tree().a:spec + elseif a:spec =~# '^:[0-3]:' + return 'fugitive://'.self.dir().'//'.a:spec[1].'/'.a:spec[3:-1] + elseif a:spec ==# ':' + if $GIT_INDEX_FILE =~# '/[^/]*index[^/]*\.lock$' && fnamemodify($GIT_INDEX_FILE,':p')[0:strlen(self.dir())] ==# self.dir('') && filereadable($GIT_INDEX_FILE) + return fnamemodify($GIT_INDEX_FILE,':p') + else + return self.dir('index') + endif + elseif a:spec =~# '^:/' + let ref = self.rev_parse(matchstr(a:spec,'.[^:]*')) + return 'fugitive://'.self.dir().'//'.ref + elseif a:spec =~# '^:' + return 'fugitive://'.self.dir().'//0/'.a:spec[1:-1] + elseif a:spec ==# '@' + return self.dir('HEAD') + elseif a:spec =~# 'HEAD\|^refs/' && a:spec !~ ':' && filereadable(refs . '../' . a:spec) + return simplify(refs . '../' . a:spec) + elseif filereadable(refs.a:spec) + return refs.a:spec + elseif filereadable(refs.'tags/'.a:spec) + return refs.'tags/'.a:spec + elseif filereadable(refs.'heads/'.a:spec) + return refs.'heads/'.a:spec + elseif filereadable(refs.'remotes/'.a:spec) + return refs.'remotes/'.a:spec + elseif filereadable(refs.'remotes/'.a:spec.'/HEAD') + return refs.'remotes/'.a:spec.'/HEAD' + else + try + let ref = self.rev_parse(matchstr(a:spec,'[^:]*')) + let path = s:sub(matchstr(a:spec,':.*'),'^:','/') + return 'fugitive://'.self.dir().'//'.ref.path + catch /^fugitive:/ + return self.tree(a:spec) + endtry + endif +endfunction + +function! s:repo_head(...) dict abort + let head = s:repo().head_ref() + + if head =~# '^ref: ' + let branch = s:sub(head,'^ref: %(refs/%(heads/|remotes/|tags/)=)=','') + elseif head =~# '^\x\{40\}$' + " truncate hash to a:1 characters if we're in detached head mode + let len = a:0 ? a:1 : 0 + let branch = len ? head[0:len-1] : '' + else + return '' + endif + + return branch +endfunction + +call s:add_methods('repo',['dir','tree','bare','translate','head']) + +function! s:repo_git_command(...) dict abort + let git = s:git_command() . ' --git-dir='.s:shellesc(self.git_dir) + return git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'') +endfunction + +function! s:repo_git_chomp(...) dict abort + let git = g:fugitive_git_executable . ' --git-dir='.s:shellesc(self.git_dir) + let output = git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'') + return s:sub(system(output),'\n$','') +endfunction + +function! s:repo_git_chomp_in_tree(...) dict abort + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let dir = getcwd() + try + execute cd s:fnameescape(s:repo().tree()) + return call(s:repo().git_chomp, a:000, s:repo()) + finally + execute cd s:fnameescape(dir) + endtry +endfunction + +function! s:repo_rev_parse(rev) dict abort + let hash = self.git_chomp('rev-parse','--verify',a:rev) + if hash =~ '\<\x\{40\}$' + return matchstr(hash,'\<\x\{40\}$') + endif + call s:throw('rev-parse '.a:rev.': '.hash) +endfunction + +call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse']) + +function! s:repo_dirglob(base) dict abort + let base = s:sub(a:base,'^/','') + let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*/')),"\n") + call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]') + return matches +endfunction + +function! s:repo_superglob(base) dict abort + if a:base =~# '^/' || a:base !~# ':' + let results = [] + if a:base !~# '^/' + let heads = ["HEAD","ORIG_HEAD","FETCH_HEAD","MERGE_HEAD"] + let heads += sort(split(s:repo().git_chomp("rev-parse","--symbolic","--branches","--tags","--remotes"),"\n")) + " Add any stashes. + if filereadable(s:repo().dir('refs/stash')) + let heads += ["stash"] + let heads += sort(split(s:repo().git_chomp("stash","list","--pretty=format:%gd"),"\n")) + endif + call filter(heads,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base') + let results += heads + endif + if !self.bare() + let base = s:sub(a:base,'^/','') + let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*')),"\n") + call map(matches,'s:shellslash(v:val)') + call map(matches,'v:val !~ "/$" && isdirectory(v:val) ? v:val."/" : v:val') + call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]') + let results += matches + endif + return results + + elseif a:base =~# '^:' + let entries = split(self.git_chomp('ls-files','--stage'),"\n") + call map(entries,'s:sub(v:val,".*(\\d)\\t(.*)",":\\1:\\2")') + if a:base !~# '^:[0-3]\%(:\|$\)' + call filter(entries,'v:val[1] == "0"') + call map(entries,'v:val[2:-1]') + endif + call filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base') + return entries + + else + let tree = matchstr(a:base,'.*[:/]') + let entries = split(self.git_chomp('ls-tree',tree),"\n") + call map(entries,'s:sub(v:val,"^04.*\\zs$","/")') + call map(entries,'tree.s:sub(v:val,".*\t","")') + return filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base') + endif +endfunction + +call s:add_methods('repo',['dirglob','superglob']) + +function! s:repo_config(conf) dict abort + return matchstr(s:repo().git_chomp('config',a:conf),"[^\r\n]*") +endfun + +function! s:repo_user() dict abort + let username = s:repo().config('user.name') + let useremail = s:repo().config('user.email') + return username.' <'.useremail.'>' +endfun + +function! s:repo_aliases() dict abort + if !has_key(self,'_aliases') + let self._aliases = {} + for line in split(self.git_chomp('config','-z','--get-regexp','^alias[.]'),"\1") + let self._aliases[matchstr(line, '\.\zs.\{-}\ze\n')] = matchstr(line, '\n\zs.*') + endfor + endif + return self._aliases +endfunction + +call s:add_methods('repo',['config', 'user', 'aliases']) + +function! s:repo_keywordprg() dict abort + let args = ' --git-dir='.escape(self.dir(),"\\\"' ") + if has('gui_running') && !has('win32') + return s:git_command() . ' --no-pager' . args . ' log -1' + else + return s:git_command() . args . ' show' + endif +endfunction + +call s:add_methods('repo',['keywordprg']) + +" Section: Buffer + +let s:buffer_prototype = {} + +function! s:buffer(...) abort + let buffer = {'#': bufnr(a:0 ? a:1 : '%')} + call extend(extend(buffer,s:buffer_prototype,'keep'),s:abstract_prototype,'keep') + if buffer.getvar('git_dir') !=# '' + return buffer + endif + call s:throw('not a git repository: '.expand('%:p')) +endfunction + +function! fugitive#buffer(...) abort + return s:buffer(a:0 ? a:1 : '%') +endfunction + +function! s:buffer_getvar(var) dict abort + return getbufvar(self['#'],a:var) +endfunction + +function! s:buffer_setvar(var,value) dict abort + return setbufvar(self['#'],a:var,a:value) +endfunction + +function! s:buffer_getline(lnum) dict abort + return get(getbufline(self['#'], a:lnum), 0, '') +endfunction + +function! s:buffer_repo() dict abort + return s:repo(self.getvar('git_dir')) +endfunction + +function! s:buffer_type(...) dict abort + if self.getvar('fugitive_type') != '' + let type = self.getvar('fugitive_type') + elseif fnamemodify(self.spec(),':p') =~# '.\git/refs/\|\.git/\w*HEAD$' + let type = 'head' + elseif self.getline(1) =~ '^tree \x\{40\}$' && self.getline(2) == '' + let type = 'tree' + elseif self.getline(1) =~ '^\d\{6\} \w\{4\} \x\{40\}\>\t' + let type = 'tree' + elseif self.getline(1) =~ '^\d\{6\} \x\{40\}\> \d\t' + let type = 'index' + elseif isdirectory(self.spec()) + let type = 'directory' + elseif self.spec() == '' + let type = 'null' + else + let type = 'file' + endif + if a:0 + return !empty(filter(copy(a:000),'v:val ==# type')) + else + return type + endif +endfunction + +if has('win32') + + function! s:buffer_spec() dict abort + let bufname = bufname(self['#']) + let retval = '' + for i in split(bufname,'[^:]\zs\\') + let retval = fnamemodify((retval==''?'':retval.'\').i,':.') + endfor + return s:shellslash(fnamemodify(retval,':p')) + endfunction + +else + + function! s:buffer_spec() dict abort + let bufname = bufname(self['#']) + return s:shellslash(bufname == '' ? '' : fnamemodify(bufname,':p')) + endfunction + +endif + +function! s:buffer_name() dict abort + return self.spec() +endfunction + +function! s:buffer_commit() dict abort + return matchstr(self.spec(),'^fugitive://.\{-\}//\zs\w*') +endfunction + +function! s:cpath(path) abort + if exists('+fileignorecase') && &fileignorecase + return tolower(a:path) + else + return a:path + endif +endfunction + +function! s:buffer_path(...) dict abort + let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*') + if rev != '' + let rev = s:sub(rev,'\w*','') + elseif s:cpath(self.spec()[0 : len(self.repo().dir())]) ==# + \ s:cpath(self.repo().dir() . '/') + let rev = '/.git'.self.spec()[strlen(self.repo().dir()) : -1] + elseif !self.repo().bare() && + \ s:cpath(self.spec()[0 : len(self.repo().tree())]) ==# + \ s:cpath(self.repo().tree() . '/') + let rev = self.spec()[strlen(self.repo().tree()) : -1] + endif + return s:sub(s:sub(rev,'.\zs/$',''),'^/',a:0 ? a:1 : '') +endfunction + +function! s:buffer_rev() dict abort + let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*') + if rev =~ '^\x/' + return ':'.rev[0].':'.rev[2:-1] + elseif rev =~ '.' + return s:sub(rev,'/',':') + elseif self.spec() =~ '\.git/index$' + return ':' + elseif self.spec() =~ '\.git/refs/\|\.git/.*HEAD$' + return self.spec()[strlen(self.repo().dir())+1 : -1] + else + return self.path('/') + endif +endfunction + +function! s:buffer_sha1() dict abort + if self.spec() =~ '^fugitive://' || self.spec() =~ '\.git/refs/\|\.git/.*HEAD$' + return self.repo().rev_parse(self.rev()) + else + return '' + endif +endfunction + +function! s:buffer_expand(rev) dict abort + if a:rev =~# '^:[0-3]$' + let file = a:rev.self.path(':') + elseif a:rev =~# '^[-:]/$' + let file = '/'.self.path() + elseif a:rev =~# '^-' + let file = 'HEAD^{}'.a:rev[1:-1].self.path(':') + elseif a:rev =~# '^@{' + let file = 'HEAD'.a:rev.self.path(':') + elseif a:rev =~# '^[~^]' + let commit = s:sub(self.commit(),'^\d=$','HEAD') + let file = commit.a:rev.self.path(':') + else + let file = a:rev + endif + return s:sub(substitute(file, + \ '%$\|\\\([[:punct:]]\)','\=len(submatch(1)) ? submatch(1) : self.path()','g'), + \ '\.\@<=/$','') +endfunction + +function! s:buffer_containing_commit() dict abort + if self.commit() =~# '^\d$' + return ':' + elseif self.commit() =~# '.' + return self.commit() + else + return 'HEAD' + endif +endfunction + +function! s:buffer_up(...) dict abort + let rev = self.rev() + let c = a:0 ? a:1 : 1 + while c + if rev =~# '^[/:]$' + let rev = 'HEAD' + elseif rev =~# '^:' + let rev = ':' + elseif rev =~# '^refs/[^^~:]*$\|^[^^~:]*HEAD$' + let rev .= '^{}' + elseif rev =~# '^/\|:.*/' + let rev = s:sub(rev, '.*\zs/.*', '') + elseif rev =~# ':.' + let rev = matchstr(rev, '^[^:]*:') + elseif rev =~# ':$' + let rev = rev[0:-2] + else + return rev.'~'.c + endif + let c -= 1 + endwhile + return rev +endfunction + +call s:add_methods('buffer',['getvar','setvar','getline','repo','type','spec','name','commit','path','rev','sha1','expand','containing_commit','up']) + +" Section: Git + +call s:command("-bang -nargs=? -complete=customlist,s:GitComplete Git :execute s:Git(<bang>0,'<mods>',<q-args>)") + +function! s:ExecuteInTree(cmd) abort + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let dir = getcwd() + try + execute cd s:fnameescape(s:repo().tree()) + execute a:cmd + finally + execute cd s:fnameescape(dir) + endtry +endfunction + +function! s:Git(bang, mods, args) abort + if a:bang + return s:Edit('edit', 1, a:mods, a:args) + endif + let git = s:git_command() + if has('gui_running') && !has('win32') + let git .= ' --no-pager' + endif + let args = matchstr(a:args,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=') + if exists(':terminal') && has('nvim') + let dir = s:repo().tree() + if expand('%') != '' + -tabedit % + else + -tabnew + endif + execute 'lcd' fnameescape(dir) + execute 'terminal' git args + else + call s:ExecuteInTree('!'.git.' '.args) + if has('win32') + call fugitive#ReloadStatus() + endif + endif + return matchstr(a:args, '\v\C\\@<!%(\\\\)*\|\zs.*') +endfunction + +function! fugitive#git_commands() abort + if !exists('s:exec_path') + let s:exec_path = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','') + endif + return map(split(glob(s:exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(s:exec_path)+5 : -1],"\\.exe$","")') +endfunction + +function! s:GitComplete(A, L, P) abort + if strpart(a:L, 0, a:P) !~# ' [[:alnum:]-]\+ ' + let cmds = fugitive#git_commands() + return filter(sort(cmds+keys(s:repo().aliases())), 'strpart(v:val, 0, strlen(a:A)) ==# a:A') + else + return s:repo().superglob(a:A) + endif +endfunction + +" Section: Gcd, Glcd + +function! s:DirComplete(A,L,P) abort + let matches = s:repo().dirglob(a:A) + return matches +endfunction + +call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Gcd :exe 'cd<bang>' s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))") +call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :exe 'lcd<bang>' s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))") + +" Section: Gstatus + +call s:command("-bar -bang -range=-1 Gstatus :execute s:Status(<bang>0, <count>, '<mods>')") +augroup fugitive_status + autocmd! + if !has('win32') + autocmd FocusGained,ShellCmdPost * call fugitive#ReloadStatus() + autocmd BufDelete term://* call fugitive#ReloadStatus() + endif +augroup END + +function! s:Status(bang, count, mods) abort + try + exe (a:mods ==# '<mods>' ? '' : a:mods) 'Gpedit :' + wincmd P + setlocal foldmethod=syntax foldlevel=1 + nnoremap <buffer> <silent> q :<C-U>bdelete<CR> + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry + return '' +endfunction + +function! fugitive#ReloadStatus() abort + if exists('s:reloading_status') + return + endif + try + let s:reloading_status = 1 + let mytab = tabpagenr() + for tab in [mytab] + range(1,tabpagenr('$')) + for winnr in range(1,tabpagewinnr(tab,'$')) + if getbufvar(tabpagebuflist(tab)[winnr-1],'fugitive_type') ==# 'index' + execute 'tabnext '.tab + if winnr != winnr() + execute winnr.'wincmd w' + let restorewinnr = 1 + endif + try + if !&modified + call fugitive#BufReadStatus() + endif + finally + if exists('restorewinnr') + wincmd p + endif + execute 'tabnext '.mytab + endtry + endif + endfor + endfor + finally + unlet! s:reloading_status + endtry +endfunction + +function! fugitive#reload_status() abort + return fugitive#ReloadStatus() +endfunction + +function! s:stage_info(lnum) abort + let filename = matchstr(getline(a:lnum),'^.\=\t\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$') + let lnum = a:lnum + if has('multi_byte_encoding') + let colon = '\%(:\|\%uff1a\)' + else + let colon = ':' + endif + while lnum && getline(lnum) !~# colon.'$' + let lnum -= 1 + endwhile + if !lnum + return ['', ''] + elseif (getline(lnum+1) =~# '^.\= .*\<git \%(reset\|rm --cached\) ' && getline(lnum+2) ==# '#') || getline(lnum) =~# '^\%(. \)\=Changes to be committed:$' + return [matchstr(filename, colon.' *\zs.*'), 'staged'] + elseif (getline(lnum+1) =~# '^.\= .*\<git add ' && getline(lnum+2) ==# '#' && getline(lnum+3) !~# colon.' ') || getline(lnum) =~# '^\(. \)\=Untracked files:$' + return [filename, 'untracked'] + elseif getline(lnum+2) =~# '^.\= .*\<git checkout ' || getline(lnum) =~# '\%(. \)\=Changes not staged for commit:$' + return [matchstr(filename, colon.' *\zs.*'), 'unstaged'] + elseif getline(lnum+2) =~# '^.\= .*\<git \%(add\|rm\)' || getline(lnum) =~# '\%(. \)\=Unmerged paths:$' + return [matchstr(filename, colon.' *\zs.*'), 'unmerged'] + else + return ['', 'unknown'] + endif +endfunction + +function! s:StageNext(count) abort + for i in range(a:count) + call search('^.\=\t.*','W') + endfor + return '.' +endfunction + +function! s:StagePrevious(count) abort + if line('.') == 1 && exists(':CtrlP') && get(g:, 'ctrl_p_map') =~? '^<c-p>$' + return 'CtrlP '.fnameescape(s:repo().tree()) + else + for i in range(a:count) + call search('^.\=\t.*','Wbe') + endfor + return '.' + endif +endfunction + +function! s:StageReloadSeek(target,lnum1,lnum2) abort + let jump = a:target + let f = matchstr(getline(a:lnum1-1),'^.\=\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*') + if f !=# '' | let jump = f | endif + let f = matchstr(getline(a:lnum2+1),'^.\=\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*') + if f !=# '' | let jump = f | endif + silent! edit! + 1 + redraw + call search('^.\=\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\V'.jump.'\%( ([^()[:digit:]]\+)\)\=\$','W') +endfunction + +function! s:StageUndo() abort + let [filename, section] = s:stage_info(line('.')) + if empty(filename) + return '' + endif + let repo = s:repo() + let hash = repo.git_chomp('hash-object', '-w', filename) + if !empty(hash) + if section ==# 'untracked' + call repo.git_chomp_in_tree('clean', '-f', '--', filename) + elseif section ==# 'unmerged' + call repo.git_chomp_in_tree('rm', '--', filename) + elseif section ==# 'unstaged' + call repo.git_chomp_in_tree('checkout', '--', filename) + else + call repo.git_chomp_in_tree('checkout', 'HEAD', '--', filename) + endif + call s:StageReloadSeek(filename, line('.'), line('.')) + let @" = hash + return 'checktime|redraw|echomsg ' . + \ string('To restore, :Git cat-file blob '.hash[0:6].' > '.filename) + endif +endfunction + +function! s:StageDiff(diff) abort + let [filename, section] = s:stage_info(line('.')) + if filename ==# '' && section ==# 'staged' + return 'Git! diff --no-ext-diff --cached' + elseif filename ==# '' + return 'Git! diff --no-ext-diff' + elseif filename =~# ' -> ' + let [old, new] = split(filename,' -> ') + execute 'Gedit '.s:fnameescape(':0:'.new) + return a:diff.' HEAD:'.s:fnameescape(old) + elseif section ==# 'staged' + execute 'Gedit '.s:fnameescape(':0:'.filename) + return a:diff.' -' + else + execute 'Gedit '.s:fnameescape('/'.filename) + return a:diff + endif +endfunction + +function! s:StageDiffEdit() abort + let [filename, section] = s:stage_info(line('.')) + let arg = (filename ==# '' ? '.' : filename) + if section ==# 'staged' + return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg) + elseif section ==# 'untracked' + let repo = s:repo() + call repo.git_chomp_in_tree('add','--intent-to-add',arg) + if arg ==# '.' + silent! edit! + 1 + if !search('^.*:\n.*\n.\= .*"git checkout \|^\%(# \)=Changes not staged for commit:$','W') + call search(':$','W') + endif + else + call s:StageReloadSeek(arg,line('.'),line('.')) + endif + return '' + else + return 'Git! diff --no-ext-diff '.s:shellesc(arg) + endif +endfunction + +function! s:StageToggle(lnum1,lnum2) abort + if a:lnum1 == 1 && a:lnum2 == 1 + return 'Gedit /.git|call search("^index$", "wc")' + endif + try + let output = '' + for lnum in range(a:lnum1,a:lnum2) + let [filename, section] = s:stage_info(lnum) + let repo = s:repo() + if getline('.') =~# ':$' + if section ==# 'staged' + call repo.git_chomp_in_tree('reset','-q') + silent! edit! + 1 + if !search('^.*:\n.\= .*"git add .*\n#\n\|^\%(. \)\=Untracked files:$','W') + call search(':$','W') + endif + return '' + elseif section ==# 'unstaged' + call repo.git_chomp_in_tree('add','-u') + silent! edit! + 1 + if !search('^.*:\n\.\= .*"git add .*\n#\n\|^\%( \)=Untracked files:$','W') + call search(':$','W') + endif + return '' + else + call repo.git_chomp_in_tree('add','.') + silent! edit! + 1 + call search(':$','W') + return '' + endif + endif + if filename ==# '' + continue + endif + execute lnum + if section ==# 'staged' + if filename =~ ' -> ' + let files_to_unstage = split(filename,' -> ') + else + let files_to_unstage = [filename] + endif + let filename = files_to_unstage[-1] + let cmd = ['reset','-q','--'] + files_to_unstage + elseif getline(lnum) =~# '^.\=\tdeleted:' + let cmd = ['rm','--',filename] + elseif getline(lnum) =~# '^.\=\tmodified:' + let cmd = ['add','--',filename] + else + let cmd = ['add','-A','--',filename] + endif + if !exists('first_filename') + let first_filename = filename + endif + let output .= call(repo.git_chomp_in_tree,cmd,s:repo())."\n" + endfor + if exists('first_filename') + call s:StageReloadSeek(first_filename,a:lnum1,a:lnum2) + endif + echo s:sub(s:gsub(output,'\n+','\n'),'\n$','') + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry + return 'checktime' +endfunction + +function! s:StagePatch(lnum1,lnum2) abort + let add = [] + let reset = [] + + for lnum in range(a:lnum1,a:lnum2) + let [filename, section] = s:stage_info(lnum) + if getline('.') =~# ':$' && section ==# 'staged' + return 'Git reset --patch' + elseif getline('.') =~# ':$' && section ==# 'unstaged' + return 'Git add --patch' + elseif getline('.') =~# ':$' && section ==# 'untracked' + return 'Git add -N .' + elseif filename ==# '' + continue + endif + if !exists('first_filename') + let first_filename = filename + endif + execute lnum + if filename =~ ' -> ' + let reset += [split(filename,' -> ')[1]] + elseif section ==# 'staged' + let reset += [filename] + elseif getline(lnum) !~# '^.\=\tdeleted:' + let add += [filename] + endif + endfor + try + if !empty(add) + execute "Git add --patch -- ".join(map(add,'s:shellesc(v:val)')) + endif + if !empty(reset) + execute "Git reset --patch -- ".join(map(reset,'s:shellesc(v:val)')) + endif + if exists('first_filename') + silent! edit! + 1 + redraw + call search('^.\=\t\%([[:alpha:] ]\+: *\)\=\V'.first_filename.'\%( ([^()[:digit:]]\+)\)\=\$','W') + endif + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry + return 'checktime' +endfunction + +" Section: Gcommit + +call s:command("-nargs=? -complete=customlist,s:CommitComplete Gcommit :execute s:Commit('<mods>', <q-args>)") + +function! s:Commit(mods, args, ...) abort + let mods = s:gsub(a:mods ==# '<mods>' ? '' : a:mods, '<tab>', '-tab') + let repo = a:0 ? a:1 : s:repo() + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let dir = getcwd() + let msgfile = repo.dir('COMMIT_EDITMSG') + let outfile = tempname() + let errorfile = tempname() + try + try + execute cd s:fnameescape(repo.tree()) + if s:winshell() + let command = '' + let old_editor = $GIT_EDITOR + let $GIT_EDITOR = 'false' + else + let command = 'env GIT_EDITOR=false ' + endif + let command .= repo.git_command('commit').' '.a:args + if &shell =~# 'csh' + noautocmd silent execute '!('.command.' > '.outfile.') >& '.errorfile + elseif a:args =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>' + noautocmd execute '!'.command.' 2> '.errorfile + else + noautocmd silent execute '!'.command.' > '.outfile.' 2> '.errorfile + endif + let error = v:shell_error + finally + execute cd s:fnameescape(dir) + endtry + if !has('gui_running') + redraw! + endif + if !error + if filereadable(outfile) + for line in readfile(outfile) + echo line + endfor + endif + return '' + else + let errors = readfile(errorfile) + let error = get(errors,-2,get(errors,-1,'!')) + if error =~# 'false''\=\.$' + let args = a:args + let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[esp]|--edit|--interactive|--patch|--signoff)%($| )','') + let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-c|--reedit-message|--reuse-message|-F|--file|-m|--message)%(\s+|\=)%(''[^'']*''|"%(\\.|[^"])*"|\\.|\S)*','') + let args = s:gsub(args,'%(^| )@<=[%#]%(:\w)*','\=expand(submatch(0))') + let args = s:sub(args, '\ze -- |$', ' --no-edit --no-interactive --no-signoff') + let args = '-F '.s:shellesc(msgfile).' '.args + if args !~# '\%(^\| \)--cleanup\>' + let args = '--cleanup=strip '.args + endif + if bufname('%') == '' && line('$') == 1 && getline(1) == '' && !&mod + execute mods 'keepalt edit' s:fnameescape(msgfile) + elseif a:args =~# '\%(^\| \)-\w*v' || mods =~# '\<tab\>' + execute mods 'keepalt -tabedit' s:fnameescape(msgfile) + elseif s:buffer().type() ==# 'index' + execute mods 'keepalt edit' s:fnameescape(msgfile) + execute (search('^#','n')+1).'wincmd+' + setlocal nopreviewwindow + else + execute mods 'keepalt split' s:fnameescape(msgfile) + endif + let b:fugitive_commit_arguments = args + setlocal bufhidden=wipe filetype=gitcommit + return '1' + elseif error ==# '!' + return 'Gstatus' + else + call s:throw(empty(error)?join(errors, ' '):error) + endif + endif + catch /^fugitive:/ + return 'echoerr v:errmsg' + finally + if exists('old_editor') + let $GIT_EDITOR = old_editor + endif + call delete(outfile) + call delete(errorfile) + call fugitive#ReloadStatus() + endtry +endfunction + +function! s:CommitComplete(A,L,P) abort + if a:A =~ '^-' || type(a:A) == type(0) " a:A is 0 on :Gcommit -<Tab> + let args = ['-C', '-F', '-a', '-c', '-e', '-i', '-m', '-n', '-o', '-q', '-s', '-t', '-u', '-v', '--all', '--allow-empty', '--amend', '--author=', '--cleanup=', '--dry-run', '--edit', '--file=', '--fixup=', '--include', '--interactive', '--message=', '--no-verify', '--only', '--quiet', '--reedit-message=', '--reuse-message=', '--signoff', '--squash=', '--template=', '--untracked-files', '--verbose'] + return filter(args,'v:val[0 : strlen(a:A)-1] ==# a:A') + else + return s:repo().superglob(a:A) + endif +endfunction + +function! s:FinishCommit() abort + let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments') + if !empty(args) + call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','') + return s:Commit('', args, s:repo(getbufvar(+expand('<abuf>'),'git_dir'))) + endif + return '' +endfunction + +" Section: Gmerge, Gpull + +call s:command("-nargs=? -bang -complete=custom,s:RevisionComplete Gmerge " . + \ "execute s:Merge('merge', <bang>0, <q-args>)") +call s:command("-nargs=? -bang -complete=custom,s:RevisionComplete Grebase " . + \ "execute s:Merge('rebase', <bang>0, <q-args>)") +call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpull " . + \ "execute s:Merge('pull --progress', <bang>0, <q-args>)") + +function! s:RevisionComplete(A, L, P) abort + return s:repo().git_chomp('rev-parse', '--symbolic', '--branches', '--tags', '--remotes') + \ . "\nHEAD\nFETCH_HEAD\nORIG_HEAD" +endfunction + +function! s:RemoteComplete(A, L, P) abort + let remote = matchstr(a:L, ' \zs\S\+\ze ') + if !empty(remote) + let matches = split(s:repo().git_chomp('ls-remote', remote), "\n") + call filter(matches, 'v:val =~# "\t" && v:val !~# "{"') + call map(matches, 's:sub(v:val, "^.*\t%(refs/%(heads/|tags/)=)=", "")') + else + let matches = split(s:repo().git_chomp('remote'), "\n") + endif + return join(matches, "\n") +endfunction + +function! fugitive#cwindow() abort + if &buftype == 'quickfix' + cwindow + else + botright cwindow + if &buftype == 'quickfix' + wincmd p + endif + endif +endfunction + +let s:common_efm = '' + \ . '%+Egit:%.%#,' + \ . '%+Eusage:%.%#,' + \ . '%+Eerror:%.%#,' + \ . '%+Efatal:%.%#,' + \ . '%-G%.%#%\e[K%.%#,' + \ . '%-G%.%#%\r%.%\+' + +function! s:Merge(cmd, bang, args) abort + if a:cmd =~# '^rebase' && ' '.a:args =~# ' -i\| --interactive\| --edit-todo' + return 'echoerr "git rebase --interactive not supported"' + endif + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let cwd = getcwd() + let [mp, efm] = [&l:mp, &l:efm] + let had_merge_msg = filereadable(s:repo().dir('MERGE_MSG')) + try + let &l:errorformat = '' + \ . '%-Gerror:%.%#false''.,' + \ . '%-G%.%# ''git commit'' %.%#,' + \ . '%+Emerge:%.%#,' + \ . s:common_efm . ',' + \ . '%+ECannot %.%#: You have unstaged changes.,' + \ . '%+ECannot %.%#: Your index contains uncommitted changes.,' + \ . '%+EThere is no tracking information for the current branch.,' + \ . '%+EYou are not currently on a branch. Please specify which,' + \ . 'CONFLICT (%m): %f deleted in %.%#,' + \ . 'CONFLICT (%m): Merge conflict in %f,' + \ . 'CONFLICT (%m): Rename \"%f\"->%.%#,' + \ . 'CONFLICT (%m): Rename %.%#->%f %.%#,' + \ . 'CONFLICT (%m): There is a directory with name %f in %.%#,' + \ . '%+ECONFLICT %.%#,' + \ . '%+EKONFLIKT %.%#,' + \ . '%+ECONFLIT %.%#,' + \ . "%+EXUNG \u0110\u1ed8T %.%#," + \ . "%+E\u51b2\u7a81 %.%#," + \ . 'U%\t%f' + if a:cmd =~# '^merge' && empty(a:args) && + \ (had_merge_msg || isdirectory(s:repo().dir('rebase-apply')) || + \ !empty(s:repo().git_chomp('diff-files', '--diff-filter=U'))) + let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U' + else + let &l:makeprg = s:sub(s:git_command() . ' ' . a:cmd . + \ (a:args =~# ' \%(--no-edit\|--abort\|-m\)\>' || a:cmd =~# '^rebase' ? '' : ' --edit') . + \ ' ' . a:args, ' *$', '') + endif + if !empty($GIT_EDITOR) || has('win32') + let old_editor = $GIT_EDITOR + let $GIT_EDITOR = 'false' + else + let &l:makeprg = 'env GIT_EDITOR=false ' . &l:makeprg + endif + execute cd fnameescape(s:repo().tree()) + silent noautocmd make! + catch /^Vim\%((\a\+)\)\=:E211/ + let err = v:exception + finally + redraw! + let [&l:mp, &l:efm] = [mp, efm] + if exists('old_editor') + let $GIT_EDITOR = old_editor + endif + execute cd fnameescape(cwd) + endtry + call fugitive#ReloadStatus() + if empty(filter(getqflist(),'v:val.valid')) + if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG')) + cclose + return 'Gcommit --no-status -n -t '.s:shellesc(s:repo().dir('MERGE_MSG')) + endif + endif + let qflist = getqflist() + let found = 0 + for e in qflist + if !empty(e.bufnr) + let found = 1 + let e.pattern = '^<<<<<<<' + endif + endfor + call fugitive#cwindow() + if found + call setqflist(qflist, 'r') + if !a:bang + return 'cfirst' + endif + endif + return exists('err') ? 'echoerr '.string(err) : '' +endfunction + +" Section: Ggrep, Glog + +if !exists('g:fugitive_summary_format') + let g:fugitive_summary_format = '%s' +endif + +call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Ggrep :execute s:Grep('grep',<bang>0,<q-args>)") +call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Glgrep :execute s:Grep('lgrep',<bang>0,<q-args>)") +call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Glog :call s:Log('grep<bang>',<line1>,<count>,<f-args>)") +call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Gllog :call s:Log('lgrep<bang>',<line1>,<count>,<f-args>)") + +function! s:Grep(cmd,bang,arg) abort + let grepprg = &grepprg + let grepformat = &grepformat + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let dir = getcwd() + try + execute cd s:fnameescape(s:repo().tree()) + let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n', '--no-color') + let &grepformat = '%f:%l:%m,%m %f match%ts,%f' + exe a:cmd.'! '.escape(matchstr(a:arg,'\v\C.{-}%($|[''" ]\@=\|)@='),'|') + let list = a:cmd =~# '^l' ? getloclist(0) : getqflist() + for entry in list + if bufname(entry.bufnr) =~ ':' + let entry.filename = s:repo().translate(bufname(entry.bufnr)) + unlet! entry.bufnr + let changed = 1 + elseif a:arg =~# '\%(^\| \)--cached\>' + let entry.filename = s:repo().translate(':0:'.bufname(entry.bufnr)) + unlet! entry.bufnr + let changed = 1 + endif + endfor + if a:cmd =~# '^l' && exists('changed') + call setloclist(0, list, 'r') + elseif exists('changed') + call setqflist(list, 'r') + endif + if !a:bang && !empty(list) + return (a:cmd =~# '^l' ? 'l' : 'c').'first'.matchstr(a:arg,'\v\C[''" ]\zs\|.*') + else + return matchstr(a:arg,'\v\C[''" ]\|\zs.*') + endif + finally + let &grepprg = grepprg + let &grepformat = grepformat + execute cd s:fnameescape(dir) + endtry +endfunction + +function! s:Log(cmd, line1, line2, ...) abort + let path = s:buffer().path('/') + if path =~# '^/\.git\%(/\|$\)' || index(a:000,'--') != -1 + let path = '' + endif + let cmd = ['--no-pager', 'log', '--no-color'] + let cmd += ['--pretty=format:fugitive://'.s:repo().dir().'//%H'.path.'::'.g:fugitive_summary_format] + if empty(filter(a:000[0 : index(a:000,'--')],'v:val !~# "^-"')) + if s:buffer().commit() =~# '\x\{40\}' + let cmd += [s:buffer().commit()] + elseif s:buffer().path() =~# '^\.git/refs/\|^\.git/.*HEAD$' + let cmd += [s:buffer().path()[5:-1]] + endif + end + let cmd += map(copy(a:000),'s:sub(v:val,"^\\%(%(:\\w)*)","\\=fnamemodify(s:buffer().path(),submatch(1))")') + if path =~# '/.' + if a:line2 + let cmd += ['-L', a:line1 . ',' . a:line2 . ':' . path[1:-1]] + else + let cmd += ['--', path[1:-1]] + endif + endif + let grepformat = &grepformat + let grepprg = &grepprg + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let dir = getcwd() + try + execute cd s:fnameescape(s:repo().tree()) + let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#') + let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#' + exe a:cmd + finally + let &grepformat = grepformat + let &grepprg = grepprg + execute cd s:fnameescape(dir) + endtry +endfunction + +" Section: Gedit, Gpedit, Gsplit, Gvsplit, Gtabedit, Gread + +function! s:UsableWin(nr) abort + return a:nr && !getwinvar(a:nr, '&previewwindow') && + \ index(['nofile','help','quickfix'], getbufvar(winbufnr(a:nr), '&buftype')) < 0 +endfunction + +function! s:Edit(cmd, bang, mods, ...) abort + let mods = a:mods ==# '<mods>' ? '' : a:mods + let buffer = s:buffer() + if a:cmd !~# 'read' + if &previewwindow && getbufvar('','fugitive_type') ==# 'index' + let winnrs = filter([winnr('#')] + range(1, winnr('$')), 's:UsableWin(v:val)') + if len(winnrs) + exe winnrs[0].'wincmd w' + elseif winnr('$') == 1 + let tabs = (&go =~# 'e' || !has('gui_running')) && &stal && (tabpagenr('$') >= &stal) + execute 'rightbelow' (&lines - &previewheight - &cmdheight - tabs - 1 - !!&laststatus).'new' + else + rightbelow new + endif + if &diff + let mywinnr = winnr() + for winnr in range(winnr('$'),1,-1) + if winnr != mywinnr && getwinvar(winnr,'&diff') + execute winnr.'wincmd w' + close + if winnr('$') > 1 + wincmd p + endif + endif + endfor + diffoff! + endif + endif + endif + + if a:bang + let arglist = map(copy(a:000), 's:gsub(v:val, ''\\@<!%(\\\\)*\zs[%#]'', ''\=s:buffer().expand(submatch(0))'')') + let args = join(arglist, ' ') + if a:cmd =~# 'read' + let git = buffer.repo().git_command() + let last = line('$') + silent call s:ExecuteInTree(mods.' '.(a:cmd ==# 'read' ? 'keepalt $read' : a:cmd).'!'.git.' --no-pager '.args) + if a:cmd ==# 'read' + silent execute '1,'.last.'delete_' + endif + call fugitive#ReloadStatus() + diffupdate + return 'redraw|echo '.string(':!'.git.' '.args) + else + let temp = resolve(tempname()) + if has('win32') + let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t') + endif + let s:temp_files[s:cpath(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist } + silent execute mods a:cmd temp + if a:cmd =~# 'pedit' + wincmd P + endif + let echo = s:Edit('read', 1, mods, args) + silent write! + setlocal buftype=nowrite nomodified filetype=git foldmarker=<<<<<<<,>>>>>>> + if getline(1) !~# '^diff ' + setlocal readonly nomodifiable + endif + if a:cmd =~# 'pedit' + wincmd p + endif + return echo + endif + return '' + endif + + if a:0 && a:1 == '' + return '' + elseif a:0 + let file = buffer.expand(join(a:000, ' ')) + elseif expand('%') ==# '' + let file = ':' + elseif buffer.commit() ==# '' && buffer.path('/') !~# '^/.git\>' + let file = buffer.path(':') + else + let file = buffer.path('/') + endif + try + let file = buffer.repo().translate(file) + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry + if file !~# '^fugitive:' + let file = s:sub(file, '/$', '') + endif + if a:cmd ==# 'read' + return 'silent %delete_|'.mods.' read '.s:fnameescape(file).'|silent 1delete_|diffupdate|'.line('.') + else + return mods.' '.a:cmd.' '.s:fnameescape(file) + endif +endfunction + +function! s:EditComplete(A,L,P) abort + return map(s:repo().superglob(a:A), 'fnameescape(v:val)') +endfunction + +function! s:EditRunComplete(A,L,P) abort + if a:L =~# '^\w\+!' + return s:GitComplete(a:A,a:L,a:P) + else + return s:repo().superglob(a:A) + endif +endfunction + +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,'<mods>',<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,'<mods>',<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,'<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,'<mods>',<f-args>)") + +" Section: Gwrite, Gwq + +call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwrite :execute s:Write(<bang>0,<f-args>)") +call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gw :execute s:Write(<bang>0,<f-args>)") +call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwq :execute s:Wq(<bang>0,<f-args>)") + +function! s:Write(force,...) abort + if exists('b:fugitive_commit_arguments') + return 'write|bdelete' + elseif expand('%:t') == 'COMMIT_EDITMSG' && $GIT_INDEX_FILE != '' + return 'wq' + elseif s:buffer().type() == 'index' + return 'Gcommit' + elseif s:buffer().path() ==# '' && getline(4) =~# '^+++ ' + let filename = getline(4)[6:-1] + setlocal buftype= + silent write + setlocal buftype=nowrite + if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# s:repo().rev_parse(':0:'.filename)[0:6] + let err = s:repo().git_chomp('apply','--cached','--reverse',s:buffer().spec()) + else + let err = s:repo().git_chomp('apply','--cached',s:buffer().spec()) + endif + if err !=# '' + let v:errmsg = split(err,"\n")[0] + return 'echoerr v:errmsg' + elseif a:force + return 'bdelete' + else + return 'Gedit '.fnameescape(filename) + endif + endif + let mytab = tabpagenr() + let mybufnr = bufnr('') + let path = a:0 ? join(a:000, ' ') : s:buffer().path() + if empty(path) + return 'echoerr '.string('fugitive: cannot determine file path') + endif + if path =~# '^:\d\>' + return 'write'.(a:force ? '! ' : ' ').s:fnameescape(s:repo().translate(s:buffer().expand(path))) + endif + let always_permitted = (s:buffer().path() ==# path && s:buffer().commit() =~# '^0\=$') + if !always_permitted && !a:force && s:repo().git_chomp_in_tree('diff','--name-status','HEAD','--',path) . s:repo().git_chomp_in_tree('ls-files','--others','--',path) !=# '' + let v:errmsg = 'fugitive: file has uncommitted changes (use ! to override)' + return 'echoerr v:errmsg' + endif + let file = s:repo().translate(path) + let treebufnr = 0 + for nr in range(1,bufnr('$')) + if fnamemodify(bufname(nr),':p') ==# file + let treebufnr = nr + endif + endfor + + if treebufnr > 0 && treebufnr != bufnr('') + let temp = tempname() + silent execute '%write '.temp + for tab in [mytab] + range(1,tabpagenr('$')) + for winnr in range(1,tabpagewinnr(tab,'$')) + if tabpagebuflist(tab)[winnr-1] == treebufnr + execute 'tabnext '.tab + if winnr != winnr() + execute winnr.'wincmd w' + let restorewinnr = 1 + endif + try + let lnum = line('.') + let last = line('$') + silent execute '$read '.temp + silent execute '1,'.last.'delete_' + silent write! + silent execute lnum + let did = 1 + finally + if exists('restorewinnr') + wincmd p + endif + execute 'tabnext '.mytab + endtry + endif + endfor + endfor + if !exists('did') + call writefile(readfile(temp,'b'),file,'b') + endif + else + execute 'write! '.s:fnameescape(s:repo().translate(path)) + endif + + if a:force + let error = s:repo().git_chomp_in_tree('add', '--force', '--', path) + else + let error = s:repo().git_chomp_in_tree('add', '--', path) + endif + if v:shell_error + let v:errmsg = 'fugitive: '.error + return 'echoerr v:errmsg' + endif + if s:buffer().path() ==# path && s:buffer().commit() =~# '^\d$' + set nomodified + endif + + let one = s:repo().translate(':1:'.path) + let two = s:repo().translate(':2:'.path) + let three = s:repo().translate(':3:'.path) + for nr in range(1,bufnr('$')) + let name = fnamemodify(bufname(nr), ':p') + if bufloaded(nr) && !getbufvar(nr,'&modified') && (name ==# one || name ==# two || name ==# three) + execute nr.'bdelete' + endif + endfor + + unlet! restorewinnr + let zero = s:repo().translate(':0:'.path) + silent execute 'doautocmd BufWritePost' s:fnameescape(zero) + for tab in range(1,tabpagenr('$')) + for winnr in range(1,tabpagewinnr(tab,'$')) + let bufnr = tabpagebuflist(tab)[winnr-1] + let bufname = fnamemodify(bufname(bufnr), ':p') + if bufname ==# zero && bufnr != mybufnr + execute 'tabnext '.tab + if winnr != winnr() + execute winnr.'wincmd w' + let restorewinnr = 1 + endif + try + let lnum = line('.') + let last = line('$') + silent execute '$read '.s:fnameescape(file) + silent execute '1,'.last.'delete_' + silent execute lnum + set nomodified + diffupdate + finally + if exists('restorewinnr') + wincmd p + endif + execute 'tabnext '.mytab + endtry + break + endif + endfor + endfor + call fugitive#ReloadStatus() + return 'checktime' +endfunction + +function! s:Wq(force,...) abort + let bang = a:force ? '!' : '' + if exists('b:fugitive_commit_arguments') + return 'wq'.bang + endif + let result = call(s:function('s:Write'),[a:force]+a:000) + if result =~# '^\%(write\|wq\|echoerr\)' + return s:sub(result,'^write','wq') + else + return result.'|quit'.bang + endif +endfunction + +augroup fugitive_commit + autocmd! + autocmd VimLeavePre,BufDelete COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE') +augroup END + +" Section: Gpush, Gfetch + +call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpush execute s:Dispatch('<bang>', 'push '.<q-args>)") +call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gfetch execute s:Dispatch('<bang>', 'fetch '.<q-args>)") + +function! s:Dispatch(bang, args) + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let cwd = getcwd() + let [mp, efm, cc] = [&l:mp, &l:efm, get(b:, 'current_compiler', '')] + try + let b:current_compiler = 'git' + let &l:errorformat = s:common_efm + let &l:makeprg = substitute(s:git_command() . ' ' . a:args, '\s\+$', '', '') + execute cd fnameescape(s:repo().tree()) + if exists(':Make') == 2 + noautocmd Make + else + silent noautocmd make! + redraw! + return 'call fugitive#cwindow()' + endif + return '' + finally + let [&l:mp, &l:efm, b:current_compiler] = [mp, efm, cc] + if empty(cc) | unlet! b:current_compiler | endif + execute cd fnameescape(cwd) + endtry +endfunction + +" Section: Gdiff + +call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gdiff :execute s:Diff('',<bang>0,<f-args>)") +call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff('keepalt vert ',<bang>0,<f-args>)") +call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff('keepalt ',<bang>0,<f-args>)") + +augroup fugitive_diff + autocmd! + autocmd BufWinLeave * + \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 2 | + \ call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) | + \ endif + autocmd BufWinEnter * + \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 1 | + \ call s:diffoff() | + \ endif +augroup END + +function! s:can_diffoff(buf) abort + return getwinvar(bufwinnr(a:buf), '&diff') && + \ !empty(getbufvar(a:buf, 'git_dir')) && + \ !empty(getwinvar(bufwinnr(a:buf), 'fugitive_diff_restore')) +endfunction + +function! fugitive#can_diffoff(buf) abort + return s:can_diffoff(a:buf) +endfunction + +function! s:diff_modifier(count) abort + let fdc = matchstr(&diffopt, 'foldcolumn:\zs\d\+') + if &diffopt =~# 'horizontal' && &diffopt !~# 'vertical' + return 'keepalt ' + elseif &diffopt =~# 'vertical' + return 'keepalt vert ' + elseif winwidth(0) <= a:count * ((&tw ? &tw : 80) + (empty(fdc) ? 2 : fdc)) + return 'keepalt ' + else + return 'keepalt vert ' + endif +endfunction + +function! s:diff_window_count() abort + let c = 0 + for nr in range(1,winnr('$')) + let c += getwinvar(nr,'&diff') + endfor + return c +endfunction + +function! s:diff_restore() abort + let restore = 'setlocal nodiff noscrollbind' + \ . ' scrollopt=' . &l:scrollopt + \ . (&l:wrap ? ' wrap' : ' nowrap') + \ . ' foldlevel=999' + \ . ' foldmethod=' . &l:foldmethod + \ . ' foldcolumn=' . &l:foldcolumn + \ . ' foldlevel=' . &l:foldlevel + \ . (&l:foldenable ? ' foldenable' : ' nofoldenable') + if has('cursorbind') + let restore .= (&l:cursorbind ? ' ' : ' no') . 'cursorbind' + endif + return restore +endfunction + +function! s:diffthis() abort + if !&diff + let w:fugitive_diff_restore = s:diff_restore() + diffthis + endif +endfunction + +function! s:diffoff() abort + if exists('w:fugitive_diff_restore') + execute w:fugitive_diff_restore + unlet w:fugitive_diff_restore + else + diffoff + endif +endfunction + +function! s:diffoff_all(dir) abort + let curwin = winnr() + for nr in range(1,winnr('$')) + if getwinvar(nr,'&diff') + if nr != winnr() + execute nr.'wincmd w' + let restorewinnr = 1 + endif + if exists('b:git_dir') && b:git_dir ==# a:dir + call s:diffoff() + endif + endif + endfor + execute curwin.'wincmd w' +endfunction + +function! s:buffer_compare_age(commit) dict abort + let scores = {':0': 1, ':1': 2, ':2': 3, ':': 4, ':3': 5} + let my_score = get(scores,':'.self.commit(),0) + let their_score = get(scores,':'.a:commit,0) + if my_score || their_score + return my_score < their_score ? -1 : my_score != their_score + elseif self.commit() ==# a:commit + return 0 + endif + let base = self.repo().git_chomp('merge-base',self.commit(),a:commit) + if base ==# self.commit() + return -1 + elseif base ==# a:commit + return 1 + endif + let my_time = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',self.commit()) + let their_time = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',a:commit) + return my_time < their_time ? -1 : my_time != their_time +endfunction + +call s:add_methods('buffer',['compare_age']) + +function! s:Diff(vert,keepfocus,...) abort + let args = copy(a:000) + let post = '' + if get(args, 0) =~# '^+' + let post = remove(args, 0)[1:-1] + endif + let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert + if exists(':DiffGitCached') + return 'DiffGitCached' + elseif (empty(args) || args[0] == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# '' + let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert + let nr = bufnr('') + execute 'leftabove '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand(':2'))) + execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>' + let nr2 = bufnr('') + call s:diffthis() + wincmd p + execute 'rightbelow '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand(':3'))) + execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>' + let nr3 = bufnr('') + call s:diffthis() + wincmd p + call s:diffthis() + execute 'nnoremap <buffer> <silent> d2o :diffget '.nr2.'<Bar>diffupdate<CR>' + execute 'nnoremap <buffer> <silent> d3o :diffget '.nr3.'<Bar>diffupdate<CR>' + return post + elseif len(args) + let arg = join(args, ' ') + if arg ==# '' + return post + elseif arg ==# '/' + let file = s:buffer().path('/') + elseif arg ==# ':' + let file = s:buffer().path(':0:') + elseif arg =~# '^:/.' + try + let file = s:repo().rev_parse(arg).s:buffer().path(':') + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry + else + let file = s:buffer().expand(arg) + endif + if file !~# ':' && file !~# '^/' && s:repo().git_chomp('cat-file','-t',file) =~# '^\%(tag\|commit\)$' + let file = file.s:buffer().path(':') + endif + else + let file = s:buffer().path(s:buffer().commit() == '' ? ':0:' : '/') + endif + try + let spec = s:repo().translate(file) + let commit = matchstr(spec,'\C[^:/]//\zs\x\+') + let restore = s:diff_restore() + if exists('+cursorbind') + setlocal cursorbind + endif + let w:fugitive_diff_restore = restore + if s:buffer().compare_age(commit) < 0 + execute 'rightbelow '.vert.'diffsplit '.s:fnameescape(spec) + else + execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec) + endif + let &l:readonly = &l:readonly + redraw + let w:fugitive_diff_restore = restore + let winnr = winnr() + if getwinvar('#', '&diff') + wincmd p + if !a:keepfocus + call feedkeys(winnr."\<C-W>w", 'n') + endif + endif + return post + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry +endfunction + +" Section: Gmove, Gremove + +function! s:Move(force, rename, destination) abort + if a:destination =~# '^/' + let destination = a:destination[1:-1] + elseif a:rename + let destination = fnamemodify(s:buffer().path(), ':h') . '/' . a:destination + else + let destination = s:shellslash(fnamemodify(s:sub(a:destination,'[%#]%(:\w)*','\=expand(submatch(0))'),':p')) + if destination[0:strlen(s:repo().tree())] ==# s:repo().tree('') + let destination = destination[strlen(s:repo().tree('')):-1] + endif + endif + if isdirectory(s:buffer().spec()) + " Work around Vim parser idiosyncrasy + let discarded = s:buffer().setvar('&swapfile',0) + endif + let message = call(s:repo().git_chomp_in_tree,['mv']+(a:force ? ['-f'] : [])+['--', s:buffer().path(), destination], s:repo()) + if v:shell_error + let v:errmsg = 'fugitive: '.message + return 'echoerr v:errmsg' + endif + let destination = s:repo().tree(destination) + if isdirectory(destination) + let destination = fnamemodify(s:sub(destination,'/$','').'/'.expand('%:t'),':.') + endif + call fugitive#ReloadStatus() + if empty(s:buffer().commit()) + if isdirectory(destination) + return 'keepalt edit '.s:fnameescape(destination) + else + return 'keepalt saveas! '.s:fnameescape(destination) + endif + else + return 'file '.s:fnameescape(s:repo().translate(':0:'.destination)) + endif +endfunction + +function! s:MoveComplete(A,L,P) abort + if a:A =~# '^/' + return s:repo().superglob(a:A) + else + let matches = split(glob(a:A.'*'),"\n") + call map(matches,'v:val !~# "/$" && isdirectory(v:val) ? v:val."/" : v:val') + return matches + endif +endfunction + +function! s:RenameComplete(A,L,P) abort + if a:A =~# '^/' + return s:repo().superglob(a:A) + else + let pre = '/'. fnamemodify(s:buffer().path(), ':h') . '/' + return map(s:repo().superglob(pre.a:A), 'strpart(v:val, len(pre))') + endif +endfunction + +function! s:Remove(after, force) abort + if s:buffer().commit() ==# '' + let cmd = ['rm'] + elseif s:buffer().commit() ==# '0' + let cmd = ['rm','--cached'] + else + let v:errmsg = 'fugitive: rm not supported here' + return 'echoerr v:errmsg' + endif + if a:force + let cmd += ['--force'] + endif + let message = call(s:repo().git_chomp_in_tree,cmd+['--',s:buffer().path()],s:repo()) + if v:shell_error + let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)') + return 'echoerr '.string(v:errmsg) + else + call fugitive#ReloadStatus() + return a:after . (a:force ? '!' : '') + endif +endfunction + +augroup fugitive_remove + autocmd! + autocmd User Fugitive if s:buffer().commit() =~# '^0\=$' | + \ exe "command! -buffer -bar -bang -nargs=1 -complete=customlist,s:MoveComplete Gmove :execute s:Move(<bang>0,0,<q-args>)" | + \ exe "command! -buffer -bar -bang -nargs=1 -complete=customlist,s:RenameComplete Grename :execute s:Move(<bang>0,1,<q-args>)" | + \ exe "command! -buffer -bar -bang Gremove :execute s:Remove('edit',<bang>0)" | + \ exe "command! -buffer -bar -bang Gdelete :execute s:Remove('bdelete',<bang>0)" | + \ endif +augroup END + +" Section: Gblame + +augroup fugitive_blame + autocmd! + autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame + autocmd FileType fugitiveblame setlocal nomodeline | if exists('b:git_dir') | let &l:keywordprg = s:repo().keywordprg() | endif + autocmd Syntax fugitiveblame call s:BlameSyntax() + autocmd User Fugitive if s:buffer().type('file', 'blob') | exe "command! -buffer -bar -bang -range=0 -nargs=* Gblame :execute s:Blame(<bang>0,<line1>,<line2>,<count>,[<f-args>])" | endif + autocmd ColorScheme,GUIEnter * call s:RehighlightBlame() + autocmd BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave') +augroup END + +function! s:linechars(pattern) abort + let chars = strlen(s:gsub(matchstr(getline('.'), a:pattern), '.', '.')) + if exists('*synconcealed') && &conceallevel > 1 + for col in range(1, chars) + let chars -= synconcealed(line('.'), col)[0] + endfor + endif + return chars +endfunction + +function! s:Blame(bang,line1,line2,count,args) abort + if exists('b:fugitive_blamed_bufnr') + return 'bdelete' + endif + try + if s:buffer().path() == '' + call s:throw('file or blob required') + endif + if filter(copy(a:args),'v:val !~# "^\\%(--root\|--show-name\\|-\\=\\%([ltfnsew]\\|[MC]\\d*\\)\\+\\)$"') != [] + call s:throw('unsupported option') + endif + call map(a:args,'s:sub(v:val,"^\\ze[^-]","-")') + let cmd = ['--no-pager', 'blame', '--show-number'] + a:args + if s:buffer().commit() =~# '\D\|..' + let cmd += [s:buffer().commit()] + else + let cmd += ['--contents', '-'] + endif + let cmd += ['--', s:buffer().path()] + let basecmd = escape(call(s:repo().git_command,cmd,s:repo()),'!%#') + try + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + if !s:repo().bare() + let dir = getcwd() + execute cd s:fnameescape(s:repo().tree()) + endif + if a:count + execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g') + else + let error = resolve(tempname()) + let temp = error.'.fugitiveblame' + if &shell =~# 'csh' + silent! execute '%write !('.basecmd.' > '.temp.') >& '.error + else + silent! execute '%write !'.basecmd.' > '.temp.' 2> '.error + endif + if exists('l:dir') + execute cd s:fnameescape(dir) + unlet dir + endif + if v:shell_error + call s:throw(join(readfile(error),"\n")) + endif + for winnr in range(winnr('$'),1,-1) + call setwinvar(winnr, '&scrollbind', 0) + if exists('+cursorbind') + call setwinvar(winnr, '&cursorbind', 0) + endif + if getbufvar(winbufnr(winnr), 'fugitive_blamed_bufnr') + execute winbufnr(winnr).'bdelete' + endif + endfor + let bufnr = bufnr('') + let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)' + if exists('+cursorbind') + let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&cursorbind",0)' + endif + if &l:wrap + let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&wrap",1)' + endif + if &l:foldenable + let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&foldenable",1)' + endif + setlocal scrollbind nowrap nofoldenable + if exists('+cursorbind') + setlocal cursorbind + endif + let top = line('w0') + &scrolloff + let current = line('.') + if has('win32') + let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t') + endif + let s:temp_files[s:cpath(temp)] = { 'dir': s:repo().dir(), 'args': cmd } + exe 'keepalt leftabove vsplit '.temp + let b:fugitive_blamed_bufnr = bufnr + let w:fugitive_leave = restore + let b:fugitive_blame_arguments = join(a:args,' ') + execute top + normal! zt + execute current + if exists('+cursorbind') + setlocal cursorbind + endif + setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable winfixwidth filetype=fugitiveblame + if exists('+concealcursor') + setlocal concealcursor=nc conceallevel=2 + endif + if exists('+relativenumber') + setlocal norelativenumber + endif + execute "vertical resize ".(s:linechars('.\{-\}\ze\s\+\d\+)')+1) + nnoremap <buffer> <silent> <F1> :help fugitive-:Gblame<CR> + nnoremap <buffer> <silent> g? :help fugitive-:Gblame<CR> + nnoremap <buffer> <silent> q :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete','^-1','','')<CR> + nnoremap <buffer> <silent> gq :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete<Bar>if expand("%:p") =~# "^fugitive:[\\/][\\/]"<Bar>Gedit<Bar>endif','^-1','','')<CR> + nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR> + nnoremap <buffer> <silent> - :<C-U>exe <SID>BlameJump('')<CR> + nnoremap <buffer> <silent> P :<C-U>exe <SID>BlameJump('^'.v:count1)<CR> + nnoremap <buffer> <silent> ~ :<C-U>exe <SID>BlameJump('~'.v:count1)<CR> + nnoremap <buffer> <silent> i :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR> + nnoremap <buffer> <silent> o :<C-U>exe <SID>BlameCommit((&splitbelow ? "botright" : "topleft")." split")<CR> + nnoremap <buffer> <silent> O :<C-U>exe <SID>BlameCommit("tabedit")<CR> + nnoremap <buffer> <silent> A :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze [0-9:/+-][0-9:/+ -]* \d\+)')+1+v:count)<CR> + nnoremap <buffer> <silent> C :<C-u>exe "vertical resize ".(<SID>linechars('^\S\+')+1+v:count)<CR> + nnoremap <buffer> <silent> D :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze\d\ze\s\+\d\+)')+1-v:count)<CR> + redraw + syncbind + endif + finally + if exists('l:dir') + execute cd s:fnameescape(dir) + endif + endtry + return '' + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry +endfunction + +function! s:BlameCommit(cmd) abort + let cmd = s:Edit(a:cmd, 0, '', matchstr(getline('.'),'\x\+')) + if cmd =~# '^echoerr' + return cmd + endif + let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]') + let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ') + if path ==# '' + let path = s:buffer(b:fugitive_blamed_bufnr).path() + endif + execute cmd + if search('^diff .* b/\M'.escape(path,'\').'$','W') + call search('^+++') + let head = line('.') + while search('^@@ \|^diff ') && getline('.') =~# '^@@ ' + let top = +matchstr(getline('.'),' +\zs\d\+') + let len = +matchstr(getline('.'),' +\d\+,\zs\d\+') + if lnum >= top && lnum <= top + len + let offset = lnum - top + if &scrolloff + + + normal! zt + else + normal! zt + + + endif + while offset > 0 && line('.') < line('$') + + + if getline('.') =~# '^[ +]' + let offset -= 1 + endif + endwhile + return 'normal! zv' + endif + endwhile + execute head + normal! zt + endif + return '' +endfunction + +function! s:BlameJump(suffix) abort + let commit = matchstr(getline('.'),'^\^\=\zs\x\+') + if commit =~# '^0\+$' + let commit = ':0' + endif + let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]') + let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ') + if path ==# '' + let path = s:buffer(b:fugitive_blamed_bufnr).path() + endif + let args = b:fugitive_blame_arguments + let offset = line('.') - line('w0') + let bufnr = bufnr('%') + let winnr = bufwinnr(b:fugitive_blamed_bufnr) + if winnr > 0 + exe winnr.'wincmd w' + endif + execute s:Edit('edit', 0, '', commit.a:suffix.':'.path) + execute lnum + if winnr > 0 + exe bufnr.'bdelete' + endif + if exists(':Gblame') + execute 'Gblame '.args + execute lnum + let delta = line('.') - line('w0') - offset + if delta > 0 + execute 'normal! '.delta."\<C-E>" + elseif delta < 0 + execute 'normal! '.(-delta)."\<C-Y>" + endif + syncbind + endif + return '' +endfunction + +let s:hash_colors = {} + +function! s:BlameSyntax() abort + let b:current_syntax = 'fugitiveblame' + let conceal = has('conceal') ? ' conceal' : '' + let arg = exists('b:fugitive_blame_arguments') ? b:fugitive_blame_arguments : '' + syn match FugitiveblameBoundary "^\^" + syn match FugitiveblameBlank "^\s\+\s\@=" nextgroup=FugitiveblameAnnotation,fugitiveblameOriginalFile,FugitiveblameOriginalLineNumber skipwhite + syn match FugitiveblameHash "\%(^\^\=\)\@<=\<\x\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite + syn match FugitiveblameUncommitted "\%(^\^\=\)\@<=\<0\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite + syn region FugitiveblameAnnotation matchgroup=FugitiveblameDelimiter start="(" end="\%( \d\+\)\@<=)" contained keepend oneline + syn match FugitiveblameTime "[0-9:/+-][0-9:/+ -]*[0-9:/+-]\%( \+\d\+)\)\@=" contained containedin=FugitiveblameAnnotation + exec 'syn match FugitiveblameLineNumber " *\d\+)\@=" contained containedin=FugitiveblameAnnotation'.conceal + exec 'syn match FugitiveblameOriginalFile " \%(\f\+\D\@<=\|\D\@=\f\+\)\%(\%(\s\+\d\+\)\=\s\%((\|\s*\d\+)\)\)\@=" contained nextgroup=FugitiveblameOriginalLineNumber,FugitiveblameAnnotation skipwhite'.(arg =~# 'f' ? '' : conceal) + exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s(\)\@=" contained nextgroup=FugitiveblameAnnotation skipwhite'.(arg =~# 'n' ? '' : conceal) + exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s\+\d\+)\)\@=" contained nextgroup=FugitiveblameShort skipwhite'.(arg =~# 'n' ? '' : conceal) + syn match FugitiveblameShort " \d\+)" contained contains=FugitiveblameLineNumber + syn match FugitiveblameNotCommittedYet "(\@<=Not Committed Yet\>" contained containedin=FugitiveblameAnnotation + hi def link FugitiveblameBoundary Keyword + hi def link FugitiveblameHash Identifier + hi def link FugitiveblameUncommitted Ignore + hi def link FugitiveblameTime PreProc + hi def link FugitiveblameLineNumber Number + hi def link FugitiveblameOriginalFile String + hi def link FugitiveblameOriginalLineNumber Float + hi def link FugitiveblameShort FugitiveblameDelimiter + hi def link FugitiveblameDelimiter Delimiter + hi def link FugitiveblameNotCommittedYet Comment + let seen = {} + for lnum in range(1, line('$')) + let hash = matchstr(getline(lnum), '^\^\=\zs\x\{6\}') + if hash ==# '' || hash ==# '000000' || has_key(seen, hash) + continue + endif + let seen[hash] = 1 + if &t_Co > 16 && get(g:, 'CSApprox_loaded') && !empty(findfile('autoload/csapprox/per_component.vim', escape(&rtp, ' '))) + \ && empty(get(s:hash_colors, hash)) + let [s, r, g, b; __] = map(matchlist(hash, '\(\x\x\)\(\x\x\)\(\x\x\)'), 'str2nr(v:val,16)') + let color = csapprox#per_component#Approximate(r, g, b) + if color == 16 && &background ==# 'dark' + let color = 8 + endif + let s:hash_colors[hash] = ' ctermfg='.color + else + let s:hash_colors[hash] = '' + endif + exe 'syn match FugitiveblameHash'.hash.' "\%(^\^\=\)\@<='.hash.'\x\{1,34\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite' + endfor + call s:RehighlightBlame() +endfunction + +function! s:RehighlightBlame() abort + for [hash, cterm] in items(s:hash_colors) + if !empty(cterm) || has('gui_running') || has('termguicolors') && &termguicolors + exe 'hi FugitiveblameHash'.hash.' guifg=#'.hash.get(s:hash_colors, hash, '') + else + exe 'hi link FugitiveblameHash'.hash.' Identifier' + endif + endfor +endfunction + +" Section: Gbrowse + +call s:command("-bar -bang -range=0 -nargs=* -complete=customlist,s:EditComplete Gbrowse :execute s:Browse(<bang>0,<line1>,<count>,<f-args>)") + +let s:redirects = {} + +function! s:Browse(bang,line1,count,...) abort + try + let validremote = '\.\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)\=' + if a:0 + let remote = matchstr(join(a:000, ' '),'@\zs\%('.validremote.'\)$') + let rev = substitute(join(a:000, ' '),'@\%('.validremote.'\)$','','') + else + let remote = '' + let rev = '' + endif + if rev ==# '' + let expanded = s:buffer().rev() + elseif rev ==# ':' + let expanded = s:buffer().path('/') + else + let expanded = s:buffer().expand(rev) + endif + let full = s:repo().translate(expanded) + let commit = '' + if full =~# '^fugitive://' + let commit = matchstr(full,'://.*//\zs\w\w\+') + let path = matchstr(full,'://.*//\w\+\zs/.*') + if commit =~ '..' + let type = s:repo().git_chomp('cat-file','-t',commit.s:sub(path,'^/',':')) + let branch = matchstr(expanded, '^[^:]*') + else + let type = 'blob' + endif + let path = path[1:-1] + elseif s:repo().bare() + let path = '.git/' . full[strlen(s:repo().dir())+1:-1] + let type = '' + else + let path = full[strlen(s:repo().tree())+1:-1] + if path =~# '^\.git/' + let type = '' + elseif isdirectory(full) + let type = 'tree' + else + let type = 'blob' + endif + endif + if type ==# 'tree' && !empty(path) + let path = s:sub(path, '/\=$', '/') + endif + if path =~# '^\.git/.*HEAD' && filereadable(s:repo().dir(path[5:-1])) + let body = readfile(s:repo().dir(path[5:-1]))[0] + if body =~# '^\x\{40\}$' + let commit = body + let type = 'commit' + let path = '' + elseif body =~# '^ref: refs/' + let path = '.git/' . matchstr(body,'ref: \zs.*') + endif + endif + + let merge = '' + if path =~# '^\.git/refs/remotes/.' + if empty(remote) + let remote = matchstr(path, '^\.git/refs/remotes/\zs[^/]\+') + let branch = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+') + else + let merge = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+') + let path = '.git/refs/heads/'.merge + endif + elseif path =~# '^\.git/refs/heads/.' + let branch = path[16:-1] + elseif !exists('branch') + let branch = s:repo().head() + endif + if !empty(branch) + let r = s:repo().git_chomp('config','branch.'.branch.'.remote') + let m = s:repo().git_chomp('config','branch.'.branch.'.merge')[11:-1] + if r ==# '.' && !empty(m) + let r2 = s:repo().git_chomp('config','branch.'.m.'.remote') + if r2 !~# '^\.\=$' + let r = r2 + let m = s:repo().git_chomp('config','branch.'.m.'.merge')[11:-1] + endif + endif + if empty(remote) + let remote = r + endif + if r ==# '.' || r ==# remote + let merge = m + if path =~# '^\.git/refs/heads/.' + let path = '.git/refs/heads/'.merge + endif + endif + endif + + if empty(commit) && path !~# '^\.git/' + if a:line1 && !a:count && !empty(merge) + let commit = merge + else + let commit = s:repo().rev_parse('HEAD') + endif + endif + + if empty(remote) + let remote = '.' + let remote_for_url = 'origin' + else + let remote_for_url = remote + endif + if fugitive#git_version() =~# '^[01]\.\|^2\.[0-6]\.' + let raw = s:repo().git_chomp('config','remote.'.remote_for_url.'.url') + else + let raw = s:repo().git_chomp('remote','get-url',remote_for_url) + endif + if raw ==# '' + let raw = remote + endif + + if raw =~# '^https\=://' && s:executable('curl') + if !has_key(s:redirects, raw) + let s:redirects[raw] = matchstr(system('curl -I ' . + \ s:shellesc(raw . '/info/refs?service=git-upload-pack')), + \ 'Location: \zs\S\+\ze/info/refs?') + endif + if len(s:redirects[raw]) + let raw = s:redirects[raw] + endif + endif + + for Handler in g:fugitive_browse_handlers + let url = call(Handler, [{ + \ 'repo': s:repo(), + \ 'remote': raw, + \ 'revision': 'No longer provided', + \ 'commit': commit, + \ 'path': path, + \ 'type': type, + \ 'line1': a:count > 0 ? a:line1 : 0, + \ 'line2': a:count > 0 ? a:count : 0}]) + if !empty(url) + break + endif + endfor + + if empty(url) && raw ==# '.' + call s:throw("Instaweb failed to start") + elseif empty(url) + call s:throw("'".remote."' is not a supported remote") + endif + + let url = s:gsub(url, '[ <>]', '\="%".printf("%02X",char2nr(submatch(0)))') + if a:bang + if has('clipboard') + let @+ = url + endif + return 'echomsg '.string(url) + elseif exists(':Browse') == 2 + return 'echomsg '.string(url).'|Browse '.url + else + if !exists('g:loaded_netrw') + runtime! autoload/netrw.vim + endif + if exists('*netrw#BrowseX') + return 'echomsg '.string(url).'|call netrw#BrowseX('.string(url).', 0)' + else + return 'echomsg '.string(url).'|call netrw#NetrwBrowseX('.string(url).', 0)' + endif + endif + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry +endfunction + +function! s:github_url(opts, ...) abort + if a:0 || type(a:opts) != type({}) + return '' + endif + let domain_pattern = 'github\.com' + let domains = exists('g:fugitive_github_domains') ? g:fugitive_github_domains : [] + for domain in domains + let domain_pattern .= '\|' . escape(split(domain, '://')[-1], '.') + endfor + let repo = matchstr(get(a:opts, 'remote'), '^\%(https\=://\|git://\|git@\)\=\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$') + if repo ==# '' + return '' + endif + call s:warn('Install rhubarb.vim for GitHub support') + return 'https://github.com/tpope/vim-rhubarb' +endfunction + +function! s:instaweb_url(opts) abort + if a:opts.remote !=# '.' + return '' + endif + let output = a:opts.repo.git_chomp('instaweb','-b','unknown') + if output =~# 'http://' + let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.dir(),':t') + else + return '' + endif + if a:opts.path =~# '^\.git/refs/.' + return root . ';a=shortlog;h=' . matchstr(a:opts.path,'^\.git/\zs.*') + elseif a:opts.path =~# '^\.git\>' + return root + endif + let url = root + if a:opts.commit =~# '^\x\{40\}$' + if a:opts.type ==# 'commit' + let url .= ';a=commit' + endif + let url .= ';h=' . a:opts.repo.rev_parse(a:opts.commit . (a:opts.path == '' ? '' : ':' . a:opts.path)) + else + if a:opts.type ==# 'blob' && empty(a:opts.commit) + let url .= ';h='.a:opts.repo.git_chomp('hash-object', '-w', a:opts.path) + else + try + let url .= ';h=' . a:opts.repo.rev_parse((a:opts.commit == '' ? 'HEAD' : ':' . a:opts.commit) . ':' . a:opts.path) + catch /^fugitive:/ + call s:throw('fugitive: cannot browse uncommitted file') + endtry + endif + let root .= ';hb=' . matchstr(a:opts.repo.head_ref(),'[^ ]\+$') + endif + if a:opts.path !=# '' + let url .= ';f=' . a:opts.path + endif + if get(a:opts, 'line1') + let url .= '#l' . a:opts.line1 + endif + return url +endfunction + +if !exists('g:fugitive_browse_handlers') + let g:fugitive_browse_handlers = [] +endif + +call extend(g:fugitive_browse_handlers, + \ [s:function('s:github_url'), s:function('s:instaweb_url')]) + +" Section: File access + +function! s:ReplaceCmd(cmd,...) abort + let fn = expand('%:p') + let tmp = tempname() + let prefix = '' + try + if a:0 && a:1 != '' + if s:winshell() + let old_index = $GIT_INDEX_FILE + let $GIT_INDEX_FILE = a:1 + else + let prefix = 'env GIT_INDEX_FILE='.s:shellesc(a:1).' ' + endif + endif + let redir = ' > '.tmp + if &shellpipe =~ '2>&1' + let redir .= ' 2>&1' + endif + if s:winshell() + let cmd_escape_char = &shellxquote == '(' ? '^' : '^^^' + call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').redir.'"') + elseif &shell =~# 'fish' + call system(' begin;'.prefix.a:cmd.redir.';end ') + else + call system(' ('.prefix.a:cmd.redir.') ') + endif + finally + if exists('old_index') + let $GIT_INDEX_FILE = old_index + endif + endtry + silent exe 'doau BufReadPre '.s:fnameescape(fn) + silent exe 'keepalt file '.tmp + try + silent noautocmd edit! + finally + try + silent exe 'keepalt file '.s:fnameescape(fn) + catch /^Vim\%((\a\+)\)\=:E302/ + endtry + call delete(tmp) + if fnamemodify(bufname('$'), ':p') ==# tmp + silent execute 'bwipeout '.bufnr('$') + endif + silent exe 'doau BufReadPost '.s:fnameescape(fn) + endtry +endfunction + +function! fugitive#BufReadStatus() abort + if !exists('b:fugitive_display_format') + let b:fugitive_display_format = filereadable(expand('%').'.lock') + endif + let b:fugitive_display_format = b:fugitive_display_format % 2 + let b:fugitive_type = 'index' + try + let b:git_dir = s:repo().dir() + setlocal noro ma nomodeline + if fnamemodify($GIT_INDEX_FILE !=# '' ? $GIT_INDEX_FILE : b:git_dir . '/index', ':p') ==# expand('%:p') + let index = '' + else + let index = expand('%:p') + endif + if b:fugitive_display_format + call s:ReplaceCmd(s:repo().git_command('ls-files','--stage'),index) + set ft=git nospell + else + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' + let dir = getcwd() + if fugitive#git_version() =~# '^0\|^1\.[1-7]\.' + let cmd = s:repo().git_command('status') + else + let cmd = s:repo().git_command( + \ '-c', 'status.displayCommentPrefix=true', + \ '-c', 'color.status=false', + \ '-c', 'status.short=false', + \ 'status') + endif + try + execute cd s:fnameescape(s:repo().tree()) + call s:ReplaceCmd(cmd, index) + finally + execute cd s:fnameescape(dir) + endtry + set ft=gitcommit + set foldtext=fugitive#Foldtext() + endif + setlocal ro noma nomod noswapfile + if &bufhidden ==# '' + setlocal bufhidden=delete + endif + call s:JumpInit() + nunmap <buffer> P + nunmap <buffer> ~ + nnoremap <buffer> <silent> <C-N> :<C-U>execute <SID>StageNext(v:count1)<CR> + nnoremap <buffer> <silent> <C-P> :<C-U>execute <SID>StagePrevious(v:count1)<CR> + nnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line('.'),line('.')+v:count1-1)<CR> + xnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line("'<"),line("'>"))<CR> + nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += 1<Bar>exe <SID>BufReadIndex()<CR> + nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= 1<Bar>exe <SID>BufReadIndex()<CR> + nnoremap <buffer> <silent> C :<C-U>Gcommit<CR>:echohl WarningMsg<Bar>echo ':Gstatus C is deprecated in favor of cc'<Bar>echohl NONE<CR> + nnoremap <buffer> <silent> cA :<C-U>Gcommit --amend --reuse-message=HEAD<CR>:echohl WarningMsg<Bar>echo ':Gstatus cA is deprecated in favor of ce'<CR> + nnoremap <buffer> <silent> ca :<C-U>Gcommit --amend<CR> + nnoremap <buffer> <silent> cc :<C-U>Gcommit<CR> + nnoremap <buffer> <silent> ce :<C-U>Gcommit --amend --no-edit<CR> + nnoremap <buffer> <silent> cw :<C-U>Gcommit --amend --only<CR> + nnoremap <buffer> <silent> cva :<C-U>Gcommit -v --amend<CR> + nnoremap <buffer> <silent> cvc :<C-U>Gcommit -v<CR> + nnoremap <buffer> <silent> D :<C-U>execute <SID>StageDiff('Gdiff')<CR> + nnoremap <buffer> <silent> dd :<C-U>execute <SID>StageDiff('Gdiff')<CR> + nnoremap <buffer> <silent> dh :<C-U>execute <SID>StageDiff('Gsdiff')<CR> + nnoremap <buffer> <silent> ds :<C-U>execute <SID>StageDiff('Gsdiff')<CR> + nnoremap <buffer> <silent> dp :<C-U>execute <SID>StageDiffEdit()<CR> + nnoremap <buffer> <silent> dv :<C-U>execute <SID>StageDiff('Gvdiff')<CR> + nnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR> + xnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR> + nnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR> + xnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR> + nnoremap <buffer> <silent> q :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR> + nnoremap <buffer> <silent> r :<C-U>edit<CR> + nnoremap <buffer> <silent> R :<C-U>edit<CR> + nnoremap <buffer> <silent> U :<C-U>execute <SID>StageUndo()<CR> + nnoremap <buffer> <silent> g? :help fugitive-:Gstatus<CR> + nnoremap <buffer> <silent> <F1> :help fugitive-:Gstatus<CR> + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry +endfunction + +function! fugitive#FileRead() abort + try + let repo = s:repo(FugitiveExtractGitDir(expand('<amatch>'))) + let path = s:sub(s:sub(matchstr(expand('<amatch>'),'fugitive://.\{-\}//\zs.*'),'/',':'),'^\d:',':&') + let hash = repo.rev_parse(path) + if path =~ '^:' + let type = 'blob' + else + let type = repo.git_chomp('cat-file','-t',hash) + endif + " TODO: use count, if possible + return "read !".escape(repo.git_command('cat-file',type,hash),'%#\') + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry +endfunction + +function! fugitive#BufReadIndex() abort + try + let b:fugitive_type = 'blob' + let b:git_dir = s:repo().dir() + try + call s:ReplaceCmd(s:repo().git_command('cat-file','blob',s:buffer().sha1())) + finally + if &bufhidden ==# '' + setlocal bufhidden=delete + endif + setlocal noswapfile + endtry + return '' + catch /^fugitive: rev-parse/ + silent exe 'doau BufNewFile '.s:fnameescape(expand('%:p')) + return '' + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry +endfunction + +function! fugitive#BufWriteIndex() abort + let tmp = tempname() + try + let path = matchstr(expand('<amatch>'),'//\d/\zs.*') + let stage = matchstr(expand('<amatch>'),'//\zs\d') + silent execute 'write !'.s:repo().git_command('hash-object','-w','--stdin').' > '.tmp + let sha1 = readfile(tmp)[0] + let old_mode = matchstr(s:repo().git_chomp('ls-files','--stage',path),'^\d\+') + if old_mode == '' + let old_mode = executable(s:repo().tree(path)) ? '100755' : '100644' + endif + let info = old_mode.' '.sha1.' '.stage."\t".path + call writefile([info],tmp) + if s:winshell() + let error = system('type '.s:gsub(tmp,'/','\\').'|'.s:repo().git_command('update-index','--index-info')) + else + let error = system(s:repo().git_command('update-index','--index-info').' < '.tmp) + endif + if v:shell_error == 0 + setlocal nomodified + if exists('#BufWritePost') + execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p')) + endif + call fugitive#ReloadStatus() + return '' + else + return 'echoerr '.string('fugitive: '.error) + endif + finally + call delete(tmp) + endtry +endfunction + +function! fugitive#BufReadObject() abort + try + setlocal noro ma + let b:git_dir = s:repo().dir() + let hash = s:buffer().sha1() + if !exists("b:fugitive_type") + let b:fugitive_type = s:repo().git_chomp('cat-file','-t',hash) + endif + if b:fugitive_type !~# '^\%(tag\|commit\|tree\|blob\)$' + return "echoerr ".string("fugitive: unrecognized git type '".b:fugitive_type."'") + endif + if !exists('b:fugitive_display_format') && b:fugitive_type != 'blob' + let b:fugitive_display_format = +getbufvar('#','fugitive_display_format') + endif + + if b:fugitive_type !=# 'blob' + setlocal nomodeline + endif + + let pos = getpos('.') + silent keepjumps %delete_ + setlocal endofline + + try + if b:fugitive_type ==# 'tree' + let b:fugitive_display_format = b:fugitive_display_format % 2 + if b:fugitive_display_format + call s:ReplaceCmd(s:repo().git_command('ls-tree',hash)) + else + call s:ReplaceCmd(s:repo().git_command('show','--no-color',hash)) + endif + elseif b:fugitive_type ==# 'tag' + let b:fugitive_display_format = b:fugitive_display_format % 2 + if b:fugitive_display_format + call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash)) + else + call s:ReplaceCmd(s:repo().git_command('cat-file','-p',hash)) + endif + elseif b:fugitive_type ==# 'commit' + let b:fugitive_display_format = b:fugitive_display_format % 2 + if b:fugitive_display_format + call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash)) + else + call s:ReplaceCmd(s:repo().git_command('show','--no-color','--pretty=format:tree%x20%T%nparent%x20%P%nauthor%x20%an%x20<%ae>%x20%ad%ncommitter%x20%cn%x20<%ce>%x20%cd%nencoding%x20%e%n%n%s%n%n%b',hash)) + keepjumps call search('^parent ') + if getline('.') ==# 'parent ' + silent keepjumps delete_ + else + silent exe 'keepjumps s/\m\C\%(^parent\)\@<! /\rparent /e' . (&gdefault ? '' : 'g') + endif + keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3) + if lnum + silent keepjumps delete_ + end + silent keepjumps 1,/^diff --git\|\%$/g/\r$/s/// + keepjumps 1 + endif + elseif b:fugitive_type ==# 'blob' + call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash)) + setlocal nomodeline + endif + finally + keepjumps call setpos('.',pos) + setlocal ro noma nomod noswapfile + if &bufhidden ==# '' + setlocal bufhidden=delete + endif + if b:fugitive_type !=# 'blob' + setlocal filetype=git foldmethod=syntax + nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += v:count1<Bar>exe <SID>BufReadObject()<CR> + nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= v:count1<Bar>exe <SID>BufReadObject()<CR> + else + call s:JumpInit() + endif + endtry + + return '' + catch /^fugitive: rev-parse/ + return '' + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry +endfunction + +augroup fugitive_files + autocmd! + autocmd FileType git + \ if exists('b:git_dir') | + \ call s:JumpInit() | + \ endif + autocmd FileType git,gitcommit,gitrebase + \ if exists('b:git_dir') | + \ call s:GFInit() | + \ endif +augroup END + +" Section: Temp files + +if !exists('s:temp_files') + let s:temp_files = {} +endif + +augroup fugitive_temp + autocmd! + autocmd BufNewFile,BufReadPost * + \ if has_key(s:temp_files,s:cpath(expand('<afile>:p'))) | + \ let b:git_dir = s:temp_files[s:cpath(expand('<afile>:p'))].dir | + \ let b:git_type = 'temp' | + \ let b:git_args = s:temp_files[s:cpath(expand('<afile>:p'))].args | + \ call FugitiveDetect(expand('<afile>:p')) | + \ setlocal bufhidden=delete nobuflisted | + \ nnoremap <buffer> <silent> q :<C-U>bdelete<CR>| + \ endif +augroup END + +" Section: Go to file + +nnoremap <SID>: :<C-U><C-R>=v:count ? v:count : ''<CR> +function! s:GFInit(...) abort + cnoremap <buffer> <expr> <Plug><cfile> fugitive#Cfile() + if !exists('g:fugitive_no_maps') + call s:map('n', 'gf', '<SID>:find <Plug><cfile><CR>', '<silent><unique>') + call s:map('n', '<C-W>f', '<SID>:sfind <Plug><cfile><CR>', '<silent><unique>') + call s:map('n', '<C-W><C-F>', '<SID>:sfind <Plug><cfile><CR>', '<silent><unique>') + call s:map('n', '<C-W>gf', '<SID>:tabfind <Plug><cfile><CR>', '<silent><unique>') + call s:map('c', '<C-R><C-F>', '<Plug><cfile>', '<silent><unique>') + endif +endfunction + +function! s:JumpInit(...) abort + nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>GF("edit")<CR> + if !&modifiable + nnoremap <buffer> <silent> o :<C-U>exe <SID>GF("split")<CR> + nnoremap <buffer> <silent> S :<C-U>exe <SID>GF("vsplit")<CR> + nnoremap <buffer> <silent> O :<C-U>exe <SID>GF("tabedit")<CR> + nnoremap <buffer> <silent> - :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().up(v:count1))<Bar> if fugitive#buffer().type('tree')<Bar>call search('^'.escape(expand('#:t'),'.*[]~\').'/\=$','wc')<Bar>endif<CR> + nnoremap <buffer> <silent> P :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().commit().'^'.v:count1.<SID>buffer().path(':'))<CR> + nnoremap <buffer> <silent> ~ :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().commit().'~'.v:count1.<SID>buffer().path(':'))<CR> + nnoremap <buffer> <silent> C :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().containing_commit())<CR> + nnoremap <buffer> <silent> cc :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().containing_commit())<CR> + nnoremap <buffer> <silent> co :<C-U>exe <SID>Edit('split',0,'',<SID>buffer().containing_commit())<CR> + nnoremap <buffer> <silent> cS :<C-U>exe <SID>Edit('vsplit',0,'',<SID>buffer().containing_commit())<CR> + nnoremap <buffer> <silent> cO :<C-U>exe <SID>Edit('tabedit',0,'',<SID>buffer().containing_commit())<CR> + nnoremap <buffer> <silent> cP :<C-U>exe <SID>Edit('pedit',0,'',<SID>buffer().containing_commit())<CR> + nnoremap <buffer> . : <C-R>=fnameescape(<SID>recall())<CR><Home> + endif +endfunction + +function! s:cfile() abort + try + let buffer = s:buffer() + let myhash = buffer.sha1() + if myhash ==# '' && getline(1) =~# '^\%(commit\|tag\) \w' + let myhash = matchstr(getline(1),'^\w\+ \zs\S\+') + endif + + if buffer.type('tree') + let showtree = (getline(1) =~# '^tree ' && getline(2) == "") + if showtree && line('.') > 2 + return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(getline('.'),'/$','')] + elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t' + return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$','')] + endif + + elseif buffer.type('blob') + let ref = expand("<cfile>") + try + let sha1 = buffer.repo().rev_parse(ref) + catch /^fugitive:/ + endtry + if exists('sha1') + return [ref] + endif + + else + + let dcmds = [] + + " Index + if getline('.') =~# '^\d\{6\} \x\{40\} \d\t' + let ref = matchstr(getline('.'),'\x\{40\}') + let file = ':'.s:sub(matchstr(getline('.'),'\d\t.*'),'\t',':') + return [file] + + elseif getline('.') =~# '^.\=\trenamed:.* -> ' + let file = '/'.matchstr(getline('.'),' -> \zs.*') + return [file] + elseif getline('.') =~# '^.\=\t\(\k\| \)\+\p\?: *.' + let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$') + return [file] + elseif getline('.') =~# '^.\=\t.' + let file = '/'.matchstr(getline('.'),'\t\zs.*') + return [file] + elseif getline('.') =~# ': needs merge$' + let file = '/'.matchstr(getline('.'),'.*\ze: needs merge$') + return [file, 'Gdiff!'] + + elseif getline('.') =~# '^\%(. \)\=Not currently on any branch.$' + return ['HEAD'] + elseif getline('.') =~# '^\%(. \)\=On branch ' + let file = 'refs/heads/'.getline('.')[12:] + return [file] + elseif getline('.') =~# "^\\%(. \\)\=Your branch .*'" + let file = matchstr(getline('.'),"'\\zs\\S\\+\\ze'") + return [file] + endif + + let showtree = (getline(1) =~# '^tree ' && getline(2) == "") + + if getline('.') =~# '^ref: ' + let ref = strpart(getline('.'),5) + + elseif getline('.') =~# '^commit \x\{40\}\>' + let ref = matchstr(getline('.'),'\x\{40\}') + return [ref] + + elseif getline('.') =~# '^parent \x\{40\}\>' + let ref = matchstr(getline('.'),'\x\{40\}') + let line = line('.') + let parent = 0 + while getline(line) =~# '^parent ' + let parent += 1 + let line -= 1 + endwhile + return [ref] + + elseif getline('.') =~ '^tree \x\{40\}$' + let ref = matchstr(getline('.'),'\x\{40\}') + if s:repo().rev_parse(myhash.':') == ref + let ref = myhash.':' + endif + return [ref] + + elseif getline('.') =~# '^object \x\{40\}$' && getline(line('.')+1) =~ '^type \%(commit\|tree\|blob\)$' + let ref = matchstr(getline('.'),'\x\{40\}') + let type = matchstr(getline(line('.')+1),'type \zs.*') + + elseif getline('.') =~# '^\l\{3,8\} '.myhash.'$' + let ref = buffer.rev() + + elseif getline('.') =~# '^\l\{3,8\} \x\{40\}\>' + let ref = matchstr(getline('.'),'\x\{40\}') + echoerr "warning: unknown context ".matchstr(getline('.'),'^\l*') + + elseif getline('.') =~# '^[+-]\{3\} [abciow12]\=/' + let ref = getline('.')[4:] + + elseif getline('.') =~# '^[+-]' && search('^@@ -\d\+,\d\+ +\d\+,','bnW') + let type = getline('.')[0] + let lnum = line('.') - 1 + let offset = 0 + while getline(lnum) !~# '^@@ -\d\+,\d\+ +\d\+,' + if getline(lnum) =~# '^[ '.type.']' + let offset += 1 + endif + let lnum -= 1 + endwhile + let offset += matchstr(getline(lnum), type.'\zs\d\+') + let ref = getline(search('^'.type.'\{3\} [abciow12]/','bnW'))[4:-1] + let dcmds = [offset, 'normal!zv'] + + elseif getline('.') =~# '^rename from ' + let ref = 'a/'.getline('.')[12:] + elseif getline('.') =~# '^rename to ' + let ref = 'b/'.getline('.')[10:] + + elseif getline('.') =~# '^@@ -\d\+,\d\+ +\d\+,' + let diff = getline(search('^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)', 'bcnW')) + let offset = matchstr(getline('.'), '+\zs\d\+') + + let dref = matchstr(diff, '\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)') + let ref = matchstr(diff, '\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)') + let dcmd = 'Gdiff! +'.offset + + elseif getline('.') =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)' + let dref = matchstr(getline('.'),'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)') + let ref = matchstr(getline('.'),'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)') + let dcmd = 'Gdiff!' + + elseif getline('.') =~# '^index ' && getline(line('.')-1) =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)' + let line = getline(line('.')-1) + let dref = matchstr(line,'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)') + let ref = matchstr(line,'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)') + let dcmd = 'Gdiff!' + + elseif line('$') == 1 && getline('.') =~ '^\x\{40\}$' + let ref = getline('.') + + elseif expand('<cword>') =~# '^\x\{7,40\}\>' + return [expand('<cword>')] + + else + let ref = '' + endif + + let prefixes = { + \ '1': '', + \ '2': '', + \ 'b': ':0:', + \ 'i': ':0:', + \ 'o': '', + \ 'w': ''} + + if len(myhash) + let prefixes.a = myhash.'^:' + let prefixes.b = myhash.':' + endif + let ref = substitute(ref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '') + if exists('dref') + let dref = substitute(dref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '') + endif + + if ref ==# '/dev/null' + " Empty blob + let ref = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391' + endif + + if exists('dref') + return [ref, dcmd . ' ' . s:fnameescape(dref)] + dcmds + elseif ref != "" + return [ref] + dcmds + endif + + endif + return [] + endtry +endfunction + +function! s:GF(mode) abort + try + let results = s:cfile() + catch /^fugitive:/ + return 'echoerr v:errmsg' + endtry + if len(results) + return s:Edit(a:mode, 0, '', results[0]).join(map(results[1:-1], '"|".v:val'), '') + else + return '' + endif +endfunction + +function! fugitive#Cfile() abort + let pre = '' + let results = s:cfile() + if empty(results) + let cfile = expand('<cfile>') + if &includeexpr =~# '\<v:fname\>' + sandbox let cfile = eval(substitute(&includeexpr, '\C\<v:fname\>', '\=string(cfile)', 'g')) + endif + return cfile + elseif len(results) > 1 + let pre = '+' . join(map(results[1:-1], 'escape(v:val, " ")'), '\|') . ' ' + endif + return pre . s:fnameescape(fugitive#repo().translate(results[0])) +endfunction + +function! fugitive#cfile() abort + return fugitive#Cfile() +endfunction + +" Section: Statusline + +function! s:repo_head_ref() dict abort + if !filereadable(self.dir('HEAD')) + return '' + endif + return readfile(self.dir('HEAD'))[0] +endfunction + +call s:add_methods('repo',['head_ref']) + +function! fugitive#Statusline(...) abort + if !exists('b:git_dir') + return '' + endif + let status = '' + if s:buffer().commit() != '' + let status .= ':' . s:buffer().commit()[0:7] + endif + let status .= '('.FugitiveHead(7).')' + if &statusline =~# '%[MRHWY]' && &statusline !~# '%[mrhwy]' + return ',GIT'.status + else + return '[Git'.status.']' + endif +endfunction + +function! fugitive#statusline(...) abort + return fugitive#Statusline() +endfunction + +function! fugitive#head(...) abort + if !exists('b:git_dir') + return '' + endif + + return s:repo().head(a:0 ? a:1 : 0) +endfunction + +" Section: Folding + +function! fugitive#Foldtext() abort + if &foldmethod !=# 'syntax' + return foldtext() + endif + + let line_foldstart = getline(v:foldstart) + if line_foldstart =~# '^diff ' + let [add, remove] = [-1, -1] + let filename = '' + for lnum in range(v:foldstart, v:foldend) + let line = getline(lnum) + if filename ==# '' && line =~# '^[+-]\{3\} [abciow12]/' + let filename = line[6:-1] + endif + if line =~# '^+' + let add += 1 + elseif line =~# '^-' + let remove += 1 + elseif line =~# '^Binary ' + let binary = 1 + endif + endfor + if filename ==# '' + let filename = matchstr(line_foldstart, '^diff .\{-\} [abciow12]/\zs.*\ze [abciow12]/') + endif + if filename ==# '' + let filename = line_foldstart[5:-1] + endif + if exists('binary') + return 'Binary: '.filename + else + return (add<10&&remove<100?' ':'') . add . '+ ' . (remove<10&&add<100?' ':'') . remove . '- ' . filename + endif + elseif line_foldstart =~# '^# .*:$' + let lines = getline(v:foldstart, v:foldend) + call filter(lines, 'v:val =~# "^#\t"') + cal map(lines, "s:sub(v:val, '^#\t%(modified: +|renamed: +)=', '')") + cal map(lines, "s:sub(v:val, '^([[:alpha:] ]+): +(.*)', '\\2 (\\1)')") + return line_foldstart.' '.join(lines, ', ') + endif + return foldtext() +endfunction + +function! fugitive#foldtext() abort + return fugitive#Foldtext() +endfunction + +augroup fugitive_folding + autocmd! + autocmd User Fugitive + \ if &filetype =~# '^git\%(commit\)\=$' && &foldtext ==# 'foldtext()' | + \ set foldtext=fugitive#Foldtext() | + \ endif +augroup END diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim @@ -8,151 +8,14 @@ if exists('g:loaded_fugitive') endif let g:loaded_fugitive = 1 -if !exists('g:fugitive_git_executable') - let g:fugitive_git_executable = 'git' -endif - -" Section: Utility - -function! s:function(name) abort - return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),'')) -endfunction - -function! s:sub(str,pat,rep) abort - return substitute(a:str,'\v\C'.a:pat,a:rep,'') -endfunction - -function! s:gsub(str,pat,rep) abort - return substitute(a:str,'\v\C'.a:pat,a:rep,'g') -endfunction - -function! s:winshell() abort - return &shell =~? 'cmd' || exists('+shellslash') && !&shellslash -endfunction - -function! s:shellesc(arg) abort - if a:arg =~ '^[A-Za-z0-9_/.-]\+$' - return a:arg - elseif s:winshell() - return '"'.s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"').'"' - else - return shellescape(a:arg) - endif -endfunction - -function! s:fnameescape(file) abort - if exists('*fnameescape') - return fnameescape(a:file) - else - return escape(a:file," \t\n*?[{`$\\%#'\"|!<") - endif -endfunction - -function! s:throw(string) abort - let v:errmsg = 'fugitive: '.a:string - throw v:errmsg -endfunction - -function! s:warn(str) abort - echohl WarningMsg - echomsg a:str - echohl None - let v:warningmsg = a:str -endfunction - function! s:shellslash(path) abort - if s:winshell() + if &shell =~? 'cmd' || exists('+shellslash') && !&shellslash return tr(a:path, '\', '/') else return a:path endif endfunction -let s:executables = {} - -function! s:executable(binary) abort - if !has_key(s:executables, a:binary) - let s:executables[a:binary] = executable(a:binary) - endif - return s:executables[a:binary] -endfunction - -let s:git_versions = {} - -function! s:git_command() abort - return get(g:, 'fugitive_git_command', g:fugitive_git_executable) -endfunction - -function! fugitive#git_version(...) abort - if !has_key(s:git_versions, g:fugitive_git_executable) - let s:git_versions[g:fugitive_git_executable] = matchstr(system(g:fugitive_git_executable.' --version'), "\\S\\+\n") - endif - return s:git_versions[g:fugitive_git_executable] -endfunction - -function! s:recall() abort - let rev = s:sub(s:buffer().rev(), '^/', '') - if rev ==# ':' - return matchstr(getline('.'),'^.\=\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$\|^\d\{6} \x\{40\} \d\t\zs.*') - elseif s:buffer().type('tree') - let file = matchstr(getline('.'), '\t\zs.*') - if empty(file) && line('.') > 2 - let file = s:sub(getline('.'), '/$', '') - endif - if !empty(file) && rev !~# ':$' - return rev . '/' . file - else - return rev . file - endif - endif - return rev -endfunction - -function! s:map(mode, lhs, rhs, ...) abort - let flags = (a:0 ? a:1 : '') . (a:rhs =~# '^<Plug>' ? '' : '<script>') - let head = a:lhs - let tail = '' - let keys = get(g:, a:mode.'remap', {}) - if type(keys) == type([]) - return - endif - while !empty(head) - if has_key(keys, head) - let head = keys[head] - if empty(head) - return - endif - break - endif - let tail = matchstr(head, '<[^<>]*>$\|.$') . tail - let head = substitute(head, '<[^<>]*>$\|.$', '', '') - endwhile - if flags !~# '<unique>' || empty(mapcheck(head.tail, a:mode)) - exe a:mode.'map <buffer>' flags head.tail a:rhs - endif -endfunction - -function! s:add_methods(namespace, method_names) abort - for name in a:method_names - let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name) - endfor -endfunction - -let s:commands = [] -function! s:command(definition) abort - let s:commands += [a:definition] -endfunction - -function! s:define_commands() abort - for command in s:commands - exe 'command! -buffer '.command - endfor -endfunction - -let s:abstract_prototype = {} - -" Section: Detection - function! FugitiveIsGitDir(path) abort let path = substitute(a:path, '[\/]$', '', '') . '/' return getfsize(path.'HEAD') > 10 && ( @@ -299,2929 +162,3 @@ augroup fugitive autocmd User Flags call Hoist('buffer', function('FugitiveStatusline')) augroup END - -" Section: Initialization - -function! fugitive#Init() abort - if exists('#User#FugitiveBoot') - try - let [save_mls, &modelines] = [&mls, 0] - doautocmd User FugitiveBoot - finally - let &mls = save_mls - endtry - endif - if !exists('g:fugitive_no_maps') - call s:map('c', '<C-R><C-G>', 'fnameescape(<SID>recall())', '<expr>') - call s:map('n', 'y<C-G>', ':call setreg(v:register, <SID>recall())<CR>', '<silent>') - endif - let buffer = fugitive#buffer() - if expand('%:p') =~# '://' - call buffer.setvar('&path', s:sub(buffer.getvar('&path'), '^\.%(,|$)', '')) - endif - if stridx(buffer.getvar('&tags'), escape(b:git_dir, ', ')) == -1 - if filereadable(b:git_dir.'/tags') - call buffer.setvar('&tags', escape(b:git_dir.'/tags', ', ').','.buffer.getvar('&tags')) - endif - if &filetype !=# '' && filereadable(b:git_dir.'/'.&filetype.'.tags') - call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags')) - endif - endif - try - let [save_mls, &modelines] = [&mls, 0] - call s:define_commands() - doautocmd User Fugitive - finally - let &mls = save_mls - endtry -endfunction - -function! fugitive#is_git_dir(path) abort - return FugitiveIsGitDir(a:path) -endfunction - -function! fugitive#extract_git_dir(path) abort - return FugitiveExtractGitDir(a:path) -endfunction - -function! fugitive#detect(path) abort - return FugitiveDetect(a:path) -endfunction - -" Section: Repository - -let s:repo_prototype = {} -let s:repos = {} - -function! s:repo(...) abort - let dir = a:0 ? a:1 : (exists('b:git_dir') && b:git_dir !=# '' ? b:git_dir : FugitiveExtractGitDir(expand('%:p'))) - if dir !=# '' - if has_key(s:repos, dir) - let repo = get(s:repos, dir) - else - let repo = {'git_dir': dir} - let s:repos[dir] = repo - endif - return extend(extend(repo, s:repo_prototype, 'keep'), s:abstract_prototype, 'keep') - endif - call s:throw('not a git repository: '.expand('%:p')) -endfunction - -function! fugitive#repo(...) abort - return call('s:repo', a:000) -endfunction - -function! s:repo_dir(...) dict abort - return join([self.git_dir]+a:000,'/') -endfunction - -function! s:repo_tree(...) dict abort - let dir = FugitiveTreeForGitDir(self.git_dir) - if dir ==# '' - call s:throw('no work tree') - else - return join([dir]+a:000,'/') - endif -endfunction - -function! s:repo_bare() dict abort - if self.dir() =~# '/\.git$' - return 0 - else - return FugitiveTreeForGitDir(self.git_dir) ==# '' - endif -endfunction - -function! s:repo_translate(spec) dict abort - let refs = self.dir('refs/') - if filereadable(self.dir('commondir')) - let refs = simplify(self.dir(get(readfile(self.dir('commondir'), 1), 0, ''))) . '/refs/' - endif - if a:spec ==# '.' || a:spec ==# '/.' - return self.bare() ? self.dir() : self.tree() - elseif a:spec =~# '^/\=\.git$' && self.bare() - return self.dir() - elseif a:spec =~# '^/\=\.git/' - return self.dir(s:sub(a:spec, '^/=\.git/', '')) - elseif a:spec =~# '^/' - return self.tree().a:spec - elseif a:spec =~# '^:[0-3]:' - return 'fugitive://'.self.dir().'//'.a:spec[1].'/'.a:spec[3:-1] - elseif a:spec ==# ':' - if $GIT_INDEX_FILE =~# '/[^/]*index[^/]*\.lock$' && fnamemodify($GIT_INDEX_FILE,':p')[0:strlen(self.dir())] ==# self.dir('') && filereadable($GIT_INDEX_FILE) - return fnamemodify($GIT_INDEX_FILE,':p') - else - return self.dir('index') - endif - elseif a:spec =~# '^:/' - let ref = self.rev_parse(matchstr(a:spec,'.[^:]*')) - return 'fugitive://'.self.dir().'//'.ref - elseif a:spec =~# '^:' - return 'fugitive://'.self.dir().'//0/'.a:spec[1:-1] - elseif a:spec ==# '@' - return self.dir('HEAD') - elseif a:spec =~# 'HEAD\|^refs/' && a:spec !~ ':' && filereadable(refs . '../' . a:spec) - return simplify(refs . '../' . a:spec) - elseif filereadable(refs.a:spec) - return refs.a:spec - elseif filereadable(refs.'tags/'.a:spec) - return refs.'tags/'.a:spec - elseif filereadable(refs.'heads/'.a:spec) - return refs.'heads/'.a:spec - elseif filereadable(refs.'remotes/'.a:spec) - return refs.'remotes/'.a:spec - elseif filereadable(refs.'remotes/'.a:spec.'/HEAD') - return refs.'remotes/'.a:spec.'/HEAD' - else - try - let ref = self.rev_parse(matchstr(a:spec,'[^:]*')) - let path = s:sub(matchstr(a:spec,':.*'),'^:','/') - return 'fugitive://'.self.dir().'//'.ref.path - catch /^fugitive:/ - return self.tree(a:spec) - endtry - endif -endfunction - -function! s:repo_head(...) dict abort - let head = s:repo().head_ref() - - if head =~# '^ref: ' - let branch = s:sub(head,'^ref: %(refs/%(heads/|remotes/|tags/)=)=','') - elseif head =~# '^\x\{40\}$' - " truncate hash to a:1 characters if we're in detached head mode - let len = a:0 ? a:1 : 0 - let branch = len ? head[0:len-1] : '' - else - return '' - endif - - return branch -endfunction - -call s:add_methods('repo',['dir','tree','bare','translate','head']) - -function! s:repo_git_command(...) dict abort - let git = s:git_command() . ' --git-dir='.s:shellesc(self.git_dir) - return git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'') -endfunction - -function! s:repo_git_chomp(...) dict abort - let git = g:fugitive_git_executable . ' --git-dir='.s:shellesc(self.git_dir) - let output = git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'') - return s:sub(system(output),'\n$','') -endfunction - -function! s:repo_git_chomp_in_tree(...) dict abort - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let dir = getcwd() - try - execute cd s:fnameescape(s:repo().tree()) - return call(s:repo().git_chomp, a:000, s:repo()) - finally - execute cd s:fnameescape(dir) - endtry -endfunction - -function! s:repo_rev_parse(rev) dict abort - let hash = self.git_chomp('rev-parse','--verify',a:rev) - if hash =~ '\<\x\{40\}$' - return matchstr(hash,'\<\x\{40\}$') - endif - call s:throw('rev-parse '.a:rev.': '.hash) -endfunction - -call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse']) - -function! s:repo_dirglob(base) dict abort - let base = s:sub(a:base,'^/','') - let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*/')),"\n") - call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]') - return matches -endfunction - -function! s:repo_superglob(base) dict abort - if a:base =~# '^/' || a:base !~# ':' - let results = [] - if a:base !~# '^/' - let heads = ["HEAD","ORIG_HEAD","FETCH_HEAD","MERGE_HEAD"] - let heads += sort(split(s:repo().git_chomp("rev-parse","--symbolic","--branches","--tags","--remotes"),"\n")) - " Add any stashes. - if filereadable(s:repo().dir('refs/stash')) - let heads += ["stash"] - let heads += sort(split(s:repo().git_chomp("stash","list","--pretty=format:%gd"),"\n")) - endif - call filter(heads,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base') - let results += heads - endif - if !self.bare() - let base = s:sub(a:base,'^/','') - let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*')),"\n") - call map(matches,'s:shellslash(v:val)') - call map(matches,'v:val !~ "/$" && isdirectory(v:val) ? v:val."/" : v:val') - call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]') - let results += matches - endif - return results - - elseif a:base =~# '^:' - let entries = split(self.git_chomp('ls-files','--stage'),"\n") - call map(entries,'s:sub(v:val,".*(\\d)\\t(.*)",":\\1:\\2")') - if a:base !~# '^:[0-3]\%(:\|$\)' - call filter(entries,'v:val[1] == "0"') - call map(entries,'v:val[2:-1]') - endif - call filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base') - return entries - - else - let tree = matchstr(a:base,'.*[:/]') - let entries = split(self.git_chomp('ls-tree',tree),"\n") - call map(entries,'s:sub(v:val,"^04.*\\zs$","/")') - call map(entries,'tree.s:sub(v:val,".*\t","")') - return filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base') - endif -endfunction - -call s:add_methods('repo',['dirglob','superglob']) - -function! s:repo_config(conf) dict abort - return matchstr(s:repo().git_chomp('config',a:conf),"[^\r\n]*") -endfun - -function! s:repo_user() dict abort - let username = s:repo().config('user.name') - let useremail = s:repo().config('user.email') - return username.' <'.useremail.'>' -endfun - -function! s:repo_aliases() dict abort - if !has_key(self,'_aliases') - let self._aliases = {} - for line in split(self.git_chomp('config','-z','--get-regexp','^alias[.]'),"\1") - let self._aliases[matchstr(line, '\.\zs.\{-}\ze\n')] = matchstr(line, '\n\zs.*') - endfor - endif - return self._aliases -endfunction - -call s:add_methods('repo',['config', 'user', 'aliases']) - -function! s:repo_keywordprg() dict abort - let args = ' --git-dir='.escape(self.dir(),"\\\"' ") - if has('gui_running') && !has('win32') - return s:git_command() . ' --no-pager' . args . ' log -1' - else - return s:git_command() . args . ' show' - endif -endfunction - -call s:add_methods('repo',['keywordprg']) - -" Section: Buffer - -let s:buffer_prototype = {} - -function! s:buffer(...) abort - let buffer = {'#': bufnr(a:0 ? a:1 : '%')} - call extend(extend(buffer,s:buffer_prototype,'keep'),s:abstract_prototype,'keep') - if buffer.getvar('git_dir') !=# '' - return buffer - endif - call s:throw('not a git repository: '.expand('%:p')) -endfunction - -function! fugitive#buffer(...) abort - return s:buffer(a:0 ? a:1 : '%') -endfunction - -function! s:buffer_getvar(var) dict abort - return getbufvar(self['#'],a:var) -endfunction - -function! s:buffer_setvar(var,value) dict abort - return setbufvar(self['#'],a:var,a:value) -endfunction - -function! s:buffer_getline(lnum) dict abort - return get(getbufline(self['#'], a:lnum), 0, '') -endfunction - -function! s:buffer_repo() dict abort - return s:repo(self.getvar('git_dir')) -endfunction - -function! s:buffer_type(...) dict abort - if self.getvar('fugitive_type') != '' - let type = self.getvar('fugitive_type') - elseif fnamemodify(self.spec(),':p') =~# '.\git/refs/\|\.git/\w*HEAD$' - let type = 'head' - elseif self.getline(1) =~ '^tree \x\{40\}$' && self.getline(2) == '' - let type = 'tree' - elseif self.getline(1) =~ '^\d\{6\} \w\{4\} \x\{40\}\>\t' - let type = 'tree' - elseif self.getline(1) =~ '^\d\{6\} \x\{40\}\> \d\t' - let type = 'index' - elseif isdirectory(self.spec()) - let type = 'directory' - elseif self.spec() == '' - let type = 'null' - else - let type = 'file' - endif - if a:0 - return !empty(filter(copy(a:000),'v:val ==# type')) - else - return type - endif -endfunction - -if has('win32') - - function! s:buffer_spec() dict abort - let bufname = bufname(self['#']) - let retval = '' - for i in split(bufname,'[^:]\zs\\') - let retval = fnamemodify((retval==''?'':retval.'\').i,':.') - endfor - return s:shellslash(fnamemodify(retval,':p')) - endfunction - -else - - function! s:buffer_spec() dict abort - let bufname = bufname(self['#']) - return s:shellslash(bufname == '' ? '' : fnamemodify(bufname,':p')) - endfunction - -endif - -function! s:buffer_name() dict abort - return self.spec() -endfunction - -function! s:buffer_commit() dict abort - return matchstr(self.spec(),'^fugitive://.\{-\}//\zs\w*') -endfunction - -function! s:cpath(path) abort - if exists('+fileignorecase') && &fileignorecase - return tolower(a:path) - else - return a:path - endif -endfunction - -function! s:buffer_path(...) dict abort - let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*') - if rev != '' - let rev = s:sub(rev,'\w*','') - elseif s:cpath(self.spec()[0 : len(self.repo().dir())]) ==# - \ s:cpath(self.repo().dir() . '/') - let rev = '/.git'.self.spec()[strlen(self.repo().dir()) : -1] - elseif !self.repo().bare() && - \ s:cpath(self.spec()[0 : len(self.repo().tree())]) ==# - \ s:cpath(self.repo().tree() . '/') - let rev = self.spec()[strlen(self.repo().tree()) : -1] - endif - return s:sub(s:sub(rev,'.\zs/$',''),'^/',a:0 ? a:1 : '') -endfunction - -function! s:buffer_rev() dict abort - let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*') - if rev =~ '^\x/' - return ':'.rev[0].':'.rev[2:-1] - elseif rev =~ '.' - return s:sub(rev,'/',':') - elseif self.spec() =~ '\.git/index$' - return ':' - elseif self.spec() =~ '\.git/refs/\|\.git/.*HEAD$' - return self.spec()[strlen(self.repo().dir())+1 : -1] - else - return self.path('/') - endif -endfunction - -function! s:buffer_sha1() dict abort - if self.spec() =~ '^fugitive://' || self.spec() =~ '\.git/refs/\|\.git/.*HEAD$' - return self.repo().rev_parse(self.rev()) - else - return '' - endif -endfunction - -function! s:buffer_expand(rev) dict abort - if a:rev =~# '^:[0-3]$' - let file = a:rev.self.path(':') - elseif a:rev =~# '^[-:]/$' - let file = '/'.self.path() - elseif a:rev =~# '^-' - let file = 'HEAD^{}'.a:rev[1:-1].self.path(':') - elseif a:rev =~# '^@{' - let file = 'HEAD'.a:rev.self.path(':') - elseif a:rev =~# '^[~^]' - let commit = s:sub(self.commit(),'^\d=$','HEAD') - let file = commit.a:rev.self.path(':') - else - let file = a:rev - endif - return s:sub(substitute(file, - \ '%$\|\\\([[:punct:]]\)','\=len(submatch(1)) ? submatch(1) : self.path()','g'), - \ '\.\@<=/$','') -endfunction - -function! s:buffer_containing_commit() dict abort - if self.commit() =~# '^\d$' - return ':' - elseif self.commit() =~# '.' - return self.commit() - else - return 'HEAD' - endif -endfunction - -function! s:buffer_up(...) dict abort - let rev = self.rev() - let c = a:0 ? a:1 : 1 - while c - if rev =~# '^[/:]$' - let rev = 'HEAD' - elseif rev =~# '^:' - let rev = ':' - elseif rev =~# '^refs/[^^~:]*$\|^[^^~:]*HEAD$' - let rev .= '^{}' - elseif rev =~# '^/\|:.*/' - let rev = s:sub(rev, '.*\zs/.*', '') - elseif rev =~# ':.' - let rev = matchstr(rev, '^[^:]*:') - elseif rev =~# ':$' - let rev = rev[0:-2] - else - return rev.'~'.c - endif - let c -= 1 - endwhile - return rev -endfunction - -call s:add_methods('buffer',['getvar','setvar','getline','repo','type','spec','name','commit','path','rev','sha1','expand','containing_commit','up']) - -" Section: Git - -call s:command("-bang -nargs=? -complete=customlist,s:GitComplete Git :execute s:Git(<bang>0,'<mods>',<q-args>)") - -function! s:ExecuteInTree(cmd) abort - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let dir = getcwd() - try - execute cd s:fnameescape(s:repo().tree()) - execute a:cmd - finally - execute cd s:fnameescape(dir) - endtry -endfunction - -function! s:Git(bang, mods, args) abort - if a:bang - return s:Edit('edit', 1, a:mods, a:args) - endif - let git = s:git_command() - if has('gui_running') && !has('win32') - let git .= ' --no-pager' - endif - let args = matchstr(a:args,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=') - if exists(':terminal') && has('nvim') - let dir = s:repo().tree() - if expand('%') != '' - -tabedit % - else - -tabnew - endif - execute 'lcd' fnameescape(dir) - execute 'terminal' git args - else - call s:ExecuteInTree('!'.git.' '.args) - if has('win32') - call fugitive#ReloadStatus() - endif - endif - return matchstr(a:args, '\v\C\\@<!%(\\\\)*\|\zs.*') -endfunction - -function! fugitive#git_commands() abort - if !exists('s:exec_path') - let s:exec_path = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','') - endif - return map(split(glob(s:exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(s:exec_path)+5 : -1],"\\.exe$","")') -endfunction - -function! s:GitComplete(A, L, P) abort - if strpart(a:L, 0, a:P) !~# ' [[:alnum:]-]\+ ' - let cmds = fugitive#git_commands() - return filter(sort(cmds+keys(s:repo().aliases())), 'strpart(v:val, 0, strlen(a:A)) ==# a:A') - else - return s:repo().superglob(a:A) - endif -endfunction - -" Section: Gcd, Glcd - -function! s:DirComplete(A,L,P) abort - let matches = s:repo().dirglob(a:A) - return matches -endfunction - -call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Gcd :exe 'cd<bang>' s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))") -call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :exe 'lcd<bang>' s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))") - -" Section: Gstatus - -call s:command("-bar -bang -range=-1 Gstatus :execute s:Status(<bang>0, <count>, '<mods>')") -augroup fugitive_status - autocmd! - if !has('win32') - autocmd FocusGained,ShellCmdPost * call fugitive#ReloadStatus() - autocmd BufDelete term://* call fugitive#ReloadStatus() - endif -augroup END - -function! s:Status(bang, count, mods) abort - try - exe (a:mods ==# '<mods>' ? '' : a:mods) 'Gpedit :' - wincmd P - setlocal foldmethod=syntax foldlevel=1 - nnoremap <buffer> <silent> q :<C-U>bdelete<CR> - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry - return '' -endfunction - -function! fugitive#ReloadStatus() abort - if exists('s:reloading_status') - return - endif - try - let s:reloading_status = 1 - let mytab = tabpagenr() - for tab in [mytab] + range(1,tabpagenr('$')) - for winnr in range(1,tabpagewinnr(tab,'$')) - if getbufvar(tabpagebuflist(tab)[winnr-1],'fugitive_type') ==# 'index' - execute 'tabnext '.tab - if winnr != winnr() - execute winnr.'wincmd w' - let restorewinnr = 1 - endif - try - if !&modified - call fugitive#BufReadStatus() - endif - finally - if exists('restorewinnr') - wincmd p - endif - execute 'tabnext '.mytab - endtry - endif - endfor - endfor - finally - unlet! s:reloading_status - endtry -endfunction - -function! fugitive#reload_status() abort - return fugitive#ReloadStatus() -endfunction - -function! s:stage_info(lnum) abort - let filename = matchstr(getline(a:lnum),'^.\=\t\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$') - let lnum = a:lnum - if has('multi_byte_encoding') - let colon = '\%(:\|\%uff1a\)' - else - let colon = ':' - endif - while lnum && getline(lnum) !~# colon.'$' - let lnum -= 1 - endwhile - if !lnum - return ['', ''] - elseif (getline(lnum+1) =~# '^.\= .*\<git \%(reset\|rm --cached\) ' && getline(lnum+2) ==# '#') || getline(lnum) =~# '^\%(. \)\=Changes to be committed:$' - return [matchstr(filename, colon.' *\zs.*'), 'staged'] - elseif (getline(lnum+1) =~# '^.\= .*\<git add ' && getline(lnum+2) ==# '#' && getline(lnum+3) !~# colon.' ') || getline(lnum) =~# '^\(. \)\=Untracked files:$' - return [filename, 'untracked'] - elseif getline(lnum+2) =~# '^.\= .*\<git checkout ' || getline(lnum) =~# '\%(. \)\=Changes not staged for commit:$' - return [matchstr(filename, colon.' *\zs.*'), 'unstaged'] - elseif getline(lnum+2) =~# '^.\= .*\<git \%(add\|rm\)' || getline(lnum) =~# '\%(. \)\=Unmerged paths:$' - return [matchstr(filename, colon.' *\zs.*'), 'unmerged'] - else - return ['', 'unknown'] - endif -endfunction - -function! s:StageNext(count) abort - for i in range(a:count) - call search('^.\=\t.*','W') - endfor - return '.' -endfunction - -function! s:StagePrevious(count) abort - if line('.') == 1 && exists(':CtrlP') && get(g:, 'ctrl_p_map') =~? '^<c-p>$' - return 'CtrlP '.fnameescape(s:repo().tree()) - else - for i in range(a:count) - call search('^.\=\t.*','Wbe') - endfor - return '.' - endif -endfunction - -function! s:StageReloadSeek(target,lnum1,lnum2) abort - let jump = a:target - let f = matchstr(getline(a:lnum1-1),'^.\=\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*') - if f !=# '' | let jump = f | endif - let f = matchstr(getline(a:lnum2+1),'^.\=\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*') - if f !=# '' | let jump = f | endif - silent! edit! - 1 - redraw - call search('^.\=\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\V'.jump.'\%( ([^()[:digit:]]\+)\)\=\$','W') -endfunction - -function! s:StageUndo() abort - let [filename, section] = s:stage_info(line('.')) - if empty(filename) - return '' - endif - let repo = s:repo() - let hash = repo.git_chomp('hash-object', '-w', filename) - if !empty(hash) - if section ==# 'untracked' - call repo.git_chomp_in_tree('clean', '-f', '--', filename) - elseif section ==# 'unmerged' - call repo.git_chomp_in_tree('rm', '--', filename) - elseif section ==# 'unstaged' - call repo.git_chomp_in_tree('checkout', '--', filename) - else - call repo.git_chomp_in_tree('checkout', 'HEAD', '--', filename) - endif - call s:StageReloadSeek(filename, line('.'), line('.')) - let @" = hash - return 'checktime|redraw|echomsg ' . - \ string('To restore, :Git cat-file blob '.hash[0:6].' > '.filename) - endif -endfunction - -function! s:StageDiff(diff) abort - let [filename, section] = s:stage_info(line('.')) - if filename ==# '' && section ==# 'staged' - return 'Git! diff --no-ext-diff --cached' - elseif filename ==# '' - return 'Git! diff --no-ext-diff' - elseif filename =~# ' -> ' - let [old, new] = split(filename,' -> ') - execute 'Gedit '.s:fnameescape(':0:'.new) - return a:diff.' HEAD:'.s:fnameescape(old) - elseif section ==# 'staged' - execute 'Gedit '.s:fnameescape(':0:'.filename) - return a:diff.' -' - else - execute 'Gedit '.s:fnameescape('/'.filename) - return a:diff - endif -endfunction - -function! s:StageDiffEdit() abort - let [filename, section] = s:stage_info(line('.')) - let arg = (filename ==# '' ? '.' : filename) - if section ==# 'staged' - return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg) - elseif section ==# 'untracked' - let repo = s:repo() - call repo.git_chomp_in_tree('add','--intent-to-add',arg) - if arg ==# '.' - silent! edit! - 1 - if !search('^.*:\n.*\n.\= .*"git checkout \|^\%(# \)=Changes not staged for commit:$','W') - call search(':$','W') - endif - else - call s:StageReloadSeek(arg,line('.'),line('.')) - endif - return '' - else - return 'Git! diff --no-ext-diff '.s:shellesc(arg) - endif -endfunction - -function! s:StageToggle(lnum1,lnum2) abort - if a:lnum1 == 1 && a:lnum2 == 1 - return 'Gedit /.git|call search("^index$", "wc")' - endif - try - let output = '' - for lnum in range(a:lnum1,a:lnum2) - let [filename, section] = s:stage_info(lnum) - let repo = s:repo() - if getline('.') =~# ':$' - if section ==# 'staged' - call repo.git_chomp_in_tree('reset','-q') - silent! edit! - 1 - if !search('^.*:\n.\= .*"git add .*\n#\n\|^\%(. \)\=Untracked files:$','W') - call search(':$','W') - endif - return '' - elseif section ==# 'unstaged' - call repo.git_chomp_in_tree('add','-u') - silent! edit! - 1 - if !search('^.*:\n\.\= .*"git add .*\n#\n\|^\%( \)=Untracked files:$','W') - call search(':$','W') - endif - return '' - else - call repo.git_chomp_in_tree('add','.') - silent! edit! - 1 - call search(':$','W') - return '' - endif - endif - if filename ==# '' - continue - endif - execute lnum - if section ==# 'staged' - if filename =~ ' -> ' - let files_to_unstage = split(filename,' -> ') - else - let files_to_unstage = [filename] - endif - let filename = files_to_unstage[-1] - let cmd = ['reset','-q','--'] + files_to_unstage - elseif getline(lnum) =~# '^.\=\tdeleted:' - let cmd = ['rm','--',filename] - elseif getline(lnum) =~# '^.\=\tmodified:' - let cmd = ['add','--',filename] - else - let cmd = ['add','-A','--',filename] - endif - if !exists('first_filename') - let first_filename = filename - endif - let output .= call(repo.git_chomp_in_tree,cmd,s:repo())."\n" - endfor - if exists('first_filename') - call s:StageReloadSeek(first_filename,a:lnum1,a:lnum2) - endif - echo s:sub(s:gsub(output,'\n+','\n'),'\n$','') - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry - return 'checktime' -endfunction - -function! s:StagePatch(lnum1,lnum2) abort - let add = [] - let reset = [] - - for lnum in range(a:lnum1,a:lnum2) - let [filename, section] = s:stage_info(lnum) - if getline('.') =~# ':$' && section ==# 'staged' - return 'Git reset --patch' - elseif getline('.') =~# ':$' && section ==# 'unstaged' - return 'Git add --patch' - elseif getline('.') =~# ':$' && section ==# 'untracked' - return 'Git add -N .' - elseif filename ==# '' - continue - endif - if !exists('first_filename') - let first_filename = filename - endif - execute lnum - if filename =~ ' -> ' - let reset += [split(filename,' -> ')[1]] - elseif section ==# 'staged' - let reset += [filename] - elseif getline(lnum) !~# '^.\=\tdeleted:' - let add += [filename] - endif - endfor - try - if !empty(add) - execute "Git add --patch -- ".join(map(add,'s:shellesc(v:val)')) - endif - if !empty(reset) - execute "Git reset --patch -- ".join(map(reset,'s:shellesc(v:val)')) - endif - if exists('first_filename') - silent! edit! - 1 - redraw - call search('^.\=\t\%([[:alpha:] ]\+: *\)\=\V'.first_filename.'\%( ([^()[:digit:]]\+)\)\=\$','W') - endif - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry - return 'checktime' -endfunction - -" Section: Gcommit - -call s:command("-nargs=? -complete=customlist,s:CommitComplete Gcommit :execute s:Commit('<mods>', <q-args>)") - -function! s:Commit(mods, args, ...) abort - let mods = s:gsub(a:mods ==# '<mods>' ? '' : a:mods, '<tab>', '-tab') - let repo = a:0 ? a:1 : s:repo() - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let dir = getcwd() - let msgfile = repo.dir('COMMIT_EDITMSG') - let outfile = tempname() - let errorfile = tempname() - try - try - execute cd s:fnameescape(repo.tree()) - if s:winshell() - let command = '' - let old_editor = $GIT_EDITOR - let $GIT_EDITOR = 'false' - else - let command = 'env GIT_EDITOR=false ' - endif - let command .= repo.git_command('commit').' '.a:args - if &shell =~# 'csh' - noautocmd silent execute '!('.command.' > '.outfile.') >& '.errorfile - elseif a:args =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>' - noautocmd execute '!'.command.' 2> '.errorfile - else - noautocmd silent execute '!'.command.' > '.outfile.' 2> '.errorfile - endif - let error = v:shell_error - finally - execute cd s:fnameescape(dir) - endtry - if !has('gui_running') - redraw! - endif - if !error - if filereadable(outfile) - for line in readfile(outfile) - echo line - endfor - endif - return '' - else - let errors = readfile(errorfile) - let error = get(errors,-2,get(errors,-1,'!')) - if error =~# 'false''\=\.$' - let args = a:args - let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[esp]|--edit|--interactive|--patch|--signoff)%($| )','') - let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-c|--reedit-message|--reuse-message|-F|--file|-m|--message)%(\s+|\=)%(''[^'']*''|"%(\\.|[^"])*"|\\.|\S)*','') - let args = s:gsub(args,'%(^| )@<=[%#]%(:\w)*','\=expand(submatch(0))') - let args = s:sub(args, '\ze -- |$', ' --no-edit --no-interactive --no-signoff') - let args = '-F '.s:shellesc(msgfile).' '.args - if args !~# '\%(^\| \)--cleanup\>' - let args = '--cleanup=strip '.args - endif - if bufname('%') == '' && line('$') == 1 && getline(1) == '' && !&mod - execute mods 'keepalt edit' s:fnameescape(msgfile) - elseif a:args =~# '\%(^\| \)-\w*v' || mods =~# '\<tab\>' - execute mods 'keepalt -tabedit' s:fnameescape(msgfile) - elseif s:buffer().type() ==# 'index' - execute mods 'keepalt edit' s:fnameescape(msgfile) - execute (search('^#','n')+1).'wincmd+' - setlocal nopreviewwindow - else - execute mods 'keepalt split' s:fnameescape(msgfile) - endif - let b:fugitive_commit_arguments = args - setlocal bufhidden=wipe filetype=gitcommit - return '1' - elseif error ==# '!' - return 'Gstatus' - else - call s:throw(empty(error)?join(errors, ' '):error) - endif - endif - catch /^fugitive:/ - return 'echoerr v:errmsg' - finally - if exists('old_editor') - let $GIT_EDITOR = old_editor - endif - call delete(outfile) - call delete(errorfile) - call fugitive#ReloadStatus() - endtry -endfunction - -function! s:CommitComplete(A,L,P) abort - if a:A =~ '^-' || type(a:A) == type(0) " a:A is 0 on :Gcommit -<Tab> - let args = ['-C', '-F', '-a', '-c', '-e', '-i', '-m', '-n', '-o', '-q', '-s', '-t', '-u', '-v', '--all', '--allow-empty', '--amend', '--author=', '--cleanup=', '--dry-run', '--edit', '--file=', '--fixup=', '--include', '--interactive', '--message=', '--no-verify', '--only', '--quiet', '--reedit-message=', '--reuse-message=', '--signoff', '--squash=', '--template=', '--untracked-files', '--verbose'] - return filter(args,'v:val[0 : strlen(a:A)-1] ==# a:A') - else - return s:repo().superglob(a:A) - endif -endfunction - -function! s:FinishCommit() abort - let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments') - if !empty(args) - call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','') - return s:Commit('', args, s:repo(getbufvar(+expand('<abuf>'),'git_dir'))) - endif - return '' -endfunction - -" Section: Gmerge, Gpull - -call s:command("-nargs=? -bang -complete=custom,s:RevisionComplete Gmerge " . - \ "execute s:Merge('merge', <bang>0, <q-args>)") -call s:command("-nargs=? -bang -complete=custom,s:RevisionComplete Grebase " . - \ "execute s:Merge('rebase', <bang>0, <q-args>)") -call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpull " . - \ "execute s:Merge('pull --progress', <bang>0, <q-args>)") - -function! s:RevisionComplete(A, L, P) abort - return s:repo().git_chomp('rev-parse', '--symbolic', '--branches', '--tags', '--remotes') - \ . "\nHEAD\nFETCH_HEAD\nORIG_HEAD" -endfunction - -function! s:RemoteComplete(A, L, P) abort - let remote = matchstr(a:L, ' \zs\S\+\ze ') - if !empty(remote) - let matches = split(s:repo().git_chomp('ls-remote', remote), "\n") - call filter(matches, 'v:val =~# "\t" && v:val !~# "{"') - call map(matches, 's:sub(v:val, "^.*\t%(refs/%(heads/|tags/)=)=", "")') - else - let matches = split(s:repo().git_chomp('remote'), "\n") - endif - return join(matches, "\n") -endfunction - -function! fugitive#cwindow() abort - if &buftype == 'quickfix' - cwindow - else - botright cwindow - if &buftype == 'quickfix' - wincmd p - endif - endif -endfunction - -let s:common_efm = '' - \ . '%+Egit:%.%#,' - \ . '%+Eusage:%.%#,' - \ . '%+Eerror:%.%#,' - \ . '%+Efatal:%.%#,' - \ . '%-G%.%#%\e[K%.%#,' - \ . '%-G%.%#%\r%.%\+' - -function! s:Merge(cmd, bang, args) abort - if a:cmd =~# '^rebase' && ' '.a:args =~# ' -i\| --interactive\| --edit-todo' - return 'echoerr "git rebase --interactive not supported"' - endif - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let cwd = getcwd() - let [mp, efm] = [&l:mp, &l:efm] - let had_merge_msg = filereadable(s:repo().dir('MERGE_MSG')) - try - let &l:errorformat = '' - \ . '%-Gerror:%.%#false''.,' - \ . '%-G%.%# ''git commit'' %.%#,' - \ . '%+Emerge:%.%#,' - \ . s:common_efm . ',' - \ . '%+ECannot %.%#: You have unstaged changes.,' - \ . '%+ECannot %.%#: Your index contains uncommitted changes.,' - \ . '%+EThere is no tracking information for the current branch.,' - \ . '%+EYou are not currently on a branch. Please specify which,' - \ . 'CONFLICT (%m): %f deleted in %.%#,' - \ . 'CONFLICT (%m): Merge conflict in %f,' - \ . 'CONFLICT (%m): Rename \"%f\"->%.%#,' - \ . 'CONFLICT (%m): Rename %.%#->%f %.%#,' - \ . 'CONFLICT (%m): There is a directory with name %f in %.%#,' - \ . '%+ECONFLICT %.%#,' - \ . '%+EKONFLIKT %.%#,' - \ . '%+ECONFLIT %.%#,' - \ . "%+EXUNG \u0110\u1ed8T %.%#," - \ . "%+E\u51b2\u7a81 %.%#," - \ . 'U%\t%f' - if a:cmd =~# '^merge' && empty(a:args) && - \ (had_merge_msg || isdirectory(s:repo().dir('rebase-apply')) || - \ !empty(s:repo().git_chomp('diff-files', '--diff-filter=U'))) - let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U' - else - let &l:makeprg = s:sub(s:git_command() . ' ' . a:cmd . - \ (a:args =~# ' \%(--no-edit\|--abort\|-m\)\>' || a:cmd =~# '^rebase' ? '' : ' --edit') . - \ ' ' . a:args, ' *$', '') - endif - if !empty($GIT_EDITOR) || has('win32') - let old_editor = $GIT_EDITOR - let $GIT_EDITOR = 'false' - else - let &l:makeprg = 'env GIT_EDITOR=false ' . &l:makeprg - endif - execute cd fnameescape(s:repo().tree()) - silent noautocmd make! - catch /^Vim\%((\a\+)\)\=:E211/ - let err = v:exception - finally - redraw! - let [&l:mp, &l:efm] = [mp, efm] - if exists('old_editor') - let $GIT_EDITOR = old_editor - endif - execute cd fnameescape(cwd) - endtry - call fugitive#ReloadStatus() - if empty(filter(getqflist(),'v:val.valid')) - if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG')) - cclose - return 'Gcommit --no-status -n -t '.s:shellesc(s:repo().dir('MERGE_MSG')) - endif - endif - let qflist = getqflist() - let found = 0 - for e in qflist - if !empty(e.bufnr) - let found = 1 - let e.pattern = '^<<<<<<<' - endif - endfor - call fugitive#cwindow() - if found - call setqflist(qflist, 'r') - if !a:bang - return 'cfirst' - endif - endif - return exists('err') ? 'echoerr '.string(err) : '' -endfunction - -" Section: Ggrep, Glog - -if !exists('g:fugitive_summary_format') - let g:fugitive_summary_format = '%s' -endif - -call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Ggrep :execute s:Grep('grep',<bang>0,<q-args>)") -call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Glgrep :execute s:Grep('lgrep',<bang>0,<q-args>)") -call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Glog :call s:Log('grep<bang>',<line1>,<count>,<f-args>)") -call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Gllog :call s:Log('lgrep<bang>',<line1>,<count>,<f-args>)") - -function! s:Grep(cmd,bang,arg) abort - let grepprg = &grepprg - let grepformat = &grepformat - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let dir = getcwd() - try - execute cd s:fnameescape(s:repo().tree()) - let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n', '--no-color') - let &grepformat = '%f:%l:%m,%m %f match%ts,%f' - exe a:cmd.'! '.escape(matchstr(a:arg,'\v\C.{-}%($|[''" ]\@=\|)@='),'|') - let list = a:cmd =~# '^l' ? getloclist(0) : getqflist() - for entry in list - if bufname(entry.bufnr) =~ ':' - let entry.filename = s:repo().translate(bufname(entry.bufnr)) - unlet! entry.bufnr - let changed = 1 - elseif a:arg =~# '\%(^\| \)--cached\>' - let entry.filename = s:repo().translate(':0:'.bufname(entry.bufnr)) - unlet! entry.bufnr - let changed = 1 - endif - endfor - if a:cmd =~# '^l' && exists('changed') - call setloclist(0, list, 'r') - elseif exists('changed') - call setqflist(list, 'r') - endif - if !a:bang && !empty(list) - return (a:cmd =~# '^l' ? 'l' : 'c').'first'.matchstr(a:arg,'\v\C[''" ]\zs\|.*') - else - return matchstr(a:arg,'\v\C[''" ]\|\zs.*') - endif - finally - let &grepprg = grepprg - let &grepformat = grepformat - execute cd s:fnameescape(dir) - endtry -endfunction - -function! s:Log(cmd, line1, line2, ...) abort - let path = s:buffer().path('/') - if path =~# '^/\.git\%(/\|$\)' || index(a:000,'--') != -1 - let path = '' - endif - let cmd = ['--no-pager', 'log', '--no-color'] - let cmd += ['--pretty=format:fugitive://'.s:repo().dir().'//%H'.path.'::'.g:fugitive_summary_format] - if empty(filter(a:000[0 : index(a:000,'--')],'v:val !~# "^-"')) - if s:buffer().commit() =~# '\x\{40\}' - let cmd += [s:buffer().commit()] - elseif s:buffer().path() =~# '^\.git/refs/\|^\.git/.*HEAD$' - let cmd += [s:buffer().path()[5:-1]] - endif - end - let cmd += map(copy(a:000),'s:sub(v:val,"^\\%(%(:\\w)*)","\\=fnamemodify(s:buffer().path(),submatch(1))")') - if path =~# '/.' - if a:line2 - let cmd += ['-L', a:line1 . ',' . a:line2 . ':' . path[1:-1]] - else - let cmd += ['--', path[1:-1]] - endif - endif - let grepformat = &grepformat - let grepprg = &grepprg - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let dir = getcwd() - try - execute cd s:fnameescape(s:repo().tree()) - let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#') - let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#' - exe a:cmd - finally - let &grepformat = grepformat - let &grepprg = grepprg - execute cd s:fnameescape(dir) - endtry -endfunction - -" Section: Gedit, Gpedit, Gsplit, Gvsplit, Gtabedit, Gread - -function! s:UsableWin(nr) abort - return a:nr && !getwinvar(a:nr, '&previewwindow') && - \ index(['nofile','help','quickfix'], getbufvar(winbufnr(a:nr), '&buftype')) < 0 -endfunction - -function! s:Edit(cmd, bang, mods, ...) abort - let mods = a:mods ==# '<mods>' ? '' : a:mods - let buffer = s:buffer() - if a:cmd !~# 'read' - if &previewwindow && getbufvar('','fugitive_type') ==# 'index' - let winnrs = filter([winnr('#')] + range(1, winnr('$')), 's:UsableWin(v:val)') - if len(winnrs) - exe winnrs[0].'wincmd w' - elseif winnr('$') == 1 - let tabs = (&go =~# 'e' || !has('gui_running')) && &stal && (tabpagenr('$') >= &stal) - execute 'rightbelow' (&lines - &previewheight - &cmdheight - tabs - 1 - !!&laststatus).'new' - else - rightbelow new - endif - if &diff - let mywinnr = winnr() - for winnr in range(winnr('$'),1,-1) - if winnr != mywinnr && getwinvar(winnr,'&diff') - execute winnr.'wincmd w' - close - if winnr('$') > 1 - wincmd p - endif - endif - endfor - diffoff! - endif - endif - endif - - if a:bang - let arglist = map(copy(a:000), 's:gsub(v:val, ''\\@<!%(\\\\)*\zs[%#]'', ''\=s:buffer().expand(submatch(0))'')') - let args = join(arglist, ' ') - if a:cmd =~# 'read' - let git = buffer.repo().git_command() - let last = line('$') - silent call s:ExecuteInTree(mods.' '.(a:cmd ==# 'read' ? 'keepalt $read' : a:cmd).'!'.git.' --no-pager '.args) - if a:cmd ==# 'read' - silent execute '1,'.last.'delete_' - endif - call fugitive#ReloadStatus() - diffupdate - return 'redraw|echo '.string(':!'.git.' '.args) - else - let temp = resolve(tempname()) - if has('win32') - let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t') - endif - let s:temp_files[s:cpath(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist } - silent execute mods a:cmd temp - if a:cmd =~# 'pedit' - wincmd P - endif - let echo = s:Edit('read', 1, mods, args) - silent write! - setlocal buftype=nowrite nomodified filetype=git foldmarker=<<<<<<<,>>>>>>> - if getline(1) !~# '^diff ' - setlocal readonly nomodifiable - endif - if a:cmd =~# 'pedit' - wincmd p - endif - return echo - endif - return '' - endif - - if a:0 && a:1 == '' - return '' - elseif a:0 - let file = buffer.expand(join(a:000, ' ')) - elseif expand('%') ==# '' - let file = ':' - elseif buffer.commit() ==# '' && buffer.path('/') !~# '^/.git\>' - let file = buffer.path(':') - else - let file = buffer.path('/') - endif - try - let file = buffer.repo().translate(file) - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry - if file !~# '^fugitive:' - let file = s:sub(file, '/$', '') - endif - if a:cmd ==# 'read' - return 'silent %delete_|'.mods.' read '.s:fnameescape(file).'|silent 1delete_|diffupdate|'.line('.') - else - return mods.' '.a:cmd.' '.s:fnameescape(file) - endif -endfunction - -function! s:EditComplete(A,L,P) abort - return map(s:repo().superglob(a:A), 'fnameescape(v:val)') -endfunction - -function! s:EditRunComplete(A,L,P) abort - if a:L =~# '^\w\+!' - return s:GitComplete(a:A,a:L,a:P) - else - return s:repo().superglob(a:A) - endif -endfunction - -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,'<mods>',<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,'<mods>',<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,'<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,'<mods>',<f-args>)") - -" Section: Gwrite, Gwq - -call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwrite :execute s:Write(<bang>0,<f-args>)") -call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gw :execute s:Write(<bang>0,<f-args>)") -call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwq :execute s:Wq(<bang>0,<f-args>)") - -function! s:Write(force,...) abort - if exists('b:fugitive_commit_arguments') - return 'write|bdelete' - elseif expand('%:t') == 'COMMIT_EDITMSG' && $GIT_INDEX_FILE != '' - return 'wq' - elseif s:buffer().type() == 'index' - return 'Gcommit' - elseif s:buffer().path() ==# '' && getline(4) =~# '^+++ ' - let filename = getline(4)[6:-1] - setlocal buftype= - silent write - setlocal buftype=nowrite - if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# s:repo().rev_parse(':0:'.filename)[0:6] - let err = s:repo().git_chomp('apply','--cached','--reverse',s:buffer().spec()) - else - let err = s:repo().git_chomp('apply','--cached',s:buffer().spec()) - endif - if err !=# '' - let v:errmsg = split(err,"\n")[0] - return 'echoerr v:errmsg' - elseif a:force - return 'bdelete' - else - return 'Gedit '.fnameescape(filename) - endif - endif - let mytab = tabpagenr() - let mybufnr = bufnr('') - let path = a:0 ? join(a:000, ' ') : s:buffer().path() - if empty(path) - return 'echoerr '.string('fugitive: cannot determine file path') - endif - if path =~# '^:\d\>' - return 'write'.(a:force ? '! ' : ' ').s:fnameescape(s:repo().translate(s:buffer().expand(path))) - endif - let always_permitted = (s:buffer().path() ==# path && s:buffer().commit() =~# '^0\=$') - if !always_permitted && !a:force && s:repo().git_chomp_in_tree('diff','--name-status','HEAD','--',path) . s:repo().git_chomp_in_tree('ls-files','--others','--',path) !=# '' - let v:errmsg = 'fugitive: file has uncommitted changes (use ! to override)' - return 'echoerr v:errmsg' - endif - let file = s:repo().translate(path) - let treebufnr = 0 - for nr in range(1,bufnr('$')) - if fnamemodify(bufname(nr),':p') ==# file - let treebufnr = nr - endif - endfor - - if treebufnr > 0 && treebufnr != bufnr('') - let temp = tempname() - silent execute '%write '.temp - for tab in [mytab] + range(1,tabpagenr('$')) - for winnr in range(1,tabpagewinnr(tab,'$')) - if tabpagebuflist(tab)[winnr-1] == treebufnr - execute 'tabnext '.tab - if winnr != winnr() - execute winnr.'wincmd w' - let restorewinnr = 1 - endif - try - let lnum = line('.') - let last = line('$') - silent execute '$read '.temp - silent execute '1,'.last.'delete_' - silent write! - silent execute lnum - let did = 1 - finally - if exists('restorewinnr') - wincmd p - endif - execute 'tabnext '.mytab - endtry - endif - endfor - endfor - if !exists('did') - call writefile(readfile(temp,'b'),file,'b') - endif - else - execute 'write! '.s:fnameescape(s:repo().translate(path)) - endif - - if a:force - let error = s:repo().git_chomp_in_tree('add', '--force', '--', path) - else - let error = s:repo().git_chomp_in_tree('add', '--', path) - endif - if v:shell_error - let v:errmsg = 'fugitive: '.error - return 'echoerr v:errmsg' - endif - if s:buffer().path() ==# path && s:buffer().commit() =~# '^\d$' - set nomodified - endif - - let one = s:repo().translate(':1:'.path) - let two = s:repo().translate(':2:'.path) - let three = s:repo().translate(':3:'.path) - for nr in range(1,bufnr('$')) - let name = fnamemodify(bufname(nr), ':p') - if bufloaded(nr) && !getbufvar(nr,'&modified') && (name ==# one || name ==# two || name ==# three) - execute nr.'bdelete' - endif - endfor - - unlet! restorewinnr - let zero = s:repo().translate(':0:'.path) - silent execute 'doautocmd BufWritePost' s:fnameescape(zero) - for tab in range(1,tabpagenr('$')) - for winnr in range(1,tabpagewinnr(tab,'$')) - let bufnr = tabpagebuflist(tab)[winnr-1] - let bufname = fnamemodify(bufname(bufnr), ':p') - if bufname ==# zero && bufnr != mybufnr - execute 'tabnext '.tab - if winnr != winnr() - execute winnr.'wincmd w' - let restorewinnr = 1 - endif - try - let lnum = line('.') - let last = line('$') - silent execute '$read '.s:fnameescape(file) - silent execute '1,'.last.'delete_' - silent execute lnum - set nomodified - diffupdate - finally - if exists('restorewinnr') - wincmd p - endif - execute 'tabnext '.mytab - endtry - break - endif - endfor - endfor - call fugitive#ReloadStatus() - return 'checktime' -endfunction - -function! s:Wq(force,...) abort - let bang = a:force ? '!' : '' - if exists('b:fugitive_commit_arguments') - return 'wq'.bang - endif - let result = call(s:function('s:Write'),[a:force]+a:000) - if result =~# '^\%(write\|wq\|echoerr\)' - return s:sub(result,'^write','wq') - else - return result.'|quit'.bang - endif -endfunction - -augroup fugitive_commit - autocmd! - autocmd VimLeavePre,BufDelete COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE') -augroup END - -" Section: Gpush, Gfetch - -call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpush execute s:Dispatch('<bang>', 'push '.<q-args>)") -call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gfetch execute s:Dispatch('<bang>', 'fetch '.<q-args>)") - -function! s:Dispatch(bang, args) - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let cwd = getcwd() - let [mp, efm, cc] = [&l:mp, &l:efm, get(b:, 'current_compiler', '')] - try - let b:current_compiler = 'git' - let &l:errorformat = s:common_efm - let &l:makeprg = substitute(s:git_command() . ' ' . a:args, '\s\+$', '', '') - execute cd fnameescape(s:repo().tree()) - if exists(':Make') == 2 - noautocmd Make - else - silent noautocmd make! - redraw! - return 'call fugitive#cwindow()' - endif - return '' - finally - let [&l:mp, &l:efm, b:current_compiler] = [mp, efm, cc] - if empty(cc) | unlet! b:current_compiler | endif - execute cd fnameescape(cwd) - endtry -endfunction - -" Section: Gdiff - -call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gdiff :execute s:Diff('',<bang>0,<f-args>)") -call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff('keepalt vert ',<bang>0,<f-args>)") -call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff('keepalt ',<bang>0,<f-args>)") - -augroup fugitive_diff - autocmd! - autocmd BufWinLeave * - \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 2 | - \ call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) | - \ endif - autocmd BufWinEnter * - \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 1 | - \ call s:diffoff() | - \ endif -augroup END - -function! s:can_diffoff(buf) abort - return getwinvar(bufwinnr(a:buf), '&diff') && - \ !empty(getbufvar(a:buf, 'git_dir')) && - \ !empty(getwinvar(bufwinnr(a:buf), 'fugitive_diff_restore')) -endfunction - -function! fugitive#can_diffoff(buf) abort - return s:can_diffoff(a:buf) -endfunction - -function! s:diff_modifier(count) abort - let fdc = matchstr(&diffopt, 'foldcolumn:\zs\d\+') - if &diffopt =~# 'horizontal' && &diffopt !~# 'vertical' - return 'keepalt ' - elseif &diffopt =~# 'vertical' - return 'keepalt vert ' - elseif winwidth(0) <= a:count * ((&tw ? &tw : 80) + (empty(fdc) ? 2 : fdc)) - return 'keepalt ' - else - return 'keepalt vert ' - endif -endfunction - -function! s:diff_window_count() abort - let c = 0 - for nr in range(1,winnr('$')) - let c += getwinvar(nr,'&diff') - endfor - return c -endfunction - -function! s:diff_restore() abort - let restore = 'setlocal nodiff noscrollbind' - \ . ' scrollopt=' . &l:scrollopt - \ . (&l:wrap ? ' wrap' : ' nowrap') - \ . ' foldlevel=999' - \ . ' foldmethod=' . &l:foldmethod - \ . ' foldcolumn=' . &l:foldcolumn - \ . ' foldlevel=' . &l:foldlevel - \ . (&l:foldenable ? ' foldenable' : ' nofoldenable') - if has('cursorbind') - let restore .= (&l:cursorbind ? ' ' : ' no') . 'cursorbind' - endif - return restore -endfunction - -function! s:diffthis() abort - if !&diff - let w:fugitive_diff_restore = s:diff_restore() - diffthis - endif -endfunction - -function! s:diffoff() abort - if exists('w:fugitive_diff_restore') - execute w:fugitive_diff_restore - unlet w:fugitive_diff_restore - else - diffoff - endif -endfunction - -function! s:diffoff_all(dir) abort - let curwin = winnr() - for nr in range(1,winnr('$')) - if getwinvar(nr,'&diff') - if nr != winnr() - execute nr.'wincmd w' - let restorewinnr = 1 - endif - if exists('b:git_dir') && b:git_dir ==# a:dir - call s:diffoff() - endif - endif - endfor - execute curwin.'wincmd w' -endfunction - -function! s:buffer_compare_age(commit) dict abort - let scores = {':0': 1, ':1': 2, ':2': 3, ':': 4, ':3': 5} - let my_score = get(scores,':'.self.commit(),0) - let their_score = get(scores,':'.a:commit,0) - if my_score || their_score - return my_score < their_score ? -1 : my_score != their_score - elseif self.commit() ==# a:commit - return 0 - endif - let base = self.repo().git_chomp('merge-base',self.commit(),a:commit) - if base ==# self.commit() - return -1 - elseif base ==# a:commit - return 1 - endif - let my_time = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',self.commit()) - let their_time = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',a:commit) - return my_time < their_time ? -1 : my_time != their_time -endfunction - -call s:add_methods('buffer',['compare_age']) - -function! s:Diff(vert,keepfocus,...) abort - let args = copy(a:000) - let post = '' - if get(args, 0) =~# '^+' - let post = remove(args, 0)[1:-1] - endif - let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert - if exists(':DiffGitCached') - return 'DiffGitCached' - elseif (empty(args) || args[0] == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# '' - let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert - let nr = bufnr('') - execute 'leftabove '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand(':2'))) - execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>' - let nr2 = bufnr('') - call s:diffthis() - wincmd p - execute 'rightbelow '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand(':3'))) - execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>' - let nr3 = bufnr('') - call s:diffthis() - wincmd p - call s:diffthis() - execute 'nnoremap <buffer> <silent> d2o :diffget '.nr2.'<Bar>diffupdate<CR>' - execute 'nnoremap <buffer> <silent> d3o :diffget '.nr3.'<Bar>diffupdate<CR>' - return post - elseif len(args) - let arg = join(args, ' ') - if arg ==# '' - return post - elseif arg ==# '/' - let file = s:buffer().path('/') - elseif arg ==# ':' - let file = s:buffer().path(':0:') - elseif arg =~# '^:/.' - try - let file = s:repo().rev_parse(arg).s:buffer().path(':') - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry - else - let file = s:buffer().expand(arg) - endif - if file !~# ':' && file !~# '^/' && s:repo().git_chomp('cat-file','-t',file) =~# '^\%(tag\|commit\)$' - let file = file.s:buffer().path(':') - endif - else - let file = s:buffer().path(s:buffer().commit() == '' ? ':0:' : '/') - endif - try - let spec = s:repo().translate(file) - let commit = matchstr(spec,'\C[^:/]//\zs\x\+') - let restore = s:diff_restore() - if exists('+cursorbind') - setlocal cursorbind - endif - let w:fugitive_diff_restore = restore - if s:buffer().compare_age(commit) < 0 - execute 'rightbelow '.vert.'diffsplit '.s:fnameescape(spec) - else - execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec) - endif - let &l:readonly = &l:readonly - redraw - let w:fugitive_diff_restore = restore - let winnr = winnr() - if getwinvar('#', '&diff') - wincmd p - if !a:keepfocus - call feedkeys(winnr."\<C-W>w", 'n') - endif - endif - return post - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry -endfunction - -" Section: Gmove, Gremove - -function! s:Move(force, rename, destination) abort - if a:destination =~# '^/' - let destination = a:destination[1:-1] - elseif a:rename - let destination = fnamemodify(s:buffer().path(), ':h') . '/' . a:destination - else - let destination = s:shellslash(fnamemodify(s:sub(a:destination,'[%#]%(:\w)*','\=expand(submatch(0))'),':p')) - if destination[0:strlen(s:repo().tree())] ==# s:repo().tree('') - let destination = destination[strlen(s:repo().tree('')):-1] - endif - endif - if isdirectory(s:buffer().spec()) - " Work around Vim parser idiosyncrasy - let discarded = s:buffer().setvar('&swapfile',0) - endif - let message = call(s:repo().git_chomp_in_tree,['mv']+(a:force ? ['-f'] : [])+['--', s:buffer().path(), destination], s:repo()) - if v:shell_error - let v:errmsg = 'fugitive: '.message - return 'echoerr v:errmsg' - endif - let destination = s:repo().tree(destination) - if isdirectory(destination) - let destination = fnamemodify(s:sub(destination,'/$','').'/'.expand('%:t'),':.') - endif - call fugitive#ReloadStatus() - if empty(s:buffer().commit()) - if isdirectory(destination) - return 'keepalt edit '.s:fnameescape(destination) - else - return 'keepalt saveas! '.s:fnameescape(destination) - endif - else - return 'file '.s:fnameescape(s:repo().translate(':0:'.destination)) - endif -endfunction - -function! s:MoveComplete(A,L,P) abort - if a:A =~# '^/' - return s:repo().superglob(a:A) - else - let matches = split(glob(a:A.'*'),"\n") - call map(matches,'v:val !~# "/$" && isdirectory(v:val) ? v:val."/" : v:val') - return matches - endif -endfunction - -function! s:RenameComplete(A,L,P) abort - if a:A =~# '^/' - return s:repo().superglob(a:A) - else - let pre = '/'. fnamemodify(s:buffer().path(), ':h') . '/' - return map(s:repo().superglob(pre.a:A), 'strpart(v:val, len(pre))') - endif -endfunction - -function! s:Remove(after, force) abort - if s:buffer().commit() ==# '' - let cmd = ['rm'] - elseif s:buffer().commit() ==# '0' - let cmd = ['rm','--cached'] - else - let v:errmsg = 'fugitive: rm not supported here' - return 'echoerr v:errmsg' - endif - if a:force - let cmd += ['--force'] - endif - let message = call(s:repo().git_chomp_in_tree,cmd+['--',s:buffer().path()],s:repo()) - if v:shell_error - let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)') - return 'echoerr '.string(v:errmsg) - else - call fugitive#ReloadStatus() - return a:after . (a:force ? '!' : '') - endif -endfunction - -augroup fugitive_remove - autocmd! - autocmd User Fugitive if s:buffer().commit() =~# '^0\=$' | - \ exe "command! -buffer -bar -bang -nargs=1 -complete=customlist,s:MoveComplete Gmove :execute s:Move(<bang>0,0,<q-args>)" | - \ exe "command! -buffer -bar -bang -nargs=1 -complete=customlist,s:RenameComplete Grename :execute s:Move(<bang>0,1,<q-args>)" | - \ exe "command! -buffer -bar -bang Gremove :execute s:Remove('edit',<bang>0)" | - \ exe "command! -buffer -bar -bang Gdelete :execute s:Remove('bdelete',<bang>0)" | - \ endif -augroup END - -" Section: Gblame - -augroup fugitive_blame - autocmd! - autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame - autocmd FileType fugitiveblame setlocal nomodeline | if exists('b:git_dir') | let &l:keywordprg = s:repo().keywordprg() | endif - autocmd Syntax fugitiveblame call s:BlameSyntax() - autocmd User Fugitive if s:buffer().type('file', 'blob') | exe "command! -buffer -bar -bang -range=0 -nargs=* Gblame :execute s:Blame(<bang>0,<line1>,<line2>,<count>,[<f-args>])" | endif - autocmd ColorScheme,GUIEnter * call s:RehighlightBlame() - autocmd BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave') -augroup END - -function! s:linechars(pattern) abort - let chars = strlen(s:gsub(matchstr(getline('.'), a:pattern), '.', '.')) - if exists('*synconcealed') && &conceallevel > 1 - for col in range(1, chars) - let chars -= synconcealed(line('.'), col)[0] - endfor - endif - return chars -endfunction - -function! s:Blame(bang,line1,line2,count,args) abort - if exists('b:fugitive_blamed_bufnr') - return 'bdelete' - endif - try - if s:buffer().path() == '' - call s:throw('file or blob required') - endif - if filter(copy(a:args),'v:val !~# "^\\%(--root\|--show-name\\|-\\=\\%([ltfnsew]\\|[MC]\\d*\\)\\+\\)$"') != [] - call s:throw('unsupported option') - endif - call map(a:args,'s:sub(v:val,"^\\ze[^-]","-")') - let cmd = ['--no-pager', 'blame', '--show-number'] + a:args - if s:buffer().commit() =~# '\D\|..' - let cmd += [s:buffer().commit()] - else - let cmd += ['--contents', '-'] - endif - let cmd += ['--', s:buffer().path()] - let basecmd = escape(call(s:repo().git_command,cmd,s:repo()),'!%#') - try - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - if !s:repo().bare() - let dir = getcwd() - execute cd s:fnameescape(s:repo().tree()) - endif - if a:count - execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g') - else - let error = resolve(tempname()) - let temp = error.'.fugitiveblame' - if &shell =~# 'csh' - silent! execute '%write !('.basecmd.' > '.temp.') >& '.error - else - silent! execute '%write !'.basecmd.' > '.temp.' 2> '.error - endif - if exists('l:dir') - execute cd s:fnameescape(dir) - unlet dir - endif - if v:shell_error - call s:throw(join(readfile(error),"\n")) - endif - for winnr in range(winnr('$'),1,-1) - call setwinvar(winnr, '&scrollbind', 0) - if exists('+cursorbind') - call setwinvar(winnr, '&cursorbind', 0) - endif - if getbufvar(winbufnr(winnr), 'fugitive_blamed_bufnr') - execute winbufnr(winnr).'bdelete' - endif - endfor - let bufnr = bufnr('') - let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)' - if exists('+cursorbind') - let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&cursorbind",0)' - endif - if &l:wrap - let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&wrap",1)' - endif - if &l:foldenable - let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&foldenable",1)' - endif - setlocal scrollbind nowrap nofoldenable - if exists('+cursorbind') - setlocal cursorbind - endif - let top = line('w0') + &scrolloff - let current = line('.') - if has('win32') - let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t') - endif - let s:temp_files[s:cpath(temp)] = { 'dir': s:repo().dir(), 'args': cmd } - exe 'keepalt leftabove vsplit '.temp - let b:fugitive_blamed_bufnr = bufnr - let w:fugitive_leave = restore - let b:fugitive_blame_arguments = join(a:args,' ') - execute top - normal! zt - execute current - if exists('+cursorbind') - setlocal cursorbind - endif - setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable winfixwidth filetype=fugitiveblame - if exists('+concealcursor') - setlocal concealcursor=nc conceallevel=2 - endif - if exists('+relativenumber') - setlocal norelativenumber - endif - execute "vertical resize ".(s:linechars('.\{-\}\ze\s\+\d\+)')+1) - nnoremap <buffer> <silent> <F1> :help fugitive-:Gblame<CR> - nnoremap <buffer> <silent> g? :help fugitive-:Gblame<CR> - nnoremap <buffer> <silent> q :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete','^-1','','')<CR> - nnoremap <buffer> <silent> gq :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete<Bar>if expand("%:p") =~# "^fugitive:[\\/][\\/]"<Bar>Gedit<Bar>endif','^-1','','')<CR> - nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR> - nnoremap <buffer> <silent> - :<C-U>exe <SID>BlameJump('')<CR> - nnoremap <buffer> <silent> P :<C-U>exe <SID>BlameJump('^'.v:count1)<CR> - nnoremap <buffer> <silent> ~ :<C-U>exe <SID>BlameJump('~'.v:count1)<CR> - nnoremap <buffer> <silent> i :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR> - nnoremap <buffer> <silent> o :<C-U>exe <SID>BlameCommit((&splitbelow ? "botright" : "topleft")." split")<CR> - nnoremap <buffer> <silent> O :<C-U>exe <SID>BlameCommit("tabedit")<CR> - nnoremap <buffer> <silent> A :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze [0-9:/+-][0-9:/+ -]* \d\+)')+1+v:count)<CR> - nnoremap <buffer> <silent> C :<C-u>exe "vertical resize ".(<SID>linechars('^\S\+')+1+v:count)<CR> - nnoremap <buffer> <silent> D :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze\d\ze\s\+\d\+)')+1-v:count)<CR> - redraw - syncbind - endif - finally - if exists('l:dir') - execute cd s:fnameescape(dir) - endif - endtry - return '' - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry -endfunction - -function! s:BlameCommit(cmd) abort - let cmd = s:Edit(a:cmd, 0, '', matchstr(getline('.'),'\x\+')) - if cmd =~# '^echoerr' - return cmd - endif - let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]') - let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ') - if path ==# '' - let path = s:buffer(b:fugitive_blamed_bufnr).path() - endif - execute cmd - if search('^diff .* b/\M'.escape(path,'\').'$','W') - call search('^+++') - let head = line('.') - while search('^@@ \|^diff ') && getline('.') =~# '^@@ ' - let top = +matchstr(getline('.'),' +\zs\d\+') - let len = +matchstr(getline('.'),' +\d\+,\zs\d\+') - if lnum >= top && lnum <= top + len - let offset = lnum - top - if &scrolloff - + - normal! zt - else - normal! zt - + - endif - while offset > 0 && line('.') < line('$') - + - if getline('.') =~# '^[ +]' - let offset -= 1 - endif - endwhile - return 'normal! zv' - endif - endwhile - execute head - normal! zt - endif - return '' -endfunction - -function! s:BlameJump(suffix) abort - let commit = matchstr(getline('.'),'^\^\=\zs\x\+') - if commit =~# '^0\+$' - let commit = ':0' - endif - let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]') - let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ') - if path ==# '' - let path = s:buffer(b:fugitive_blamed_bufnr).path() - endif - let args = b:fugitive_blame_arguments - let offset = line('.') - line('w0') - let bufnr = bufnr('%') - let winnr = bufwinnr(b:fugitive_blamed_bufnr) - if winnr > 0 - exe winnr.'wincmd w' - endif - execute s:Edit('edit', 0, '', commit.a:suffix.':'.path) - execute lnum - if winnr > 0 - exe bufnr.'bdelete' - endif - if exists(':Gblame') - execute 'Gblame '.args - execute lnum - let delta = line('.') - line('w0') - offset - if delta > 0 - execute 'normal! '.delta."\<C-E>" - elseif delta < 0 - execute 'normal! '.(-delta)."\<C-Y>" - endif - syncbind - endif - return '' -endfunction - -let s:hash_colors = {} - -function! s:BlameSyntax() abort - let b:current_syntax = 'fugitiveblame' - let conceal = has('conceal') ? ' conceal' : '' - let arg = exists('b:fugitive_blame_arguments') ? b:fugitive_blame_arguments : '' - syn match FugitiveblameBoundary "^\^" - syn match FugitiveblameBlank "^\s\+\s\@=" nextgroup=FugitiveblameAnnotation,fugitiveblameOriginalFile,FugitiveblameOriginalLineNumber skipwhite - syn match FugitiveblameHash "\%(^\^\=\)\@<=\<\x\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite - syn match FugitiveblameUncommitted "\%(^\^\=\)\@<=\<0\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite - syn region FugitiveblameAnnotation matchgroup=FugitiveblameDelimiter start="(" end="\%( \d\+\)\@<=)" contained keepend oneline - syn match FugitiveblameTime "[0-9:/+-][0-9:/+ -]*[0-9:/+-]\%( \+\d\+)\)\@=" contained containedin=FugitiveblameAnnotation - exec 'syn match FugitiveblameLineNumber " *\d\+)\@=" contained containedin=FugitiveblameAnnotation'.conceal - exec 'syn match FugitiveblameOriginalFile " \%(\f\+\D\@<=\|\D\@=\f\+\)\%(\%(\s\+\d\+\)\=\s\%((\|\s*\d\+)\)\)\@=" contained nextgroup=FugitiveblameOriginalLineNumber,FugitiveblameAnnotation skipwhite'.(arg =~# 'f' ? '' : conceal) - exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s(\)\@=" contained nextgroup=FugitiveblameAnnotation skipwhite'.(arg =~# 'n' ? '' : conceal) - exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s\+\d\+)\)\@=" contained nextgroup=FugitiveblameShort skipwhite'.(arg =~# 'n' ? '' : conceal) - syn match FugitiveblameShort " \d\+)" contained contains=FugitiveblameLineNumber - syn match FugitiveblameNotCommittedYet "(\@<=Not Committed Yet\>" contained containedin=FugitiveblameAnnotation - hi def link FugitiveblameBoundary Keyword - hi def link FugitiveblameHash Identifier - hi def link FugitiveblameUncommitted Ignore - hi def link FugitiveblameTime PreProc - hi def link FugitiveblameLineNumber Number - hi def link FugitiveblameOriginalFile String - hi def link FugitiveblameOriginalLineNumber Float - hi def link FugitiveblameShort FugitiveblameDelimiter - hi def link FugitiveblameDelimiter Delimiter - hi def link FugitiveblameNotCommittedYet Comment - let seen = {} - for lnum in range(1, line('$')) - let hash = matchstr(getline(lnum), '^\^\=\zs\x\{6\}') - if hash ==# '' || hash ==# '000000' || has_key(seen, hash) - continue - endif - let seen[hash] = 1 - if &t_Co > 16 && get(g:, 'CSApprox_loaded') && !empty(findfile('autoload/csapprox/per_component.vim', escape(&rtp, ' '))) - \ && empty(get(s:hash_colors, hash)) - let [s, r, g, b; __] = map(matchlist(hash, '\(\x\x\)\(\x\x\)\(\x\x\)'), 'str2nr(v:val,16)') - let color = csapprox#per_component#Approximate(r, g, b) - if color == 16 && &background ==# 'dark' - let color = 8 - endif - let s:hash_colors[hash] = ' ctermfg='.color - else - let s:hash_colors[hash] = '' - endif - exe 'syn match FugitiveblameHash'.hash.' "\%(^\^\=\)\@<='.hash.'\x\{1,34\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite' - endfor - call s:RehighlightBlame() -endfunction - -function! s:RehighlightBlame() abort - for [hash, cterm] in items(s:hash_colors) - if !empty(cterm) || has('gui_running') || has('termguicolors') && &termguicolors - exe 'hi FugitiveblameHash'.hash.' guifg=#'.hash.get(s:hash_colors, hash, '') - else - exe 'hi link FugitiveblameHash'.hash.' Identifier' - endif - endfor -endfunction - -" Section: Gbrowse - -call s:command("-bar -bang -range=0 -nargs=* -complete=customlist,s:EditComplete Gbrowse :execute s:Browse(<bang>0,<line1>,<count>,<f-args>)") - -let s:redirects = {} - -function! s:Browse(bang,line1,count,...) abort - try - let validremote = '\.\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)\=' - if a:0 - let remote = matchstr(join(a:000, ' '),'@\zs\%('.validremote.'\)$') - let rev = substitute(join(a:000, ' '),'@\%('.validremote.'\)$','','') - else - let remote = '' - let rev = '' - endif - if rev ==# '' - let expanded = s:buffer().rev() - elseif rev ==# ':' - let expanded = s:buffer().path('/') - else - let expanded = s:buffer().expand(rev) - endif - let full = s:repo().translate(expanded) - let commit = '' - if full =~# '^fugitive://' - let commit = matchstr(full,'://.*//\zs\w\w\+') - let path = matchstr(full,'://.*//\w\+\zs/.*') - if commit =~ '..' - let type = s:repo().git_chomp('cat-file','-t',commit.s:sub(path,'^/',':')) - let branch = matchstr(expanded, '^[^:]*') - else - let type = 'blob' - endif - let path = path[1:-1] - elseif s:repo().bare() - let path = '.git/' . full[strlen(s:repo().dir())+1:-1] - let type = '' - else - let path = full[strlen(s:repo().tree())+1:-1] - if path =~# '^\.git/' - let type = '' - elseif isdirectory(full) - let type = 'tree' - else - let type = 'blob' - endif - endif - if type ==# 'tree' && !empty(path) - let path = s:sub(path, '/\=$', '/') - endif - if path =~# '^\.git/.*HEAD' && filereadable(s:repo().dir(path[5:-1])) - let body = readfile(s:repo().dir(path[5:-1]))[0] - if body =~# '^\x\{40\}$' - let commit = body - let type = 'commit' - let path = '' - elseif body =~# '^ref: refs/' - let path = '.git/' . matchstr(body,'ref: \zs.*') - endif - endif - - let merge = '' - if path =~# '^\.git/refs/remotes/.' - if empty(remote) - let remote = matchstr(path, '^\.git/refs/remotes/\zs[^/]\+') - let branch = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+') - else - let merge = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+') - let path = '.git/refs/heads/'.merge - endif - elseif path =~# '^\.git/refs/heads/.' - let branch = path[16:-1] - elseif !exists('branch') - let branch = s:repo().head() - endif - if !empty(branch) - let r = s:repo().git_chomp('config','branch.'.branch.'.remote') - let m = s:repo().git_chomp('config','branch.'.branch.'.merge')[11:-1] - if r ==# '.' && !empty(m) - let r2 = s:repo().git_chomp('config','branch.'.m.'.remote') - if r2 !~# '^\.\=$' - let r = r2 - let m = s:repo().git_chomp('config','branch.'.m.'.merge')[11:-1] - endif - endif - if empty(remote) - let remote = r - endif - if r ==# '.' || r ==# remote - let merge = m - if path =~# '^\.git/refs/heads/.' - let path = '.git/refs/heads/'.merge - endif - endif - endif - - if empty(commit) && path !~# '^\.git/' - if a:line1 && !a:count && !empty(merge) - let commit = merge - else - let commit = s:repo().rev_parse('HEAD') - endif - endif - - if empty(remote) - let remote = '.' - let remote_for_url = 'origin' - else - let remote_for_url = remote - endif - if fugitive#git_version() =~# '^[01]\.\|^2\.[0-6]\.' - let raw = s:repo().git_chomp('config','remote.'.remote_for_url.'.url') - else - let raw = s:repo().git_chomp('remote','get-url',remote_for_url) - endif - if raw ==# '' - let raw = remote - endif - - if raw =~# '^https\=://' && s:executable('curl') - if !has_key(s:redirects, raw) - let s:redirects[raw] = matchstr(system('curl -I ' . - \ s:shellesc(raw . '/info/refs?service=git-upload-pack')), - \ 'Location: \zs\S\+\ze/info/refs?') - endif - if len(s:redirects[raw]) - let raw = s:redirects[raw] - endif - endif - - for Handler in g:fugitive_browse_handlers - let url = call(Handler, [{ - \ 'repo': s:repo(), - \ 'remote': raw, - \ 'revision': 'No longer provided', - \ 'commit': commit, - \ 'path': path, - \ 'type': type, - \ 'line1': a:count > 0 ? a:line1 : 0, - \ 'line2': a:count > 0 ? a:count : 0}]) - if !empty(url) - break - endif - endfor - - if empty(url) && raw ==# '.' - call s:throw("Instaweb failed to start") - elseif empty(url) - call s:throw("'".remote."' is not a supported remote") - endif - - let url = s:gsub(url, '[ <>]', '\="%".printf("%02X",char2nr(submatch(0)))') - if a:bang - if has('clipboard') - let @+ = url - endif - return 'echomsg '.string(url) - elseif exists(':Browse') == 2 - return 'echomsg '.string(url).'|Browse '.url - else - if !exists('g:loaded_netrw') - runtime! autoload/netrw.vim - endif - if exists('*netrw#BrowseX') - return 'echomsg '.string(url).'|call netrw#BrowseX('.string(url).', 0)' - else - return 'echomsg '.string(url).'|call netrw#NetrwBrowseX('.string(url).', 0)' - endif - endif - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry -endfunction - -function! s:github_url(opts, ...) abort - if a:0 || type(a:opts) != type({}) - return '' - endif - let domain_pattern = 'github\.com' - let domains = exists('g:fugitive_github_domains') ? g:fugitive_github_domains : [] - for domain in domains - let domain_pattern .= '\|' . escape(split(domain, '://')[-1], '.') - endfor - let repo = matchstr(get(a:opts, 'remote'), '^\%(https\=://\|git://\|git@\)\=\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$') - if repo ==# '' - return '' - endif - call s:warn('Install rhubarb.vim for GitHub support') - return 'https://github.com/tpope/vim-rhubarb' -endfunction - -function! s:instaweb_url(opts) abort - if a:opts.remote !=# '.' - return '' - endif - let output = a:opts.repo.git_chomp('instaweb','-b','unknown') - if output =~# 'http://' - let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.dir(),':t') - else - return '' - endif - if a:opts.path =~# '^\.git/refs/.' - return root . ';a=shortlog;h=' . matchstr(a:opts.path,'^\.git/\zs.*') - elseif a:opts.path =~# '^\.git\>' - return root - endif - let url = root - if a:opts.commit =~# '^\x\{40\}$' - if a:opts.type ==# 'commit' - let url .= ';a=commit' - endif - let url .= ';h=' . a:opts.repo.rev_parse(a:opts.commit . (a:opts.path == '' ? '' : ':' . a:opts.path)) - else - if a:opts.type ==# 'blob' && empty(a:opts.commit) - let url .= ';h='.a:opts.repo.git_chomp('hash-object', '-w', a:opts.path) - else - try - let url .= ';h=' . a:opts.repo.rev_parse((a:opts.commit == '' ? 'HEAD' : ':' . a:opts.commit) . ':' . a:opts.path) - catch /^fugitive:/ - call s:throw('fugitive: cannot browse uncommitted file') - endtry - endif - let root .= ';hb=' . matchstr(a:opts.repo.head_ref(),'[^ ]\+$') - endif - if a:opts.path !=# '' - let url .= ';f=' . a:opts.path - endif - if get(a:opts, 'line1') - let url .= '#l' . a:opts.line1 - endif - return url -endfunction - -if !exists('g:fugitive_browse_handlers') - let g:fugitive_browse_handlers = [] -endif - -call extend(g:fugitive_browse_handlers, - \ [s:function('s:github_url'), s:function('s:instaweb_url')]) - -" Section: File access - -function! s:ReplaceCmd(cmd,...) abort - let fn = expand('%:p') - let tmp = tempname() - let prefix = '' - try - if a:0 && a:1 != '' - if s:winshell() - let old_index = $GIT_INDEX_FILE - let $GIT_INDEX_FILE = a:1 - else - let prefix = 'env GIT_INDEX_FILE='.s:shellesc(a:1).' ' - endif - endif - let redir = ' > '.tmp - if &shellpipe =~ '2>&1' - let redir .= ' 2>&1' - endif - if s:winshell() - let cmd_escape_char = &shellxquote == '(' ? '^' : '^^^' - call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').redir.'"') - elseif &shell =~# 'fish' - call system(' begin;'.prefix.a:cmd.redir.';end ') - else - call system(' ('.prefix.a:cmd.redir.') ') - endif - finally - if exists('old_index') - let $GIT_INDEX_FILE = old_index - endif - endtry - silent exe 'doau BufReadPre '.s:fnameescape(fn) - silent exe 'keepalt file '.tmp - try - silent noautocmd edit! - finally - try - silent exe 'keepalt file '.s:fnameescape(fn) - catch /^Vim\%((\a\+)\)\=:E302/ - endtry - call delete(tmp) - if fnamemodify(bufname('$'), ':p') ==# tmp - silent execute 'bwipeout '.bufnr('$') - endif - silent exe 'doau BufReadPost '.s:fnameescape(fn) - endtry -endfunction - -function! fugitive#BufReadStatus() abort - if !exists('b:fugitive_display_format') - let b:fugitive_display_format = filereadable(expand('%').'.lock') - endif - let b:fugitive_display_format = b:fugitive_display_format % 2 - let b:fugitive_type = 'index' - try - let b:git_dir = s:repo().dir() - setlocal noro ma nomodeline - if fnamemodify($GIT_INDEX_FILE !=# '' ? $GIT_INDEX_FILE : b:git_dir . '/index', ':p') ==# expand('%:p') - let index = '' - else - let index = expand('%:p') - endif - if b:fugitive_display_format - call s:ReplaceCmd(s:repo().git_command('ls-files','--stage'),index) - set ft=git nospell - else - let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' - let dir = getcwd() - if fugitive#git_version() =~# '^0\|^1\.[1-7]\.' - let cmd = s:repo().git_command('status') - else - let cmd = s:repo().git_command( - \ '-c', 'status.displayCommentPrefix=true', - \ '-c', 'color.status=false', - \ '-c', 'status.short=false', - \ 'status') - endif - try - execute cd s:fnameescape(s:repo().tree()) - call s:ReplaceCmd(cmd, index) - finally - execute cd s:fnameescape(dir) - endtry - set ft=gitcommit - set foldtext=fugitive#Foldtext() - endif - setlocal ro noma nomod noswapfile - if &bufhidden ==# '' - setlocal bufhidden=delete - endif - call s:JumpInit() - nunmap <buffer> P - nunmap <buffer> ~ - nnoremap <buffer> <silent> <C-N> :<C-U>execute <SID>StageNext(v:count1)<CR> - nnoremap <buffer> <silent> <C-P> :<C-U>execute <SID>StagePrevious(v:count1)<CR> - nnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line('.'),line('.')+v:count1-1)<CR> - xnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line("'<"),line("'>"))<CR> - nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += 1<Bar>exe <SID>BufReadIndex()<CR> - nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= 1<Bar>exe <SID>BufReadIndex()<CR> - nnoremap <buffer> <silent> C :<C-U>Gcommit<CR>:echohl WarningMsg<Bar>echo ':Gstatus C is deprecated in favor of cc'<Bar>echohl NONE<CR> - nnoremap <buffer> <silent> cA :<C-U>Gcommit --amend --reuse-message=HEAD<CR>:echohl WarningMsg<Bar>echo ':Gstatus cA is deprecated in favor of ce'<CR> - nnoremap <buffer> <silent> ca :<C-U>Gcommit --amend<CR> - nnoremap <buffer> <silent> cc :<C-U>Gcommit<CR> - nnoremap <buffer> <silent> ce :<C-U>Gcommit --amend --no-edit<CR> - nnoremap <buffer> <silent> cw :<C-U>Gcommit --amend --only<CR> - nnoremap <buffer> <silent> cva :<C-U>Gcommit -v --amend<CR> - nnoremap <buffer> <silent> cvc :<C-U>Gcommit -v<CR> - nnoremap <buffer> <silent> D :<C-U>execute <SID>StageDiff('Gdiff')<CR> - nnoremap <buffer> <silent> dd :<C-U>execute <SID>StageDiff('Gdiff')<CR> - nnoremap <buffer> <silent> dh :<C-U>execute <SID>StageDiff('Gsdiff')<CR> - nnoremap <buffer> <silent> ds :<C-U>execute <SID>StageDiff('Gsdiff')<CR> - nnoremap <buffer> <silent> dp :<C-U>execute <SID>StageDiffEdit()<CR> - nnoremap <buffer> <silent> dv :<C-U>execute <SID>StageDiff('Gvdiff')<CR> - nnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR> - xnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR> - nnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR> - xnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR> - nnoremap <buffer> <silent> q :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR> - nnoremap <buffer> <silent> r :<C-U>edit<CR> - nnoremap <buffer> <silent> R :<C-U>edit<CR> - nnoremap <buffer> <silent> U :<C-U>execute <SID>StageUndo()<CR> - nnoremap <buffer> <silent> g? :help fugitive-:Gstatus<CR> - nnoremap <buffer> <silent> <F1> :help fugitive-:Gstatus<CR> - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry -endfunction - -function! fugitive#FileRead() abort - try - let repo = s:repo(FugitiveExtractGitDir(expand('<amatch>'))) - let path = s:sub(s:sub(matchstr(expand('<amatch>'),'fugitive://.\{-\}//\zs.*'),'/',':'),'^\d:',':&') - let hash = repo.rev_parse(path) - if path =~ '^:' - let type = 'blob' - else - let type = repo.git_chomp('cat-file','-t',hash) - endif - " TODO: use count, if possible - return "read !".escape(repo.git_command('cat-file',type,hash),'%#\') - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry -endfunction - -function! fugitive#BufReadIndex() abort - try - let b:fugitive_type = 'blob' - let b:git_dir = s:repo().dir() - try - call s:ReplaceCmd(s:repo().git_command('cat-file','blob',s:buffer().sha1())) - finally - if &bufhidden ==# '' - setlocal bufhidden=delete - endif - setlocal noswapfile - endtry - return '' - catch /^fugitive: rev-parse/ - silent exe 'doau BufNewFile '.s:fnameescape(expand('%:p')) - return '' - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry -endfunction - -function! fugitive#BufWriteIndex() abort - let tmp = tempname() - try - let path = matchstr(expand('<amatch>'),'//\d/\zs.*') - let stage = matchstr(expand('<amatch>'),'//\zs\d') - silent execute 'write !'.s:repo().git_command('hash-object','-w','--stdin').' > '.tmp - let sha1 = readfile(tmp)[0] - let old_mode = matchstr(s:repo().git_chomp('ls-files','--stage',path),'^\d\+') - if old_mode == '' - let old_mode = executable(s:repo().tree(path)) ? '100755' : '100644' - endif - let info = old_mode.' '.sha1.' '.stage."\t".path - call writefile([info],tmp) - if s:winshell() - let error = system('type '.s:gsub(tmp,'/','\\').'|'.s:repo().git_command('update-index','--index-info')) - else - let error = system(s:repo().git_command('update-index','--index-info').' < '.tmp) - endif - if v:shell_error == 0 - setlocal nomodified - if exists('#BufWritePost') - execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p')) - endif - call fugitive#ReloadStatus() - return '' - else - return 'echoerr '.string('fugitive: '.error) - endif - finally - call delete(tmp) - endtry -endfunction - -function! fugitive#BufReadObject() abort - try - setlocal noro ma - let b:git_dir = s:repo().dir() - let hash = s:buffer().sha1() - if !exists("b:fugitive_type") - let b:fugitive_type = s:repo().git_chomp('cat-file','-t',hash) - endif - if b:fugitive_type !~# '^\%(tag\|commit\|tree\|blob\)$' - return "echoerr ".string("fugitive: unrecognized git type '".b:fugitive_type."'") - endif - if !exists('b:fugitive_display_format') && b:fugitive_type != 'blob' - let b:fugitive_display_format = +getbufvar('#','fugitive_display_format') - endif - - if b:fugitive_type !=# 'blob' - setlocal nomodeline - endif - - let pos = getpos('.') - silent keepjumps %delete_ - setlocal endofline - - try - if b:fugitive_type ==# 'tree' - let b:fugitive_display_format = b:fugitive_display_format % 2 - if b:fugitive_display_format - call s:ReplaceCmd(s:repo().git_command('ls-tree',hash)) - else - call s:ReplaceCmd(s:repo().git_command('show','--no-color',hash)) - endif - elseif b:fugitive_type ==# 'tag' - let b:fugitive_display_format = b:fugitive_display_format % 2 - if b:fugitive_display_format - call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash)) - else - call s:ReplaceCmd(s:repo().git_command('cat-file','-p',hash)) - endif - elseif b:fugitive_type ==# 'commit' - let b:fugitive_display_format = b:fugitive_display_format % 2 - if b:fugitive_display_format - call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash)) - else - call s:ReplaceCmd(s:repo().git_command('show','--no-color','--pretty=format:tree%x20%T%nparent%x20%P%nauthor%x20%an%x20<%ae>%x20%ad%ncommitter%x20%cn%x20<%ce>%x20%cd%nencoding%x20%e%n%n%s%n%n%b',hash)) - keepjumps call search('^parent ') - if getline('.') ==# 'parent ' - silent keepjumps delete_ - else - silent exe 'keepjumps s/\m\C\%(^parent\)\@<! /\rparent /e' . (&gdefault ? '' : 'g') - endif - keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3) - if lnum - silent keepjumps delete_ - end - silent keepjumps 1,/^diff --git\|\%$/g/\r$/s/// - keepjumps 1 - endif - elseif b:fugitive_type ==# 'blob' - call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash)) - setlocal nomodeline - endif - finally - keepjumps call setpos('.',pos) - setlocal ro noma nomod noswapfile - if &bufhidden ==# '' - setlocal bufhidden=delete - endif - if b:fugitive_type !=# 'blob' - setlocal filetype=git foldmethod=syntax - nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += v:count1<Bar>exe <SID>BufReadObject()<CR> - nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= v:count1<Bar>exe <SID>BufReadObject()<CR> - else - call s:JumpInit() - endif - endtry - - return '' - catch /^fugitive: rev-parse/ - return '' - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry -endfunction - -augroup fugitive_files - autocmd! - autocmd FileType git - \ if exists('b:git_dir') | - \ call s:JumpInit() | - \ endif - autocmd FileType git,gitcommit,gitrebase - \ if exists('b:git_dir') | - \ call s:GFInit() | - \ endif -augroup END - -" Section: Temp files - -if !exists('s:temp_files') - let s:temp_files = {} -endif - -augroup fugitive_temp - autocmd! - autocmd BufNewFile,BufReadPost * - \ if has_key(s:temp_files,s:cpath(expand('<afile>:p'))) | - \ let b:git_dir = s:temp_files[s:cpath(expand('<afile>:p'))].dir | - \ let b:git_type = 'temp' | - \ let b:git_args = s:temp_files[s:cpath(expand('<afile>:p'))].args | - \ call FugitiveDetect(expand('<afile>:p')) | - \ setlocal bufhidden=delete nobuflisted | - \ nnoremap <buffer> <silent> q :<C-U>bdelete<CR>| - \ endif -augroup END - -" Section: Go to file - -nnoremap <SID>: :<C-U><C-R>=v:count ? v:count : ''<CR> -function! s:GFInit(...) abort - cnoremap <buffer> <expr> <Plug><cfile> fugitive#Cfile() - if !exists('g:fugitive_no_maps') - call s:map('n', 'gf', '<SID>:find <Plug><cfile><CR>', '<silent><unique>') - call s:map('n', '<C-W>f', '<SID>:sfind <Plug><cfile><CR>', '<silent><unique>') - call s:map('n', '<C-W><C-F>', '<SID>:sfind <Plug><cfile><CR>', '<silent><unique>') - call s:map('n', '<C-W>gf', '<SID>:tabfind <Plug><cfile><CR>', '<silent><unique>') - call s:map('c', '<C-R><C-F>', '<Plug><cfile>', '<silent><unique>') - endif -endfunction - -function! s:JumpInit(...) abort - nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>GF("edit")<CR> - if !&modifiable - nnoremap <buffer> <silent> o :<C-U>exe <SID>GF("split")<CR> - nnoremap <buffer> <silent> S :<C-U>exe <SID>GF("vsplit")<CR> - nnoremap <buffer> <silent> O :<C-U>exe <SID>GF("tabedit")<CR> - nnoremap <buffer> <silent> - :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().up(v:count1))<Bar> if fugitive#buffer().type('tree')<Bar>call search('^'.escape(expand('#:t'),'.*[]~\').'/\=$','wc')<Bar>endif<CR> - nnoremap <buffer> <silent> P :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().commit().'^'.v:count1.<SID>buffer().path(':'))<CR> - nnoremap <buffer> <silent> ~ :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().commit().'~'.v:count1.<SID>buffer().path(':'))<CR> - nnoremap <buffer> <silent> C :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().containing_commit())<CR> - nnoremap <buffer> <silent> cc :<C-U>exe <SID>Edit('edit',0,'',<SID>buffer().containing_commit())<CR> - nnoremap <buffer> <silent> co :<C-U>exe <SID>Edit('split',0,'',<SID>buffer().containing_commit())<CR> - nnoremap <buffer> <silent> cS :<C-U>exe <SID>Edit('vsplit',0,'',<SID>buffer().containing_commit())<CR> - nnoremap <buffer> <silent> cO :<C-U>exe <SID>Edit('tabedit',0,'',<SID>buffer().containing_commit())<CR> - nnoremap <buffer> <silent> cP :<C-U>exe <SID>Edit('pedit',0,'',<SID>buffer().containing_commit())<CR> - nnoremap <buffer> . : <C-R>=fnameescape(<SID>recall())<CR><Home> - endif -endfunction - -function! s:cfile() abort - try - let buffer = s:buffer() - let myhash = buffer.sha1() - if myhash ==# '' && getline(1) =~# '^\%(commit\|tag\) \w' - let myhash = matchstr(getline(1),'^\w\+ \zs\S\+') - endif - - if buffer.type('tree') - let showtree = (getline(1) =~# '^tree ' && getline(2) == "") - if showtree && line('.') > 2 - return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(getline('.'),'/$','')] - elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t' - return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$','')] - endif - - elseif buffer.type('blob') - let ref = expand("<cfile>") - try - let sha1 = buffer.repo().rev_parse(ref) - catch /^fugitive:/ - endtry - if exists('sha1') - return [ref] - endif - - else - - let dcmds = [] - - " Index - if getline('.') =~# '^\d\{6\} \x\{40\} \d\t' - let ref = matchstr(getline('.'),'\x\{40\}') - let file = ':'.s:sub(matchstr(getline('.'),'\d\t.*'),'\t',':') - return [file] - - elseif getline('.') =~# '^.\=\trenamed:.* -> ' - let file = '/'.matchstr(getline('.'),' -> \zs.*') - return [file] - elseif getline('.') =~# '^.\=\t\(\k\| \)\+\p\?: *.' - let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$') - return [file] - elseif getline('.') =~# '^.\=\t.' - let file = '/'.matchstr(getline('.'),'\t\zs.*') - return [file] - elseif getline('.') =~# ': needs merge$' - let file = '/'.matchstr(getline('.'),'.*\ze: needs merge$') - return [file, 'Gdiff!'] - - elseif getline('.') =~# '^\%(. \)\=Not currently on any branch.$' - return ['HEAD'] - elseif getline('.') =~# '^\%(. \)\=On branch ' - let file = 'refs/heads/'.getline('.')[12:] - return [file] - elseif getline('.') =~# "^\\%(. \\)\=Your branch .*'" - let file = matchstr(getline('.'),"'\\zs\\S\\+\\ze'") - return [file] - endif - - let showtree = (getline(1) =~# '^tree ' && getline(2) == "") - - if getline('.') =~# '^ref: ' - let ref = strpart(getline('.'),5) - - elseif getline('.') =~# '^commit \x\{40\}\>' - let ref = matchstr(getline('.'),'\x\{40\}') - return [ref] - - elseif getline('.') =~# '^parent \x\{40\}\>' - let ref = matchstr(getline('.'),'\x\{40\}') - let line = line('.') - let parent = 0 - while getline(line) =~# '^parent ' - let parent += 1 - let line -= 1 - endwhile - return [ref] - - elseif getline('.') =~ '^tree \x\{40\}$' - let ref = matchstr(getline('.'),'\x\{40\}') - if s:repo().rev_parse(myhash.':') == ref - let ref = myhash.':' - endif - return [ref] - - elseif getline('.') =~# '^object \x\{40\}$' && getline(line('.')+1) =~ '^type \%(commit\|tree\|blob\)$' - let ref = matchstr(getline('.'),'\x\{40\}') - let type = matchstr(getline(line('.')+1),'type \zs.*') - - elseif getline('.') =~# '^\l\{3,8\} '.myhash.'$' - let ref = buffer.rev() - - elseif getline('.') =~# '^\l\{3,8\} \x\{40\}\>' - let ref = matchstr(getline('.'),'\x\{40\}') - echoerr "warning: unknown context ".matchstr(getline('.'),'^\l*') - - elseif getline('.') =~# '^[+-]\{3\} [abciow12]\=/' - let ref = getline('.')[4:] - - elseif getline('.') =~# '^[+-]' && search('^@@ -\d\+,\d\+ +\d\+,','bnW') - let type = getline('.')[0] - let lnum = line('.') - 1 - let offset = 0 - while getline(lnum) !~# '^@@ -\d\+,\d\+ +\d\+,' - if getline(lnum) =~# '^[ '.type.']' - let offset += 1 - endif - let lnum -= 1 - endwhile - let offset += matchstr(getline(lnum), type.'\zs\d\+') - let ref = getline(search('^'.type.'\{3\} [abciow12]/','bnW'))[4:-1] - let dcmds = [offset, 'normal!zv'] - - elseif getline('.') =~# '^rename from ' - let ref = 'a/'.getline('.')[12:] - elseif getline('.') =~# '^rename to ' - let ref = 'b/'.getline('.')[10:] - - elseif getline('.') =~# '^@@ -\d\+,\d\+ +\d\+,' - let diff = getline(search('^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)', 'bcnW')) - let offset = matchstr(getline('.'), '+\zs\d\+') - - let dref = matchstr(diff, '\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)') - let ref = matchstr(diff, '\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)') - let dcmd = 'Gdiff! +'.offset - - elseif getline('.') =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)' - let dref = matchstr(getline('.'),'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)') - let ref = matchstr(getline('.'),'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)') - let dcmd = 'Gdiff!' - - elseif getline('.') =~# '^index ' && getline(line('.')-1) =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)' - let line = getline(line('.')-1) - let dref = matchstr(line,'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)') - let ref = matchstr(line,'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)') - let dcmd = 'Gdiff!' - - elseif line('$') == 1 && getline('.') =~ '^\x\{40\}$' - let ref = getline('.') - - elseif expand('<cword>') =~# '^\x\{7,40\}\>' - return [expand('<cword>')] - - else - let ref = '' - endif - - let prefixes = { - \ '1': '', - \ '2': '', - \ 'b': ':0:', - \ 'i': ':0:', - \ 'o': '', - \ 'w': ''} - - if len(myhash) - let prefixes.a = myhash.'^:' - let prefixes.b = myhash.':' - endif - let ref = substitute(ref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '') - if exists('dref') - let dref = substitute(dref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '') - endif - - if ref ==# '/dev/null' - " Empty blob - let ref = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391' - endif - - if exists('dref') - return [ref, dcmd . ' ' . s:fnameescape(dref)] + dcmds - elseif ref != "" - return [ref] + dcmds - endif - - endif - return [] - endtry -endfunction - -function! s:GF(mode) abort - try - let results = s:cfile() - catch /^fugitive:/ - return 'echoerr v:errmsg' - endtry - if len(results) - return s:Edit(a:mode, 0, '', results[0]).join(map(results[1:-1], '"|".v:val'), '') - else - return '' - endif -endfunction - -function! fugitive#Cfile() abort - let pre = '' - let results = s:cfile() - if empty(results) - let cfile = expand('<cfile>') - if &includeexpr =~# '\<v:fname\>' - sandbox let cfile = eval(substitute(&includeexpr, '\C\<v:fname\>', '\=string(cfile)', 'g')) - endif - return cfile - elseif len(results) > 1 - let pre = '+' . join(map(results[1:-1], 'escape(v:val, " ")'), '\|') . ' ' - endif - return pre . s:fnameescape(fugitive#repo().translate(results[0])) -endfunction - -function! fugitive#cfile() abort - return fugitive#Cfile() -endfunction - -" Section: Statusline - -function! s:repo_head_ref() dict abort - if !filereadable(self.dir('HEAD')) - return '' - endif - return readfile(self.dir('HEAD'))[0] -endfunction - -call s:add_methods('repo',['head_ref']) - -function! fugitive#Statusline(...) abort - if !exists('b:git_dir') - return '' - endif - let status = '' - if s:buffer().commit() != '' - let status .= ':' . s:buffer().commit()[0:7] - endif - let status .= '('.FugitiveHead(7).')' - if &statusline =~# '%[MRHWY]' && &statusline !~# '%[mrhwy]' - return ',GIT'.status - else - return '[Git'.status.']' - endif -endfunction - -function! fugitive#statusline(...) abort - return fugitive#Statusline() -endfunction - -function! fugitive#head(...) abort - if !exists('b:git_dir') - return '' - endif - - return s:repo().head(a:0 ? a:1 : 0) -endfunction - -" Section: Folding - -function! fugitive#Foldtext() abort - if &foldmethod !=# 'syntax' - return foldtext() - endif - - let line_foldstart = getline(v:foldstart) - if line_foldstart =~# '^diff ' - let [add, remove] = [-1, -1] - let filename = '' - for lnum in range(v:foldstart, v:foldend) - let line = getline(lnum) - if filename ==# '' && line =~# '^[+-]\{3\} [abciow12]/' - let filename = line[6:-1] - endif - if line =~# '^+' - let add += 1 - elseif line =~# '^-' - let remove += 1 - elseif line =~# '^Binary ' - let binary = 1 - endif - endfor - if filename ==# '' - let filename = matchstr(line_foldstart, '^diff .\{-\} [abciow12]/\zs.*\ze [abciow12]/') - endif - if filename ==# '' - let filename = line_foldstart[5:-1] - endif - if exists('binary') - return 'Binary: '.filename - else - return (add<10&&remove<100?' ':'') . add . '+ ' . (remove<10&&add<100?' ':'') . remove . '- ' . filename - endif - elseif line_foldstart =~# '^# .*:$' - let lines = getline(v:foldstart, v:foldend) - call filter(lines, 'v:val =~# "^#\t"') - cal map(lines, "s:sub(v:val, '^#\t%(modified: +|renamed: +)=', '')") - cal map(lines, "s:sub(v:val, '^([[:alpha:] ]+): +(.*)', '\\2 (\\1)')") - return line_foldstart.' '.join(lines, ', ') - endif - return foldtext() -endfunction - -function! fugitive#foldtext() abort - return fugitive#Foldtext() -endfunction - -augroup fugitive_folding - autocmd! - autocmd User Fugitive - \ if &filetype =~# '^git\%(commit\)\=$' && &foldtext ==# 'foldtext()' | - \ set foldtext=fugitive#Foldtext() | - \ endif -augroup END