Skip to content

Commit

Permalink
Show refs in log in Gstatus
Browse files Browse the repository at this point in the history
Display refs (the output of %d from git log's format=pretty) next
to commit summaries in Gstatus.

Use basic syntax highlighting for all refs.
Use a special marker and concealing to avoid false-positives when commit
subjects begin with parentheses.
  • Loading branch information
Gelio committed Mar 24, 2021
1 parent 156dbcd commit 8797e3e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
8 changes: 5 additions & 3 deletions autoload/fugitive.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1701,14 +1701,16 @@ function! s:ReplaceCmd(cmd) abort
endfunction

function! s:QueryLog(refspec) abort
let lines = s:LinesError(['log', '-n', '256', '--pretty=format:%h%x09%s', a:refspec, '--'])[0]
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")}')
call map(lines, '{"type": "Log", "commit": v:val[0], "refs": trim(v:val[1]), "subject": join(v:val[2 : -1], "\t")}')
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) ? ("\x1f" . a:dict.refs . ' ') : '') . a:dict.subject
endfunction

function! s:FormatRebase(dict) abort
Expand Down
5 changes: 4 additions & 1 deletion syntax/fugitive.vim
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ 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=fugitiveRefsConcealedMarker skipwhite
syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
syn match fugitiveRefsConcealedMarker "\%x1f" contained nextgroup=fugitiveRefs conceal
syn match fugitiveRefs /([^)]\+)/hs=s+1,he=e-1 contained

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

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

Expand Down

0 comments on commit 8797e3e

Please sign in to comment.