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

Merge 0b387893ef into b068eaf1e6

Browse Source
This commit is contained in:
zivarah
2025-02-06 20:42:15 +08:00
committed by GitHub
parent b068eaf1e6 0b387893ef
commit 86da9813f6
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
autoload/fugitive.vim
View File

@@ -8138,6 +8138,9 @@ function! s:BranchCfile(result) abort
endfunction endfunction
let s:diff_header_pattern = '^diff --git \%("\=[abciow12]/.*\|/dev/null\) \%("\=[abciow12]/.*\|/dev/null\)$' let s:diff_header_pattern = '^diff --git \%("\=[abciow12]/.*\|/dev/null\) \%("\=[abciow12]/.*\|/dev/null\)$'
let s:rdiff_hash_or_missing = '\(\x\{7,40\}\|-\{7,40\}\)'
let s:rdiff_side = '\%(-\|\d\+\):\s\+' . s:rdiff_hash_or_missing
let s:rdiff_header_pattern = '^' . s:rdiff_side . '\s\+[=!<>]\s\+' . s:rdiff_side . '\s\+'
function! s:cfile() abort function! s:cfile() abort
let temp_state = s:TempState() let temp_state = s:TempState()
let name = substitute(get(get(temp_state, 'args', []), 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g') let name = substitute(get(get(temp_state, 'args', []), 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
@@ -8235,6 +8238,19 @@ function! s:cfile() abort
let dcmds = ['', 'Gdiffsplit! >' . myhash . '^:' . fnameescape(files[0])] let dcmds = ['', 'Gdiffsplit! >' . myhash . '^:' . fnameescape(files[0])]
endif endif
elseif getline('.') =~# s:rdiff_header_pattern
let ref = ''
let matches = matchlist(getline('.'), s:rdiff_header_pattern)
if matches[1] =~# '^-\+$' && matches[2] =~# '^\x\{7,40\}$'
let ref = matches[2]
elseif matches[2] =~# '^-\+$' && matches[1] =~# '^\x\{7,40\}$'
let ref = matches[1]
elseif matches[1] =~# '^\x\{7,40\}$' && matches[1] == matches[2]
let ref = matches[1]
elseif expand('<cword>') =~# '^\x\{7,40\}$'
let ref = expand('<cword>')
endif
elseif getline('.') =~# '^[+-]' elseif getline('.') =~# '^[+-]'
let [header_lnum, old_lnum, new_lnum] = s:HunkPosition(line('.')) let [header_lnum, old_lnum, new_lnum] = s:HunkPosition(line('.'))
if new_lnum > 0 if new_lnum > 0