##// END OF EJS Templates
phabricator: warn if unable to amend, instead of aborting after posting...
phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

File last commit:

r36625:c6061cad default
r41198:0101a35d default
Show More
fakedirstatewritetime.py
78 lines | 2.5 KiB | text/x-python | PythonLexer
/ tests / fakedirstatewritetime.py
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 # extension to emulate invoking 'dirstate.write()' at the time
# specified by '[fakedirstatewritetime] fakenow', only when
# 'dirstate.write()' is invoked via functions below:
#
Siddharth Agarwal
workingctx: factor out post-status dirstate fixup...
r32812 # - 'workingctx._poststatusfixup()' (= 'repo.status()')
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 # - 'committablectx.markcommitted()'
Gregory Szorc
tests/fakedirstatewritetime.py: use absolute_import
r27283 from __future__ import absolute_import
from mercurial import (
context,
dirstate,
extensions,
Yuya Nishihara
parsers: switch to policy importer...
r32372 policy,
Boris Feld
configitems: register the test 'fakedirstatewritetime.fakenow' config
r34772 registrar,
Gregory Szorc
tests/fakedirstatewritetime.py: use absolute_import
r27283 )
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 from mercurial.utils import dateutil
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752
Boris Feld
configitems: register the test 'fakedirstatewritetime.fakenow' config
r34772 configtable = {}
configitem = registrar.configitem(configtable)
Pulkit Goyal
py3: add b'' prefixes in fakedirstatewritetime.py...
r36342 configitem(b'fakedirstatewritetime', b'fakenow',
Boris Feld
configitems: register the test 'fakedirstatewritetime.fakenow' config
r34772 default=None,
)
Yuya Nishihara
parsers: switch to policy importer...
r32372 parsers = policy.importmod(r'parsers')
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 def pack_dirstate(fakenow, orig, dmap, copymap, pl, now):
# execute what original parsers.pack_dirstate should do actually
# for consistency
actualnow = int(now)
Pulkit Goyal
py3: use dict.items() instead of dict.iteritems() in tests...
r36345 for f, e in dmap.items():
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 if e[0] == 'n' and e[3] == actualnow:
e = parsers.dirstatetuple(e[0], e[1], e[2], -1)
dmap[f] = e
return orig(dmap, copymap, pl, fakenow)
def fakewrite(ui, func):
# fake "now" of 'pack_dirstate' only if it is invoked while 'func'
Pulkit Goyal
py3: add b'' prefixes in fakedirstatewritetime.py...
r36342 fakenow = ui.config(b'fakedirstatewritetime', b'fakenow')
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 if not fakenow:
# Execute original one, if fakenow isn't configured. This is
# useful to prevent subrepos from executing replaced one,
# because replacing 'parsers.pack_dirstate' is also effective
# in subrepos.
return func()
# parsing 'fakenow' in YYYYmmddHHMM format makes comparison between
# 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 fakenow = dateutil.parsedate(fakenow, [b'%Y%m%d%H%M'])[0]
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752
orig_pack_dirstate = parsers.pack_dirstate
FUJIWARA Katsunori
dirstate: make writing in-memory changes aware of transaction activity...
r26634 orig_dirstate_getfsnow = dirstate._getfsnow
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 wrapper = lambda *args: pack_dirstate(fakenow, orig_pack_dirstate, *args)
parsers.pack_dirstate = wrapper
FUJIWARA Katsunori
dirstate: make writing in-memory changes aware of transaction activity...
r26634 dirstate._getfsnow = lambda *args: fakenow
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 try:
return func()
finally:
parsers.pack_dirstate = orig_pack_dirstate
FUJIWARA Katsunori
dirstate: make writing in-memory changes aware of transaction activity...
r26634 dirstate._getfsnow = orig_dirstate_getfsnow
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752
Siddharth Agarwal
workingctx: also pass status tuple into poststatusfixup...
r32813 def _poststatusfixup(orig, workingctx, status, fixup):
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 ui = workingctx.repo().ui
Siddharth Agarwal
workingctx: also pass status tuple into poststatusfixup...
r32813 return fakewrite(ui, lambda : orig(workingctx, status, fixup))
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752
def markcommitted(orig, committablectx, node):
ui = committablectx.repo().ui
return fakewrite(ui, lambda : orig(committablectx, node))
def extsetup(ui):
Siddharth Agarwal
workingctx: factor out post-status dirstate fixup...
r32812 extensions.wrapfunction(context.workingctx, '_poststatusfixup',
_poststatusfixup)
FUJIWARA Katsunori
tests: add extension to emulate invoking dirstate.write at the specific time...
r25752 extensions.wrapfunction(context.committablectx, 'markcommitted',
markcommitted)