Mercurial > hg
diff tests/test-phabricator.t @ 41163:0101a35deae2
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.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 05 Jan 2019 15:20:33 -0500 |
parents | d7d3164e6a31 |
children | 43fd1947301d |
line wrap: on
line diff
--- a/tests/test-phabricator.t Thu Jan 10 04:35:48 2019 +0100 +++ b/tests/test-phabricator.t Sat Jan 05 15:20:33 2019 -0500 @@ -65,6 +65,23 @@ D4597 - created - 1a5640df7bbf: create beta for phabricator test saved backup bundle to $TESTTMP/repo/.hg/strip-backup/1a5640df7bbf-6daf3e6e-phabsend.hg +The amend won't explode after posting a public commit. The local tag is left +behind to identify it. + + $ echo 'public change' > beta + $ hg ci -m 'create public change for phabricator testing' + $ hg phase --public . + $ echo 'draft change' > alpha + $ hg ci -m 'create draft change for phabricator testing' + $ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json" + D5544 - created - 540a21d3fbeb: create public change for phabricator testing + D5545 - created - 6bca752686cd: create draft change for phabricator testing + warning: not updating public commit 2:540a21d3fbeb + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6bca752686cd-41faefb4-phabsend.hg + $ hg tags -v + tip 3:620a50fd6ed9 + D5544 2:540a21d3fbeb local + $ hg debugcallconduit user.search --test-vcr "$VCR/phab-conduit.json" <<EOF > { > "constraints": { @@ -88,10 +105,14 @@ Template keywords $ hg log -T'{rev} {phabreview|json}\n' + 3 {"id": "D5545", "url": "https://phab.mercurial-scm.org/D5545"} + 2 null 1 {"id": "D4597", "url": "https://phab.mercurial-scm.org/D4597"} 0 {"id": "D4596", "url": "https://phab.mercurial-scm.org/D4596"} - $ hg log -T'{rev} {phabreview.url} {phabreview.id}\n' + $ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n' + 3 https://phab.mercurial-scm.org/D5545 D5545 + 2 1 https://phab.mercurial-scm.org/D4597 D4597 0 https://phab.mercurial-scm.org/D4596 D4596