Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show refs in log in Gstatus #1713

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Show refs in log in Gstatus #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e12c71d
Show refs in log in Gstatus
Gelio Mar 22, 2021
443afda
Prevent false-positive ref syntax highlighting in Gstatus
Gelio Mar 25, 2021
5bfbdaa
Highlight only individual refs in Gstatus
Gelio Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 47 additions & 8 deletions autoload/fugitive.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,15 +1766,54 @@ function! s:ReplaceCmd(cmd) abort
endif
endfunction

function! s:QueryLog(refspec) abort
let lines = s:LinesError(['log', '-n', '256', '--pretty=format:%h%x09%s', a:refspec, '--'])[0]
function! s:IgnoreRefs(refs, refsToIgnore) abort
function! ShouldPreserveRef(refsToIgnore, index, ref) abort
return index(a:refsToIgnore, a:ref) == -1
endfunction

" Strip the outer parentheses
let refs = split(a:refs[1:-2], ", ")
let refs = filter(refs, function('ShouldPreserveRef', [a:refsToIgnore]))

if len(a:refs) == 0
return ''
endif

return '(' . join(refs, ", ") . ') '
endfunction

function! s:QueryLog(refspec, refToIgnore) abort
let lines = s:LinesError(['log', '-n', '256', '--pretty=format:%h%x09%d%x09%s', a:refspec, '--'])[0]
call map(lines, 'split(v:val, "\t", 1)')
call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}')
let refsToIgnore = [a:refToIgnore, 'HEAD']

function! HandleRefs(refsToIgnore, subject, refs) abort
let refs = trim(a:refs)
let refs = s:IgnoreRefs(refs, a:refsToIgnore)

if len(refs) == 0 && a:subject[0] == '('
" Add artificial (concealed) empty parentheses for refs. Helps avoid
" syntax highlighting false-positives (subject lines beginning with an
" open parenthesis).
return '()'
endif

return refs
endfunction

function! CreateLineDict(refsToIgnore, index, parts) abort
let subject = join(a:parts[2 : -1], "\t")
return {"type": "Log", "commit": a:parts[0], "refs": HandleRefs(a:refsToIgnore, subject, a:parts[1]), "subject": subject}
endfunction

call map(lines, function('CreateLineDict', [refsToIgnore]))
return lines
endfunction

function! s:FormatLog(dict) abort
return a:dict.commit . ' ' . a:dict.subject
setlocal conceallevel=3
setlocal concealcursor=nc
return a:dict.commit . ' ' . ((len(a:dict.refs) > 0) ? a:dict.refs : '') . a:dict.subject
endfunction

function! s:FormatRebase(dict) abort
Expand Down Expand Up @@ -2062,16 +2101,16 @@ function! fugitive#BufReadStatus() abort
let staged_end = len(staged) ? line('$') : 0

if len(pull) && get(props, 'branch.ab') !~# ' -0$'
call s:AddSection('Unpulled from ' . pull, s:QueryLog(head . '..' . pull))
call s:AddSection('Unpulled from ' . pull, s:QueryLog(head . '..' . pull, pull))
endif
if len(push) && push !=# pull
call s:AddSection('Unpulled from ' . push, s:QueryLog(head . '..' . push))
call s:AddSection('Unpulled from ' . push, s:QueryLog(head . '..' . push, push))
endif
if len(pull) && push !=# pull
call s:AddSection('Unpushed to ' . pull, s:QueryLog(pull . '..' . head))
call s:AddSection('Unpushed to ' . pull, s:QueryLog(pull . '..' . head, pull))
endif
if len(push) && !(push ==# pull && get(props, 'branch.ab') =~# '^+0 ')
call s:AddSection('Unpushed to ' . push, s:QueryLog(push . '..' . head))
call s:AddSection('Unpushed to ' . push, s:QueryLog(push . '..' . head, push))
endif

setlocal nomodified readonly noswapfile
Expand Down
6 changes: 5 additions & 1 deletion syntax/fugitive.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ syn match fugitiveDone /^done\>/ contained containedin=@fugitiveSection nextgrou
syn match fugitiveStop /^stop\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
syn match fugitiveModifier /^[MADRCU?]\{1,2} / contained containedin=@fugitiveSection
syn match fugitiveSymbolicRef /\.\@!\%(\.\.\@!\|[^[:space:][:cntrl:]\:.]\)\+\.\@<!/ contained
syn match fugitiveHash /^\x\{4,\}\S\@!/ contained containedin=@fugitiveSection
syn match fugitiveHash /^\x\{4,\}\S\@!/ contained containedin=@fugitiveSection nextgroup=fugitiveRefs skipwhite
syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
syn match fugitiveRefs '()' contained conceal
syn match fugitiveRefs /([^)]\+)/hs=s+1,he=e-1 contained contains=fugitiveRef
syn match fugitiveRef /\<[^[:space:][:cntrl:]]\+\>/ contained

syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=@fugitiveDiff containedin=@fugitiveSection fold

Expand All @@ -51,6 +54,7 @@ hi def link fugitiveStagedModifier Typedef
hi def link fugitiveInstruction Type
hi def link fugitiveStop Function
hi def link fugitiveHash Identifier
hi def link fugitiveRef Function
hi def link fugitiveSymbolicRef Function
hi def link fugitiveCount Number

Expand Down