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

Show current revert/cherry-pick in status buffer

Browse Source 
Resolves: https://github.com/tpope/vim-fugitive/issues/2175
This commit is contained in:
Tim Pope
2023-07-04 17:42:06 -04:00
parent 43f18ab915
commit b3b838d690
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
autoload/fugitive.vim
View File

@@ -2884,6 +2884,24 @@ function! fugitive#BufReadStatus(...) abort
endfor endfor
endif endif
let sequencing = []
if filereadable(fugitive#Find('.git/sequencer/todo'))
for line in reverse(readfile(fugitive#Find('.git/sequencer/todo')))
let match = matchlist(line, '^\(\l\+\)\s\+\(\x\{4,\}\)\s\+\(.*\)')
if len(match) && match[1] !~# 'exec\|merge\|label'
call add(sequencing, {'type': 'Rebase', 'status': get(s:rebase_abbrevs, match[1], match[1]), 'commit': match[2], 'subject': match[3]})
endif
endfor
elseif filereadable(fugitive#Find('.git/MERGE_MSG'))
if filereadable(fugitive#Find('.git/CHERRY_PICK_HEAD'))
let pick_head = fugitive#Execute(['rev-parse', '--short', 'CHERRY_PICK_HEAD', '--']).stdout[0]
call add(sequencing, {'type': 'Rebase', 'status': 'pick', 'commit': pick_head, 'subject': get(readfile(fugitive#Find('.git/MERGE_MSG')), 0, '')})
elseif filereadable(fugitive#Find('.git/REVERT_HEAD'))
let pick_head = fugitive#Execute(['rev-parse', '--short', 'REVERT_HEAD', '--']).stdout[0]
call add(sequencing, {'type': 'Rebase', 'status': 'revert', 'commit': pick_head, 'subject': get(readfile(fugitive#Find('.git/MERGE_MSG')), 0, '')})
endif
endif
let b:fugitive_diff = diff let b:fugitive_diff = diff
if get(a:, 1, v:cmdbang) if get(a:, 1, v:cmdbang)
unlet! b:fugitive_expanded unlet! b:fugitive_expanded
@@ -2910,6 +2928,7 @@ function! fugitive#BufReadStatus(...) abort
endif endif
call s:AddSection('Rebasing ' . rebasing_head, rebasing) call s:AddSection('Rebasing ' . rebasing_head, rebasing)
call s:AddSection(get(get(sequencing, 0, {}), 'status', '') ==# 'revert' ? 'Reverting' : 'Cherry Picking', sequencing)
call s:AddSection('Untracked', untracked) call s:AddSection('Untracked', untracked)
call s:AddSection('Unstaged', unstaged) call s:AddSection('Unstaged', unstaged)
let unstaged_end = len(unstaged) ? line('$') : 0 let unstaged_end = len(unstaged) ? line('$') : 0