Mercurial > hg
annotate tests/test-revert-unknown.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 | 4c94b6d0fb1c |
children | 5c2a4f37eace |
rev | line source |
---|---|
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
1 $ hg init |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
2 $ touch unknown |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
3 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
4 $ touch a |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
5 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12111
diff
changeset
|
6 $ hg ci -m "1" |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
7 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
8 $ touch b |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
9 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12111
diff
changeset
|
10 $ hg ci -m "2" |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
11 |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
12 Should show unknown |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
13 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
14 $ hg status |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
15 ? unknown |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
16 $ hg revert -r 0 --all |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
17 removing b |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
18 |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
19 Should show unknown and b removed |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
20 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
21 $ hg status |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
22 R b |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
23 ? unknown |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
24 |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
25 Should show a and unknown |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
26 |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
27 $ ls |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
28 a |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
29 unknown |