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

context: skip path conflicts by default when clearing unknown file (issue5776)...

context: skip path conflicts by default when clearing unknown file (issue5776) Prior to adding path conflict checking in 989e884d1be9, the test-audit-path.t tests failed as shown here (but it was globbed away). made it fail with a message about the destination manifest containing a conflict (though the no-symlink case wasn't updated). When the path conflict checking was gated behind an experimental config in 2a774cae3a03^::2a774cae3a03, the update started erroneously succeeding here. It turns out that the child of is the origin of this change when path conflict checking is disabled, as shown by grafting the experimental config range on top of it. What's happening here is merge.batchget() is writing the symlink 'back' to wdir (but as a regular file for the no-symlink case), and then tries to write 'back/test', but calls wctx['back/test'].clearunknown() first. The code that's gated here was removing the newly written 'back' file, allowing 'back/test' to succeed. I tried checking for the dir components of 'back/test' in dirstate, and skipping removal if present. But that didn't work because the dirstate isn't updated after each file is written out. This is the last persistent test failure on Windows, so the testbot should start turning green now. \o/

Augie Fackler - - Load All Authors

File last commit:

r36256:f574cc00 default


                r37119:656ac240

default

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'

      wdirnodes = {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'

				wdirnodes = {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])