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

Fix diff in status buffer

Browse Source 
Half the reason I gave up and wholesale reverted in 4875dd34 was because
the entirely unnecessary abbreviation of "submodule" to "sub" was
difficult to search for, and I wanted the whole thing gone.

Closes https://github.com/tpope/vim-fugitive/issues/1707
This commit is contained in:
Tim Pope
2021-03-19 23:36:01 -04:00
parent 4ea84b29eb
commit 04b0b26f84
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
autoload/fugitive.vim
View File

@@ -1789,12 +1789,13 @@ function! fugitive#BufReadStatus() abort
else else
let files = file let files = file
endif endif
let sub = matchstr(line, '^[12u] .. \zs....')
if line[2] !=# '.' if line[2] !=# '.'
call add(staged, {'type': 'File', 'status': line[2], 'filename': files}) call add(staged, {'type': 'File', 'status': line[2], 'filename': files, 'submodule': sub})
endif endif
if line[3] !=# '.' if line[3] !=# '.'
let sub = matchstr(line, '^[12u] .. \zs....') let sub = matchstr(line, '^[12u] .. \zs....')
call add(unstaged, {'type': 'File', 'status': get({'C':'M','M':'?','U':'?'}, matchstr(sub, 'S\.*\zs[CMU]'), line[3]), 'filename': file}) call add(unstaged, {'type': 'File', 'status': get({'C':'M','M':'?','U':'?'}, matchstr(sub, 'S\.*\zs[CMU]'), line[3]), 'filename': file, 'submodule': sub})
endif endif
endif endif
let i += 1 let i += 1
@@ -1844,12 +1845,12 @@ function! fugitive#BufReadStatus() abort
let i += 1 let i += 1
endif endif
if line[0] !~# '[ ?!#]' if line[0] !~# '[ ?!#]'
call add(staged, {'type': 'File', 'status': line[0], 'filename': files}) call add(staged, {'type': 'File', 'status': line[0], 'filename': files, 'submodule': ''})
endif endif
if line[0:1] ==# '??' if line[0:1] ==# '??'
call add(untracked, {'type': 'File', 'status': line[1], 'filename': files}) call add(untracked, {'type': 'File', 'status': line[1], 'filename': files})
elseif line[1] !~# '[ !#]' elseif line[1] !~# '[ !#]'
call add(unstaged, {'type': 'File', 'status': line[1], 'filename': file}) call add(unstaged, {'type': 'File', 'status': line[1], 'filename': file, 'submodule': ''})
endif endif
endwhile endwhile
endif endif
@@ -3053,6 +3054,7 @@ function! s:StageInfo(...) abort
\ 'paths': map(reverse(split(text, ' -> ')), 's:Tree() . "/" . v:val'), \ 'paths': map(reverse(split(text, ' -> ')), 's:Tree() . "/" . v:val'),
\ 'commit': matchstr(getline(lnum), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\{4,\}\ze '), \ 'commit': matchstr(getline(lnum), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\{4,\}\ze '),
\ 'status': matchstr(getline(lnum), '^[A-Z?]\ze \|^\%(\x\x\x\)\@!\l\+\ze [0-9a-f]'), \ 'status': matchstr(getline(lnum), '^[A-Z?]\ze \|^\%(\x\x\x\)\@!\l\+\ze [0-9a-f]'),
\ 'submodule': get(get(get(b:fugitive_files, section, {}), text, {}), 'submodule', ''),
\ 'index': index} \ 'index': index}
endfunction endfunction
@@ -3509,10 +3511,10 @@ function! s:StageDiff(diff) abort
let lnum = line('.') let lnum = line('.')
let info = s:StageInfo(lnum) let info = s:StageInfo(lnum)
let prefix = info.offset > 0 ? '+' . info.offset : '' let prefix = info.offset > 0 ? '+' . info.offset : ''
if info.sub =~# '^S' if info.submodule =~# '^S'
if info.section ==# 'Staged' if info.section ==# 'Staged'
return 'Git --paginate diff --no-ext-diff --submodule=log --cached -- ' . info.paths[0] return 'Git --paginate diff --no-ext-diff --submodule=log --cached -- ' . info.paths[0]
elseif info.sub =~# '^SC' elseif info.submodule =~# '^SC'
return 'Git --paginate diff --no-ext-diff --submodule=log -- ' . info.paths[0] return 'Git --paginate diff --no-ext-diff --submodule=log -- ' . info.paths[0]
else else
return 'Git --paginate diff --no-ext-diff --submodule=diff -- ' . info.paths[0] return 'Git --paginate diff --no-ext-diff --submodule=diff -- ' . info.paths[0]