##// END OF EJS Templates
split: close transaction in the unlikely event of a conflict while rebasing...
split: close transaction in the unlikely event of a conflict while rebasing `hg split` *should* never result in conflicts, but in case there are bugs, we should at least commit the transaction so they can continue the rebase. One of our users ran into the regression fixed by D10120. They fixed the conflict and the tried to continue the rebase, but it failed with "abort: cannot continue inconsistent rebase" because the rebase state referred to commits written in a transaction that was never committed. Side note: `hg split` should probably turn off copy tracing to reduce the impact of such bugs, and to speed it up as well. Copies made in the rebased commits should still be respected because `hg rebase` calls `copies.graftcopies()`. Differential Revision: https://phab.mercurial-scm.org/D10164

File last commit:

r44288:ba84a1ae default
r47492:7f6c002d default
Show More
dirstate_corpus.py
17 lines | 535 B | text/x-python | PythonLexer
/ contrib / fuzz / dirstate_corpus.py
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())