upstream/mercurial-mirror Files · contrib/fuzz/revlog_corpus.py

copies: filter invalid copies only at end of pathcopies() (issue6163)...

copies: filter invalid copies only at end of pathcopies() (issue6163) copies._filter() filters out copies whose source file does not exist in the start commit or whose target file does not exist in the end commit. We do that after chaining copies with dirstate copies or backward renames from another branch. We also do at the end of the changeset-centric copy tracing. The filtering means that we will remove copies to/from files that did not exist in some intermediate commit. That is inconsistent with what we do if a file has been deleted and then re-added (we allow updating across that). Copying the two first examples from issue6163: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' When doing `hg rebase -r 1 -d 4` in the first case, it succeeds, but `hg rebase -r 2 -d 4` in the second case does not. That's because we chain and filter via commit 0, which does not have file 'x' in the second case. IMO, that's clearly inconsistent. So this patch removes the filtering step so it only happens at the end. If a file was temporarily removed, whether via a merge base or not, it will now still be considered the same file. That fixes issue6163 for the changeset-centric case. Differential Revision: https://phab.mercurial-scm.org/D6603

Augie Fackler - - Load All Authors

File last commit:

r41050:c06f0ef9 default


                r42797:d013099c

default

Download file

             revlog_corpus.py
        
                    28 lines
            
             | 991 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / fuzz / revlog_corpus.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, print_function

      import argparse

      import os

      import zipfile

      ap = argparse.ArgumentParser()

      ap.add_argument("out", metavar="some.zip", type=str, nargs=1)

      args = ap.parse_args()

      reporoot = os.path.normpath(os.path.join(os.path.dirname(__file__),

                                               '..', '..'))

      # typically a standalone index

      changelog = os.path.join(reporoot, '.hg', 'store', '00changelog.i')

      # an inline revlog with only a few revisions

      contributing = os.path.join(

          reporoot, '.hg', 'store', 'data', 'contrib', 'fuzz', 'mpatch.cc.i')

      print(changelog, os.path.exists(changelog))

      print(contributing, os.path.exists(contributing))

      with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf:

          if os.path.exists(changelog):

              with open(changelog) as f:

                  zf.writestr("00changelog.i", f.read())

          if os.path.exists(contributing):

              with open(contributing) as f:

                  zf.writestr("contributing.i", f.read())

	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

				from __future__ import absolute_import, print_function

				import argparse
				import os
				import zipfile

				ap = argparse.ArgumentParser()
				ap.add_argument("out", metavar="some.zip", type=str, nargs=1)
				args = ap.parse_args()

				reporoot = os.path.normpath(os.path.join(os.path.dirname(__file__),
				'..', '..'))
				# typically a standalone index
				changelog = os.path.join(reporoot, '.hg', 'store', '00changelog.i')
				# an inline revlog with only a few revisions
				contributing = os.path.join(
				reporoot, '.hg', 'store', 'data', 'contrib', 'fuzz', 'mpatch.cc.i')

				print(changelog, os.path.exists(changelog))
				print(contributing, os.path.exists(contributing))

				with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf:
				if os.path.exists(changelog):
				with open(changelog) as f:
				zf.writestr("00changelog.i", f.read())
				if os.path.exists(contributing):
				with open(contributing) as f:
				zf.writestr("contributing.i", f.read())