m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-08 11:33:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compute correct line numbers in blame buffer

Browse Source
This commit is contained in:
Tim Pope
2022-06-18 10:03:41 -04:00
parent 9ea1f43a6a
commit a337eb5114
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
autoload/fugitive.vim
View File

@@ -7266,7 +7266,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, ...) abor
if empty(expanded) if empty(expanded)
let expanded = fugitive#Path(bufname, ':(top)', dir) let expanded = fugitive#Path(bufname, ':(top)', dir)
endif endif
if a:count > 0 && bufname !=# bufname('') if a:count > 0 && has_key(result, 'origin_bufnr') && a:range != 2
let blame = s:BlameCommitFileLnum(getline(a:count)) let blame = s:BlameCommitFileLnum(getline(a:count))
if len(blame[0]) if len(blame[0])
let expanded = blame[0] let expanded = blame[0]
@@ -7377,10 +7377,15 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, ...) abor
if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$' if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$'
let blame_list = tempname() let blame_list = tempname()
call writefile([commit, ''], blame_list, 'b') call writefile([commit, ''], blame_list, 'b')
let blame_in = tempname() let blame_cmd = ['-c', 'blame.coloring=none', 'blame', '-L', line1.','.line2, '-S', blame_list, '-s', '--show-number']
silent exe 'noautocmd keepalt %write' blame_in if !&l:modified || has_key(result, 'origin_bufnr')
let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', line1.','.line2, '-S', blame_list, '-s', '--show-number', './' . path], dir) let [blame, exec_error] = s:LinesError(blame_cmd + ['./' . path], dir)
call delete(blame_in) else
let blame_in = tempname()
silent exe 'noautocmd keepalt %write' blame_in
let [blame, exec_error] = s:LinesError(blame_cmd + ['--contents', blame_in, './' . path], dir)
call delete(blame_in)
endif
call delete(blame_list) call delete(blame_list)
if !exec_error if !exec_error
let blame_regex = '^\^\x\+\s\+\zs\d\+\ze\s' let blame_regex = '^\^\x\+\s\+\zs\d\+\ze\s'