##// 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
fakepatchtime.py
40 lines | 1.1 KiB | text/x-python | PythonLexer
FUJIWARA Katsunori
tests: add extension to emulate invoking internalpatch at the specific time...
r25756 # extension to emulate invoking 'patch.internalpatch()' at the time
# specified by '[fakepatchtime] fakenow'
Gregory Szorc
tests/fakepatchtime.py: use absolute_import
r27284 from __future__ import absolute_import
from mercurial import (
extensions,
patch as patchmod,
Boris Feld
configitems: register the test 'fakepatchtime.fakenow' config
r34773 registrar,
Gregory Szorc
tests/fakepatchtime.py: use absolute_import
r27284 )
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 internalpatch at the specific time...
r25756
Boris Feld
configitems: register the test 'fakepatchtime.fakenow' config
r34773 configtable = {}
configitem = registrar.configitem(configtable)
Pulkit Goyal
py3: add b'' prefixes in fakepatchtime.py...
r36343 configitem(b'fakepatchtime', b'fakenow',
Boris Feld
configitems: register the test 'fakepatchtime.fakenow' config
r34773 default=None,
)
FUJIWARA Katsunori
tests: add extension to emulate invoking internalpatch at the specific time...
r25756 def internalpatch(orig, ui, repo, patchobj, strip,
Pulkit Goyal
py3: add b'' prefixes in fakepatchtime.py...
r36343 prefix=b'', files=None,
eolmode=b'strict', similarity=0):
FUJIWARA Katsunori
tests: add extension to emulate invoking internalpatch at the specific time...
r25756 if files is None:
files = set()
r = orig(ui, repo, patchobj, strip,
prefix=prefix, files=files,
eolmode=eolmode, similarity=similarity)
Pulkit Goyal
py3: add b'' prefixes in fakepatchtime.py...
r36343 fakenow = ui.config(b'fakepatchtime', b'fakenow')
FUJIWARA Katsunori
tests: add extension to emulate invoking internalpatch at the specific time...
r25756 if fakenow:
# 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 internalpatch at the specific time...
r25756 for f in files:
repo.wvfs.utime(f, (fakenow, fakenow))
return r
def extsetup(ui):
extensions.wrapfunction(patchmod, 'internalpatch', internalpatch)