##// END OF EJS Templates
pyoxidizer: update to PyOxidizer 0.9...
pyoxidizer: update to PyOxidizer 0.9 We were previously using a Git commit from a few days before the 0.8 release. This commit upgrades us to the just-released 0.9 release. This required some Starlark changes due to backwards incompatible changes. Differential Revision: https://phab.mercurial-scm.org/D9228

File last commit:

r45376:2870f5d5 default
r46341:f95b1679 stable
Show More
fakemergerecord.py
32 lines | 802 B | text/x-python | PythonLexer
/ tests / fakemergerecord.py
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027 # Extension to write out fake unsupported records into the merge state
#
#
from __future__ import absolute_import
from mercurial import (
Augie Fackler
mergestate: split out merge state handling code from main merge module...
r45383 mergestate as mergestatemod,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027 )
cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027
Augie Fackler
formatting: blacken the codebase...
r43346
@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'),
],
'',
)
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027 def fakemergerecord(ui, repo, *pats, **opts):
Pierre-Yves David
fakemergerecord: take wlock to write the merge state...
r29754 with repo.wlock():
Augie Fackler
mergestate: split out merge state handling code from main merge module...
r45383 ms = mergestatemod.mergestate.read(repo)
Pierre-Yves David
fakemergerecord: take wlock to write the merge state...
r29754 records = ms._makerecords()
Pulkit Goyal
py3: backout changeset 56635c506608 which wrongly added couple of b''...
r36498 if opts.get('mandatory'):
Augie Fackler
tests: port fakemergerecord to python3...
r36191 records.append((b'X', b'mandatory record'))
Pulkit Goyal
py3: backout changeset 56635c506608 which wrongly added couple of b''...
r36498 if opts.get('advisory'):
Augie Fackler
tests: port fakemergerecord to python3...
r36191 records.append((b'x', b'advisory record'))
Pierre-Yves David
fakemergerecord: take wlock to write the merge state...
r29754 ms._writerecords(records)