view tests/fakemergerecord.py @ 42908:f78f7448a969

tests: use positive revision numbers in test-strip-cross.t

It took me a long time to realize that '-r -1' was pulling revision -1
because I didn't even notice the minus sign until I tried changing the
revision number. The order of arguments doesn't matter, so I changed
from decreasing order to increasing while at it.

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

# Extension to write out fake unsupported records into the merge state
#
#

from __future__ import absolute_import

from mercurial import (
    merge,
    registrar,
)

cmdtable = {}
command = registrar.command(cmdtable)

@command(b'fakemergerecord',
         [(b'X', b'mandatory', None, b'add a fake mandatory record'),
          (b'x', b'advisory', None, b'add a fake advisory record')], '')
def fakemergerecord(ui, repo, *pats, **opts):
    with repo.wlock():
        ms = merge.mergestate.read(repo)
        records = ms._makerecords()
        if opts.get('mandatory'):
            records.append((b'X', b'mandatory record'))
        if opts.get('advisory'):
            records.append((b'x', b'advisory record'))
        ms._writerecords(records)