annotate tests/test-empty-dir.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 3b165c127690
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
1 $ hg init
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
2
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
3 $ echo 123 > a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
4 $ hg add a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
5 $ hg commit -m "first" a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
6
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
7 $ mkdir sub
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
8 $ echo 321 > sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
9 $ hg add sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
10 $ hg commit -m "second" sub/b
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
11
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
12 $ cat sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
13 321
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
14
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
15 $ hg co 0
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
16 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
17
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
18 $ cat sub/b 2>/dev/null || echo "sub/b not present"
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
19 sub/b not present
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
20
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
21 $ test -d sub || echo "sub not present"
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
22 sub not present
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
23