view contrib/fuzz/dirstate_corpus.py @ 42151:7116fc614cfc

tests: make merge conflicts explicit in `hg annotate` tests

We were using `true` as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".

Differential Revision: https://phab.mercurial-scm.org/D6252

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__),
                                         '..', '..'))
dirstate = os.path.join(reporoot, '.hg', 'dirstate')

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