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

update: resurrect bare update from null parent to tip-most branch head...

update: resurrect bare update from null parent to tip-most branch head The situation is tricky if repository has no "default" branch, because "null" revision belongs to non-existent "default" branch. Before e1dd0de26557, bare update from null would bring us to the tip-most non-closed branch head. removed the special handling of missing "default" branch since we wanted to stick to the uncommitted branch in that case. But, if the parent is "null" revision, and if the missing branch is "default", it shouldn't be an uncommitted branch. In this case, bare update should bring us to the tip-most head as before. This should fix the test breakage introduced by e1dd0de26557.

Gregory Szorc - - Load All Authors

File last commit:

r28585:a3f3fdac default


                r28924:d9539959

default

Download file

             node.py
        
                    26 lines
            
             | 669 B
            
                | 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

      bin = binascii.unhexlify

      nullrev = -1

      nullid = b"\0" * 20

      nullhex = hex(nullid)

      # pseudo identifiers for working directory

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

      wdirrev = 0x7fffffff

      wdirid = b"\xff" * 20

      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
				bin = binascii.unhexlify

				nullrev = -1
				nullid = b"\0" * 20
				nullhex = hex(nullid)

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

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