upstream/mercurial-mirror Files · mercurial/node.py

histedit: suggest "histedit --abort" for inconsistent histedit state...

histedit: suggest "histedit --abort" for inconsistent histedit state Mercurial earlier than 2.7 allows users to do anything other than starting new histedit, even though current histedit is not finished or aborted yet. So, unfinished (and maybe inconsistent now) histedit states may be left and forgotten in repositories. Before this patch, histedit extension shows the message below, when it detects such inconsistent state: abort: REV is not an ancestor of working directory (update to REV or descendant and run "hg histedit --continue" again) But this message is incorrect, unless old Mercurial is re-installed, because Mercurial 2.7 or later disallows users to update the working directory to another revision. This patch changes the hint message to suggest "hg histedit --abort".

Matt Mackall - - Load All Authors

File last commit:

r10263:25e57239 stable


                r19847:45c30868

stable

Download file

             node.py
        
                    18 lines
            
             | 449 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
put license and copyright info into comment blocks

              r8226
            
      # node.py - basic nodeid manipulation for mercurial

      #

      # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

      #

      # This software may be used and distributed according to the terms of the

        Matt Mackall
    
Update license to GPLv2+

              r10263
            
      # GNU General Public License version 2 or any later version.

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Matt Mackall
    
Replace demandload with new demandimport

              r3877
            
      import binascii

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Thomas Arendsen Hein
    
Define and use nullrev (revision of nullid) instead of -1.

              r3578
            
      nullrev = -1

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
      nullid = "\0" * 20

        Matt Mackall
    
manifest: speed up creation of the manifestdict...

              r4995
            
      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

      bin = binascii.unhexlify

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
      def short(node):

          return hex(node[:6])

	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

Martin Geisler put license and copyright info into comment blocks	r8226	# node.py - basic nodeid manipulation for mercurial
		#
		# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
		#
		# This software may be used and distributed according to the terms of the
Matt Mackall Update license to GPLv2+	r10263	# GNU General Public License version 2 or any later version.
mpm@selenic.com Break apart hg.py...	r1089
Matt Mackall Replace demandload with new demandimport	r3877	import binascii
mpm@selenic.com Break apart hg.py...	r1089
Thomas Arendsen Hein Define and use nullrev (revision of nullid) instead of -1.	r3578	nullrev = -1
mpm@selenic.com Break apart hg.py...	r1089	nullid = "\0" * 20

Matt Mackall manifest: speed up creation of the manifestdict...	r4995	# This ugly style has a noticeable effect in manifest parsing
		hex = binascii.hexlify
		bin = binascii.unhexlify
mpm@selenic.com Break apart hg.py...	r1089
		def short(node):
		return hex(node[:6])