##// END OF EJS Templates
rewriteutil: adapt "cannot %s while merging" to work with "change branch of"...
rewriteutil: adapt "cannot %s while merging" to work with "change branch of" `rewriteutil.precheck()` creates error messages by inserting a given verb into a sentence. The `hg branch -r` command passes in "change branch of" as the verb. That doesn't work well with "cannot %s while merging" (making it "cannot change branch of while merging"). Let's insert a "changeset" there to make it work better. Building sentences like this seems obviously bad for i18n, but fixing that is out of scope for this series, IMO. Differential Revision: https://phab.mercurial-scm.org/D10530

File last commit:

r2591:61f2008c default
r47783:c4dbbaec default
Show More
HGAnnotate.vim
27 lines | 859 B | text/x-vim | VimLexer
" $Id: CVSAnnotate.vim,v 1.5 2002/10/01 21:34:02 rhiestan Exp $
" Vim syntax file
" Language: CVS annotate output
" Maintainer: Bob Hiestand <bob@hiestandfamily.org>
" Last Change: $Date: 2002/10/01 21:34:02 $
" Remark: Used by the cvscommand plugin. Originally written by Mathieu
" Clabaut
if version < 600
syntax clear
elseif exists("b:current_syntax")
finish
endif
syn match cvsDate /\S\S\S \S\+ \d\+ \d\+:\d\+:\d\+ \d\+ [+-]\?\d\+/ contained
syn match cvsName /^\s*\S\+ / contained nextgroup=cvsVer
syn match cvsVer /\d\+ / contained nextgroup=cvsDate
syn region cvsHead start="^" end=":" contains=cvsVer,cvsName,cvsDate
if !exists("did_cvsannotate_syntax_inits")
let did_cvsannotate_syntax_inits = 1
hi link cvsText String
hi link cvsDate Comment
hi link cvsName Type
hi link cvsVer Statement
endif
let b:current_syntax="CVSAnnotate"