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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Mads Kiilerich - - Load All Authors

File last commit:

r18052:6db16422 default


                r38817:bb54db4a

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