vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use descendant when jumping to patch for :Gblame --reverse

Browse Source 
References https://github.com/tpope/vim-fugitive/issues/1305
This commit is contained in:
Tim Pope 2019-08-13 16:27:21 -04:00
parent 0392f64a93
commit 0a7ffc5d67
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
autoload/fugitive.vim
View File

@ -4591,14 +4591,17 @@ endfunction
function! s:BlameCommitFileLnum(...) abort function! s:BlameCommitFileLnum(...) abort
let line = a:0 ? a:1 : getline('.') let line = a:0 ? a:1 : getline('.')
let state = a:0 ? a:2 : s:TempState()
let commit = matchstr(line, '^\^\=\zs\x\+') let commit = matchstr(line, '^\^\=\zs\x\+')
if commit =~# '^0\+$' if commit =~# '^0\+$'
let commit = '' let commit = ''
elseif line !~# '^\^' && has_key(state, 'blame_reverse_end')
let commit = get(s:LinesError('log', '--pretty=format:%H', '-1', '--ancestry-path', '--reverse', commit . '..' . state.blame_reverse_end)[0], 0, commit)
endif endif
let lnum = +matchstr(line, ' \zs\d\+\ze \%((\| *\d\+)\)') let lnum = +matchstr(line, ' \zs\d\+\ze \%((\| *\d\+)\)')
let path = matchstr(line, '^\^\=\x* \+\%(\d\+ \+\d\+ \+\)\=\zs.\{-\}\ze\s\+\%(\%( \d\+ \)\@<!([^()]*\w \d\+)\|\d\+ \)') let path = matchstr(line, '^\^\=\x* \+\%(\d\+ \+\d\+ \+\)\=\zs.\{-\}\ze\s\+\%(\%( \d\+ \)\@<!([^()]*\w \d\+)\|\d\+ \)')
if empty(path) && lnum if empty(path) && lnum
let path = a:0 ? a:2 : get(s:TempState(), 'blame_file', '') let path = get(state, 'blame_file', '')
endif endif
return [commit, path, lnum] return [commit, path, lnum]
endfunction endfunction
@ -4749,12 +4752,16 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, args) abort
endfor endfor
return '' return ''
endif endif
let temp_state = {'dir': s:Dir(), 'filetype': (raw ? '' : 'fugitiveblame'), 'blame_flags': flags, 'blame_file': file, 'modifiable': 0}
if s:HasOpt(flags, '--reverse')
let temp_state.blame_reverse_end = matchstr(get(commits, 0, ''), '\.\.\zs.*')
endif
if (a:line1 == 0 || a:range == 1) && a:count > 0 if (a:line1 == 0 || a:range == 1) && a:count > 0
let edit = s:Mods(a:mods) . get(['edit', 'split', 'pedit', 'vsplit', 'tabedit'], a:count - (a:line1 ? a:line1 : 1), 'split') let edit = s:Mods(a:mods) . get(['edit', 'split', 'pedit', 'vsplit', 'tabedit'], a:count - (a:line1 ? a:line1 : 1), 'split')
return s:BlameCommit(edit, get(readfile(temp), 0, ''), file) return s:BlameCommit(edit, get(readfile(temp), 0, ''), temp_state)
else else
let temp = s:Resolve(temp) let temp = s:Resolve(temp)
let s:temp_files[s:cpath(temp)] = {'dir': s:Dir(), 'filetype': (raw ? '' : 'fugitiveblame'), 'blame_flags': flags, 'blame_file': file, 'modifiable': 0} let s:temp_files[s:cpath(temp)] = temp_state
if len(ranges + commits + files) || raw if len(ranges + commits + files) || raw
if a:count != 0 if a:count != 0
exe 'silent keepalt split ' . s:fnameescape(temp) exe 'silent keepalt split ' . s:fnameescape(temp)
@ -4777,7 +4784,7 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, args) abort
endif endif
endfor endfor
let bufnr = bufnr('') let bufnr = bufnr('')
let s:temp_files[s:cpath(temp)].bufnr = bufnr let temp_state.bufnr = bufnr
let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)' let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)'
if exists('+cursorbind') if exists('+cursorbind')
let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&cursorbind",0)' let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&cursorbind",0)'