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

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Kyle Lippincott - - Load All Authors

File last commit:

r44288:ba84a1ae default


                r49415:50de0890

default

Download file

             dirstate_corpus.py
        
                    17 lines
            
             | 535 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / fuzz / dirstate_corpus.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
      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()

        Augie Fackler
    
formatting: blacken the codebase...

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

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
      dirstate = os.path.join(reporoot, '.hg', 'dirstate')

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

          if os.path.exists(dirstate):

        Kyle Lippincott
    
fuzz: fix test-fuzz-targets.t to run with python3...

              r44288
            
              with open(dirstate, 'rb') as f:

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
                  zf.writestr("dirstate", 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

Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051	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()

Augie Fackler formatting: blacken the codebase...	r43346	reporoot = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051	dirstate = os.path.join(reporoot, '.hg', 'dirstate')

		with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf:
		if os.path.exists(dirstate):
Kyle Lippincott fuzz: fix test-fuzz-targets.t to run with python3...	r44288	with open(dirstate, 'rb') as f:
Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051	zf.writestr("dirstate", f.read())