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

merge: do the trivial resolution after updating sparse checkout...

merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

Yuya Nishihara - - Load All Authors

File last commit:

r37466:d7114f88 default


                r39017:d49e490a

@94 stable

Download file

             node.py
        
                    42 lines
            
             | 1.2 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

      nullid = b"\0" * 20

      nullhex = hex(nullid)

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

      # manifests.

      newnodeid = '!' * 20

      addednodeid = ('0' * 15) + 'added'

      modifiednodeid = ('0' * 12) + 'modified'

      wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

      # pseudo identifiers for working directory

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

      wdirrev = 0x7fffffff

      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
				nullid = b"\0" * 20
				nullhex = hex(nullid)

				# Phony node value to stand-in for new files in some uses of
				# manifests.
				newnodeid = '!' * 20
				addednodeid = ('0' * 15) + 'added'
				modifiednodeid = ('0' * 12) + 'modified'

				wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

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

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