upstream/mercurial-mirror Files · contrib/vim/HGAnnotate.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.

"Mathieu Clabaut " - - Load All Authors

File last commit:

r2591:61f2008c default


                r28192:cb6a952e

stable

Download file

             HGAnnotate.vim
        
                    27 lines
            
             | 859 B
            
                | text/x-vim
            
             |
                VimLexer
            
             / contrib / vim / HGAnnotate.vim
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

	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

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