Mercurial > hg
view contrib/vim/hgtest.vim @ 42421:d532292eff22 stable
bookmarks: use correct store for "ambiguity check"
I still don't quite know what the check does, but I clearly got it
wrong in 526750cdd02d (bookmarks: keep bookmarks in .hg/store if new
config set, 2019-05-15). Just compare with the strings we use in
@repofilecache and @storecache. These bugs were then copied to the
stable branch in c2b83c957621 (localrepo: grab mixedrepostorecache
class from 526750cdd02d, 2019-05-20) and 2338bdea4474 (bookmark: also
make bookmark cache depends of the changelog, 2019-05-20). As a
result, test-wireproto-exchangev2.t is flaky on both branches. This
patch fixes that.
Differential Revision: https://phab.mercurial-scm.org/D6469
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 31 May 2019 22:37:14 -0700 |
parents | 6db1642288c0 |
children |
line wrap: on
line source
" Vim syntax file " Language: Mercurial unified tests " Author: Steve Losh (steve@stevelosh.com) " " Place this file in ~/.vim/syntax/ and add the following line to your " ~/.vimrc to enable: " au BufNewFile,BufRead *.t set filetype=hgtest " " If you want folding you'll need the following line as well: " let hgtest_fold=1 " " You might also want to set the starting foldlevel for hgtest files: " autocmd Syntax hgtest setlocal foldlevel=1 if exists("b:current_syntax") finish endif syn include @Shell syntax/sh.vim syn match hgtestComment /^[^ ].*$/ syn region hgtestOutput start=/^ [^$>]/ start=/^ $/ end=/\v.(\n\n*[^ ])\@=/me=s end=/^ [$>]/me=e-3 end=/^$/ fold containedin=hgtestBlock syn match hgtestCommandStart /^ \$ / containedin=hgtestCommand syn region hgtestCommand start=/^ \$ /hs=s+4,rs=s+4 end=/^ [^>]/me=e-3 end=/^ $/me=e-2 containedin=hgtestBlock contains=@Shell keepend syn region hgtestBlock start=/^ /ms=e-2 end=/\v.(\n\n*[^ ])\@=/me=s end=/^$/me=e-1 fold keepend hi link hgtestCommandStart Keyword hi link hgtestComment Normal hi link hgtestOutput Comment if exists("hgtest_fold") setlocal foldmethod=syntax endif syn sync match hgtestSync grouphere NONE "^$" syn sync maxlines=200 " It's okay to set tab settings here, because an indent of two spaces is specified " by the file format. setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab let b:current_syntax = "hgtest"