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

merge: disallow merge abort in case of an unfinished operation (issue6160)...

merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

Mads Kiilerich - - Load All Authors

File last commit:

r18052:6db16422 default


                r42780:b8d54f46

default

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"