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

shelve: no longer strip internal commit when using internal phase...

shelve: no longer strip internal commit when using internal phase When the internal phase is used, the internal commits we create during shelve will be automatically hidden, and we don't need to strip them. Avoiding strips gives much better performances and is less traumatic for caches. Test changes are all related to revision numbers increasing more quickly since we avoid stripping. At the end of `test-shelve.t` we now need manually strip the shelve-commit in addition to the x.shelve file deletion. This emulates a preexisting shelve after a repository upgrade. Note: The hidden internal commits confuses rebase a bit as shown by a new test added. This will happen when the user have shelve commits on top of a changeset to be rebased. We'll fix this in the next commit. As we still use a backup bundle, rebase can just strip the internal changesets and be fine.

Yuya Nishihara - - Load All Authors

File last commit:

r39231:1e7a462c default


                r39780:52dfa1eb

default

Download file

             node.py
        
                    47 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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

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

      from __future__ import absolute_import

      import binascii

      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

      # Adapt to Python 3 API changes. If this ends up showing up in

      # profiles, we can use this version only on Python 3, and forward

      # binascii.unhexlify like we used to on Python 2.

      def bin(s):

          try:

              return binascii.unhexlify(s)

          except binascii.Error as e:

              raise TypeError(e)

      nullrev = -1

      # In hex, this is '0000000000000000000000000000000000000000'

      nullid = b"\0" * 20

      nullhex = hex(nullid)

      # Phony node value to stand-in for new files in some uses of

      # manifests.

      # In hex, this is '2121212121212121212121212121212121212121'

      newnodeid = '!!!!!!!!!!!!!!!!!!!!'

      # In hex, this is '3030303030303030303030303030306164646564'

      addednodeid = '000000000000000added'

      # In hex, this is '3030303030303030303030306d6f646966696564'

      modifiednodeid = '000000000000modified'

      wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

      # pseudo identifiers for working directory

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

      wdirrev = 0x7fffffff

      # In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'

      wdirid = b"\xff" * 20

      wdirhex = hex(wdirid)

      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

				# 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
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				import binascii

				# This ugly style has a noticeable effect in manifest parsing
				hex = binascii.hexlify
				# Adapt to Python 3 API changes. If this ends up showing up in
				# profiles, we can use this version only on Python 3, and forward
				# binascii.unhexlify like we used to on Python 2.
				def bin(s):
				try:
				return binascii.unhexlify(s)
				except binascii.Error as e:
				raise TypeError(e)

				nullrev = -1
				# In hex, this is '0000000000000000000000000000000000000000'
				nullid = b"\0" * 20
				nullhex = hex(nullid)

				# Phony node value to stand-in for new files in some uses of
				# manifests.
				# In hex, this is '2121212121212121212121212121212121212121'
				newnodeid = '!!!!!!!!!!!!!!!!!!!!'
				# In hex, this is '3030303030303030303030303030306164646564'
				addednodeid = '000000000000000added'
				# In hex, this is '3030303030303030303030306d6f646966696564'
				modifiednodeid = '000000000000modified'

				wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

				# pseudo identifiers for working directory
				# (they are experimental, so don't add too many dependencies on them)
				wdirrev = 0x7fffffff
				# In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'
				wdirid = b"\xff" * 20
				wdirhex = hex(wdirid)

				def short(node):
				return hex(node[:6])