narrow: consider both local and remote matchers in narrowchangegroup
The existing code that picked one or the other seemed very
suspicious. This patch makes us intersect the local matcher with the
matcher from the remote, which seems better. It fixes one test case
and makes another one that used to crash no longer crash, but instead
silently succeed with a push that's lossy, so that remains to be
fixed.
The real reason for doing this now is that I'm going to move
narrowrepo.narrowmatch() onto localrepo and then it will always be
defined, which would otherwise break this code.
Differential Revision: https://phab.mercurial-scm.org/D2490
" $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"