upstream/mercurial-mirror Files · mercurial/testing/revlog.py

copies: detect files as `touched/salvaged` if they only existed on one side...

copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

Matt Harbison - - Load All Authors

File last commit:

r47543:521ac0d7 stable


                r47570:c52c3c4c

default

Download file

             revlog.py
        
                    38 lines
            
             | 1.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / testing / revlog.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marmoute
    
test: extract some generic data and utility from test-rust-ancestor.py...

              r44397
            
      from __future__ import absolute_import

      import unittest

      # picked from test-parse-index2, copied rather than imported

      # so that it stays stable even if test-parse-index2 changes or disappears.

      data_non_inlined = (

          b'\x00\x00\x00\x01\x00\x00\x00\x00\x00\x01D\x19'

          b'\x00\x07e\x12\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff'

          b'\xff\xff\xff\xff\xd1\xf4\xbb\xb0\xbe\xfc\x13\xbd\x8c\xd3\x9d'

          b'\x0f\xcd\xd9;\x8c\x07\x8cJ/\x00\x00\x00\x00\x00\x00\x00\x00\x00'

          b'\x00\x00\x00\x00\x00\x00\x01D\x19\x00\x00\x00\x00\x00\xdf\x00'

          b'\x00\x01q\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\xff'

          b'\xff\xff\xff\xc1\x12\xb9\x04\x96\xa4Z1t\x91\xdfsJ\x90\xf0\x9bh'

          b'\x07l&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'

          b'\x00\x01D\xf8\x00\x00\x00\x00\x01\x1b\x00\x00\x01\xb8\x00\x00'

          b'\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\xff\xff\xff\xff\x02\n'

          b'\x0e\xc6&\xa1\x92\xae6\x0b\x02i\xfe-\xe5\xbao\x05\xd1\xe7\x00'

          b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01F'

          b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'

          b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'

          b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'

          b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'

      )

      try:

        Matt Harbison
    
typing: disable import error warnings that are already handled...

              r47543
            
          from ..cext import parsers as cparsers  # pytype: disable=import-error

        marmoute
    
test: extract some generic data and utility from test-rust-ancestor.py...

              r44397
            
      except ImportError:

          cparsers = None

      @unittest.skipIf(

          cparsers is None,

          'The C version of the "parsers" module is not available. It is needed for this test.',

      )

      class RevlogBasedTestBase(unittest.TestCase):

          def parseindex(self):

              return cparsers.parse_index2(data_non_inlined, False)[0]

	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

marmoute test: extract some generic data and utility from test-rust-ancestor.py...	r44397	from __future__ import absolute_import
		import unittest

		# picked from test-parse-index2, copied rather than imported
		# so that it stays stable even if test-parse-index2 changes or disappears.
		data_non_inlined = (
		b'\x00\x00\x00\x01\x00\x00\x00\x00\x00\x01D\x19'
		b'\x00\x07e\x12\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff'
		b'\xff\xff\xff\xff\xd1\xf4\xbb\xb0\xbe\xfc\x13\xbd\x8c\xd3\x9d'
		b'\x0f\xcd\xd9;\x8c\x07\x8cJ/\x00\x00\x00\x00\x00\x00\x00\x00\x00'
		b'\x00\x00\x00\x00\x00\x00\x01D\x19\x00\x00\x00\x00\x00\xdf\x00'
		b'\x00\x01q\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\xff'
		b'\xff\xff\xff\xc1\x12\xb9\x04\x96\xa4Z1t\x91\xdfsJ\x90\xf0\x9bh'
		b'\x07l&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
		b'\x00\x01D\xf8\x00\x00\x00\x00\x01\x1b\x00\x00\x01\xb8\x00\x00'
		b'\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\xff\xff\xff\xff\x02\n'
		b'\x0e\xc6&\xa1\x92\xae6\x0b\x02i\xfe-\xe5\xbao\x05\xd1\xe7\x00'
		b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01F'
		b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'
		b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'
		b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'
		b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'
		)


		try:
Matt Harbison typing: disable import error warnings that are already handled...	r47543	from ..cext import parsers as cparsers # pytype: disable=import-error
marmoute test: extract some generic data and utility from test-rust-ancestor.py...	r44397	except ImportError:
		cparsers = None


		@unittest.skipIf(
		cparsers is None,
		'The C version of the "parsers" module is not available. It is needed for this test.',
		)
		class RevlogBasedTestBase(unittest.TestCase):
		def parseindex(self):
		return cparsers.parse_index2(data_non_inlined, False)[0]