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

Include backslash lines in diff hunks

Browse Source
This commit is contained in:
Tim Pope
2019-01-03 18:06:26 -05:00
parent 9e4fd4b3f6
commit 227159e964
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
autoload/fugitive.vim
View File

@@ -1939,7 +1939,7 @@ function! s:StageSeek(info, fallback) abort
let offset = +matchstr(getline(line), type . '\zs\d\+') - 1 let offset = +matchstr(getline(line), type . '\zs\d\+') - 1
elseif getline(line) =~# '^[ ' . type . ']' elseif getline(line) =~# '^[ ' . type . ']'
let offset += 1 let offset += 1
elseif getline(line) !~# '^[ @+-]' elseif getline(line) !~# '^[ @\+-]'
return line - 1 return line - 1
endif endif
endwhile endwhile
@@ -1953,7 +1953,7 @@ function! s:StageSeek(info, fallback) abort
if i ==# info.index if i ==# info.index
let backup = line let backup = line
endif endif
let i += getline(line) !~# '^[ @+-]' let i += getline(line) !~# '^[ @\+-]'
let line += 1 let line += 1
endwhile endwhile
return exists('backup') ? backup : line - 1 return exists('backup') ? backup : line - 1
@@ -2004,9 +2004,9 @@ endfunction
function! s:StageInfo(...) abort function! s:StageInfo(...) abort
let lnum = a:0 ? a:1 : line('.') let lnum = a:0 ? a:1 : line('.')
let sigil = matchstr(getline('.'), '^[ @+-]') let sigil = matchstr(getline('.'), '^[ @\+-]')
let offset = -1 let offset = -1
if getline(lnum) =~# '^[ @+-]' if getline(lnum) =~# '^[ @\+-]'
let type = sigil ==# '-' ? '-' : '+' let type = sigil ==# '-' ? '-' : '+'
while lnum > 0 && getline(lnum) !~# '^@' while lnum > 0 && getline(lnum) !~# '^@'
if getline(lnum) =~# '^[ '.type.']' if getline(lnum) =~# '^[ '.type.']'
@@ -2015,7 +2015,7 @@ function! s:StageInfo(...) abort
let lnum -= 1 let lnum -= 1
endwhile endwhile
let offset += matchstr(getline(lnum), type.'\zs\d\+') let offset += matchstr(getline(lnum), type.'\zs\d\+')
while getline(lnum) =~# '^[ @+-]' while getline(lnum) =~# '^[ @\+-]'
let lnum -= 1 let lnum -= 1
endwhile endwhile
endif endif
@@ -2025,7 +2025,7 @@ function! s:StageInfo(...) abort
while len(getline(slnum - 1)) && empty(section) while len(getline(slnum - 1)) && empty(section)
let slnum -= 1 let slnum -= 1
let section = matchstr(getline(slnum), '^\u\l\+\ze.* (\d\+)$') let section = matchstr(getline(slnum), '^\u\l\+\ze.* (\d\+)$')
if empty(section) && getline(slnum) !~# '^[ @+-]' if empty(section) && getline(slnum) !~# '^[ @\+-]'
let index += 1 let index += 1
endif endif
endwhile endwhile
@@ -2077,16 +2077,16 @@ function! s:StageInline(mode, ...) abort
endif endif
while lnum > lnum1 while lnum > lnum1
let lnum -= 1 let lnum -= 1
while lnum > 0 && getline(lnum) =~# '^[ @+-]' while lnum > 0 && getline(lnum) =~# '^[ @\+-]'
let lnum -= 1 let lnum -= 1
endwhile endwhile
let info = s:StageInfo(lnum) let info = s:StageInfo(lnum)
if !has_key(b:fugitive_diff, info.section) if !has_key(b:fugitive_diff, info.section)
continue continue
endif endif
if getline(lnum + 1) =~# '^[ @+-]' if getline(lnum + 1) =~# '^[ @\+-]'
let lnum2 = lnum + 1 let lnum2 = lnum + 1
while getline(lnum2 + 1) =~# '^[ @+-]' while getline(lnum2 + 1) =~# '^[ @\+-]'
let lnum2 += 1 let lnum2 += 1
endwhile endwhile
if a:mode !=# 'show' if a:mode !=# 'show'
@@ -2108,7 +2108,7 @@ function! s:StageInline(mode, ...) abort
if mode ==# 'await' && line[0] ==# '@' if mode ==# 'await' && line[0] ==# '@'
let mode = 'capture' let mode = 'capture'
endif endif
if mode !=# 'head' && line !~# '^[ @+-]' if mode !=# 'head' && line !~# '^[ @\+-]'
if len(diff) if len(diff)
break break
endif endif
@@ -2204,7 +2204,7 @@ function! s:StageApply(info, lnum1, count, reverse, extra) abort
if empty(filter(copy(lines), 'v:val =~# "^[+-]"')) if empty(filter(copy(lines), 'v:val =~# "^[+-]"'))
return '' return ''
endif endif
if len(filter(copy(lines), 'v:val !~# "^[ @+-]"')) if len(filter(copy(lines), 'v:val !~# "^[ @\+-]"'))
return 'fugitive: cannot apply hunks across multiple files' return 'fugitive: cannot apply hunks across multiple files'
endif endif
while getline(end) =~# '^[-+ ]' while getline(end) =~# '^[-+ ]'