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

dirstate.remove: during merges, remember the previous file state...

dirstate.remove: during merges, remember the previous file state We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.

Matt Mackall - - Load All Authors

File last commit:

r4995:e45fc5d0 default


                r6297:fed1a9c2

default

Download file

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

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

              r1089
            
      """

      node.py - basic nodeid manipulation for mercurial

        Vadim Gelfer
    
update copyrights.

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

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

              r1089
            
      This software may be used and distributed according to the terms

      of the GNU General Public License, incorporated herein by reference.

      """

        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

mpm@selenic.com Break apart hg.py...	r1089	"""
		node.py - basic nodeid manipulation for mercurial

Vadim Gelfer update copyrights.	r2859	Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
mpm@selenic.com Break apart hg.py...	r1089
		This software may be used and distributed according to the terms
		of the GNU General Public License, incorporated herein by reference.
		"""

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])