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

mergestate: add a constructor that sets up a clean merge state...

mergestate: add a constructor that sets up a clean merge state Eventually, we'll move the read call out of the constructor. This will: - avoid unnecessary reads when we're going to nuke the merge state anyway - avoid raising an exception if there's an unsupported merge record 'clean' seems like a good name for it because I wanted to avoid anything with the word 'new' in it, and 'reset' is more an action performed on a merge state than a way to get a new merge state. Thanks to Martin von Zweigbergk for feedback about naming this.

Siddharth Agarwal - - Load All Authors

File last commit:

r26980:18f50b8c default


                r26987:416b2b7d

default

Download file

             node.py
        
                    26 lines
            
             | 667 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
            
        Gregory Szorc
    
node: use absolute_import

              r25962
            
      from __future__ import absolute_import

        Matt Mackall
    
Replace demandload with new demandimport

              r3877
            
      import binascii

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

              r1089
            
        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

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

      hex = binascii.hexlify

      bin = binascii.unhexlify

        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

        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

              r26980
            
      nullhex = hex(nullid)

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

              r1089
            
        Yuya Nishihara
    
node: define experimental identifiers for working directory...

              r25737
            
      # pseudo identifiers for working directory

      # (they are experimental, so don't add too many dependencies on them)

      wdirrev = 0x7fffffff

      wdirid = "\xff" * 20

        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
Gregory Szorc node: use absolute_import	r25962	from __future__ import absolute_import

Matt Mackall Replace demandload with new demandimport	r3877	import binascii
mpm@selenic.com Break apart hg.py...	r1089
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980	# This ugly style has a noticeable effect in manifest parsing
		hex = binascii.hexlify
		bin = binascii.unhexlify

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
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980	nullhex = hex(nullid)
mpm@selenic.com Break apart hg.py...	r1089
Yuya Nishihara node: define experimental identifiers for working directory...	r25737	# pseudo identifiers for working directory
		# (they are experimental, so don't add too many dependencies on them)
		wdirrev = 0x7fffffff
		wdirid = "\xff" * 20

mpm@selenic.com Break apart hg.py...	r1089	def short(node):
		return hex(node[:6])