Mercurial > hg
annotate tests/test-check-commit.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 | 33817e09c663 |
children |
rev | line source |
---|---|
22067
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 #require test-repo |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 Enable obsolescence to avoid the warning issue when obsmarker are found |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
29219
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
28293
diff
changeset
|
5 $ . "$TESTDIR/helpers-testrepo.sh" |
22067
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
6 |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
7 Go back in the hg repo |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 $ cd $TESTDIR/.. |
14306a686e71
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
37816
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
11 $ REVSET='not public() and ::. and not desc("# no-check-commit")' |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
12 |
37687
8872d46643b6
test-check-commit: don't run hg per commit
Yuya Nishihara <yuya@tcha.org>
parents:
33204
diff
changeset
|
13 $ mkdir "$TESTTMP/p" |
37816
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
14 $ REVS=`testrepohg log -r "$REVSET" -T.` |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
15 $ if [ -n "$REVS" ] ; then |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
16 > testrepohg export --git -o "$TESTTMP/p/%n-%h" -r "$REVSET" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
17 > for f in `ls "$TESTTMP/p"`; do |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
18 > contrib/check-commit < "$TESTTMP/p/$f" > "$TESTTMP/check-commit.out" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
19 > if [ $? -ne 0 ]; then |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
20 > node="${f##*-}" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
21 > echo "Revision $node does not comply with rules" |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
22 > echo '------------------------------------------------------' |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
23 > cat ${TESTTMP}/check-commit.out |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
24 > echo |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
25 > fi |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
26 > done |
33817e09c663
tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents:
37687
diff
changeset
|
27 > fi |