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

Fix inline diff expansion

Browse Source
This commit is contained in:
Tim Pope
2019-07-04 08:39:34 -04:00
parent 4466eeb47a
commit a9572e9ea6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
autoload/fugitive.vim
View File

@@ -2134,6 +2134,7 @@ function! s:StageInfo(...) abort
\ 'sigil': sigil, \ 'sigil': sigil,
\ 'offset': offset, \ 'offset': offset,
\ 'filename': text, \ 'filename': text,
\ 'relative': reverse(split(text, ' -> ')),
\ '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]'),
@@ -2184,6 +2185,7 @@ function! s:Selection(arg1, ...) abort
\ 'heading': heading, \ 'heading': heading,
\ 'section': matchstr(heading, '^\u\l\+\ze.* (\d\+)$'), \ 'section': matchstr(heading, '^\u\l\+\ze.* (\d\+)$'),
\ 'filename': '', \ 'filename': '',
\ 'relative': [],
\ 'paths': [], \ 'paths': [],
\ 'commit': '', \ 'commit': '',
\ 'status': '', \ 'status': '',
@@ -2208,6 +2210,7 @@ function! s:Selection(arg1, ...) abort
call add(results, extend(deepcopy(template), { call add(results, extend(deepcopy(template), {
\ 'lnum': lnum, \ 'lnum': lnum,
\ 'filename': filename, \ 'filename': filename,
\ 'relative': reverse(split(filename, ' -> ')),
\ 'paths': map(reverse(split(filename, ' -> ')), 'root . v:val'), \ 'paths': map(reverse(split(filename, ' -> ')), 'root . v:val'),
\ 'status': matchstr(line, '^[A-Z?]'), \ 'status': matchstr(line, '^[A-Z?]'),
\ })) \ }))
@@ -2388,9 +2391,9 @@ function! s:StageInline(mode, ...) abort
endif endif
let start = index let start = index
let mode = 'head' let mode = 'head'
elseif mode ==# 'head' && substitute(line, "\t$", '', '') ==# '--- ' . info.paths[-1] elseif mode ==# 'head' && substitute(line, "\t$", '', '') ==# '--- ' . info.relative[-1]
let mode = 'await' let mode = 'await'
elseif mode ==# 'head' && substitute(line, "\t$", '', '') ==# '+++ ' . info.paths[0] elseif mode ==# 'head' && substitute(line, "\t$", '', '') ==# '+++ ' . info.relative[0]
let mode = 'await' let mode = 'await'
elseif mode ==# 'capture' elseif mode ==# 'capture'
call add(diff, line) call add(diff, line)
@@ -2658,9 +2661,9 @@ function! s:StagePatch(lnum1,lnum2) abort
endif endif
execute lnum execute lnum
if info.section ==# 'Staged' if info.section ==# 'Staged'
let reset += split(info.filename, ' -> ') let reset += info.relative
elseif info.status !~# '^D' elseif info.status !~# '^D'
let add += split(info.filename, ' -> ') let add += info.relative
endif endif
endfor endfor
try try