Mercurial > hg
view tests/test-histedit-no-backup.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 | faea9b1980d9 |
children | 6acbe86c6490 |
line wrap: on
line source
$ . "$TESTDIR/histedit-helpers.sh" Enable extension used by this test $ cat >>$HGRCPATH <<EOF > [extensions] > histedit= > EOF ========================================== Test history-editing-backup config option| ========================================== Repo setup: $ hg init foo $ cd foo $ echo first>file $ hg ci -qAm one $ echo second>>file $ hg ci -m two $ echo third>>file $ hg ci -m three $ echo forth>>file $ hg ci -m four $ hg log -G --style compact @ 3[tip] 7d5187087c79 1970-01-01 00:00 +0000 test | four | o 2 80d23dfa866d 1970-01-01 00:00 +0000 test | three | o 1 6153eb23e623 1970-01-01 00:00 +0000 test | two | o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test one Test when `history-editing-backup` config option is enabled: $ hg histedit -r '36b4bdd91f5b' --commands - << EOF > pick 36b4bdd91f5b 0 one > pick 6153eb23e623 1 two > roll 80d23dfa866d 2 three > edit 7d5187087c79 3 four > EOF merging file Editing (7d5187087c79), you may commit or record as needed now. (hg histedit --continue to resume) [1] $ hg histedit --abort 1 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg Test when `history-editing-backup` config option is not enabled Enable config option: $ cat >>$HGRCPATH <<EOF > [ui] > history-editing-backup=False > EOF $ hg histedit -r '36b4bdd91f5b' --commands - << EOF > pick 36b4bdd91f5b 0 one > pick 6153eb23e623 1 two > roll 80d23dfa866d 2 three > edit 7d5187087c79 3 four > EOF merging file Editing (7d5187087c79), you may commit or record as needed now. (hg histedit --continue to resume) [1] $ hg histedit --abort 1 files updated, 0 files merged, 0 files removed, 0 files unresolved