upstream/mercurial-mirror Files · contrib/vim/hgtest.vim

revert: properly revert to ancestor of p2 during merge (issue5052)...

revert: properly revert to ancestor of p2 during merge (issue5052) During merge, added (from one perspective) file can be reported as "modified". To work around that, revert was testing if modified file were present in the parent manifest and marking them as "added" in this case. However, we should be checking against the target revision manifest instead. Otherwise see file as "newly added" even if they exist in the target revision. That revert behavior regressed in 06fbd9518bc5.

Mads Kiilerich - - Load All Authors

File last commit:

r18052:6db16422 default


                r28192:cb6a952e

stable

Download file

             hgtest.vim
        
                    42 lines
            
             | 1.4 KiB
            
                | text/x-vim
            
             |
                VimLexer
            
             / contrib / vim / hgtest.vim
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      " 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"

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				" 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"