mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
da45f9c6a0
Mercurial earlier than 2.7 allows users to do anything other than starting new histedit, even though current histedit is not finished or aborted yet. So, unfinished (and maybe inconsistent now) histedit states may be left and forgotten in repositories. Before this patch, histedit extension shows the message below, when it detects such inconsistent state: abort: REV is not an ancestor of working directory (update to REV or descendant and run "hg histedit --continue" again) But this message is incorrect, unless old Mercurial is re-installed, because Mercurial 2.7 or later disallows users to update the working directory to another revision. This patch changes the hint message to suggest "hg histedit --abort".
199 lines
5.4 KiB
Perl
199 lines
5.4 KiB
Perl
Test argument handling and various data parsing
|
|
==================================================
|
|
|
|
|
|
Enable extensions used by this test.
|
|
$ cat >>$HGRCPATH <<EOF
|
|
> [extensions]
|
|
> histedit=
|
|
> EOF
|
|
|
|
Repo setup.
|
|
$ hg init foo
|
|
$ cd foo
|
|
$ echo alpha >> alpha
|
|
$ hg addr
|
|
adding alpha
|
|
$ hg ci -m one
|
|
$ echo alpha >> alpha
|
|
$ hg ci -m two
|
|
$ echo alpha >> alpha
|
|
$ hg ci -m three
|
|
$ echo alpha >> alpha
|
|
$ hg ci -m four
|
|
$ echo alpha >> alpha
|
|
$ hg ci -m five
|
|
|
|
$ hg log --style compact --graph
|
|
@ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test
|
|
| five
|
|
|
|
|
o 3 c8e68270e35a 1970-01-01 00:00 +0000 test
|
|
| four
|
|
|
|
|
o 2 eb57da33312f 1970-01-01 00:00 +0000 test
|
|
| three
|
|
|
|
|
o 1 579e40513370 1970-01-01 00:00 +0000 test
|
|
| two
|
|
|
|
|
o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test
|
|
one
|
|
|
|
|
|
Run a dummy edit to make sure we get tip^^ correctly via revsingle.
|
|
--------------------------------------------------------------------
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^"
|
|
pick eb57da33312f 2 three
|
|
pick c8e68270e35a 3 four
|
|
pick 08d98a8350f3 4 five
|
|
|
|
# Edit history between eb57da33312f and 08d98a8350f3
|
|
#
|
|
# Commands:
|
|
# p, pick = use commit
|
|
# e, edit = use commit, but stop for amending
|
|
# f, fold = use commit, but fold into previous commit (combines N and N-1)
|
|
# d, drop = remove commit from history
|
|
# m, mess = edit message without changing commit content
|
|
#
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Run on a revision not ancestors of the current working directory.
|
|
--------------------------------------------------------------------
|
|
|
|
$ hg up 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg histedit -r 4
|
|
abort: 08d98a8350f3 is not an ancestor of working directory
|
|
[255]
|
|
$ hg up --quiet
|
|
|
|
Run on a revision not descendants of the initial parent
|
|
--------------------------------------------------------------------
|
|
|
|
Test the message shown for inconsistent histedit state, which may be
|
|
created (and forgotten) by Mercurial earlier than 2.7. This emulates
|
|
Mercurial earlier than 2.7 by renaming ".hg/histedit-state"
|
|
temporarily.
|
|
|
|
$ HGEDITOR=cat hg histedit -r 4 --commands - << EOF
|
|
> edit 08d98a8350f3 4 five
|
|
> EOF
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
reverting alpha
|
|
Make changes as needed, you may commit or record as needed now.
|
|
When you are finished, run hg histedit --continue to resume.
|
|
[1]
|
|
|
|
$ mv .hg/histedit-state .hg/histedit-state.back
|
|
$ hg update --quiet --clean 2
|
|
$ mv .hg/histedit-state.back .hg/histedit-state
|
|
|
|
$ hg histedit --continue
|
|
abort: c8e68270e35a is not an ancestor of working directory
|
|
(use "histedit --abort" to clear broken state)
|
|
[255]
|
|
|
|
$ hg histedit --abort
|
|
$ hg update --quiet --clean
|
|
|
|
Test that missing revisions are detected
|
|
---------------------------------------
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
|
|
> pick eb57da33312f 2 three
|
|
> pick 08d98a8350f3 4 five
|
|
> EOF
|
|
abort: missing rules for changeset c8e68270e35a
|
|
(do you want to use the drop action?)
|
|
[255]
|
|
|
|
Test that extra revisions are detected
|
|
---------------------------------------
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
|
|
> pick 6058cbb6cfd7 0 one
|
|
> pick c8e68270e35a 3 four
|
|
> pick 08d98a8350f3 4 five
|
|
> EOF
|
|
abort: may not use changesets other than the ones listed
|
|
[255]
|
|
|
|
Test malformed line
|
|
---------------------------------------
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
|
|
> pickeb57da33312f2three
|
|
> pick c8e68270e35a 3 four
|
|
> pick 08d98a8350f3 4 five
|
|
> EOF
|
|
abort: malformed line "pickeb57da33312f2three"
|
|
[255]
|
|
|
|
Test unknown changeset
|
|
---------------------------------------
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
|
|
> pick 0123456789ab 2 three
|
|
> pick c8e68270e35a 3 four
|
|
> pick 08d98a8350f3 4 five
|
|
> EOF
|
|
abort: unknown changeset 0123456789ab listed
|
|
[255]
|
|
|
|
Test unknown command
|
|
---------------------------------------
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
|
|
> coin eb57da33312f 2 three
|
|
> pick c8e68270e35a 3 four
|
|
> pick 08d98a8350f3 4 five
|
|
> EOF
|
|
abort: unknown action "coin"
|
|
[255]
|
|
|
|
Test duplicated changeset
|
|
---------------------------------------
|
|
|
|
So one is missing and one appear twice.
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
|
|
> pick eb57da33312f 2 three
|
|
> pick eb57da33312f 2 three
|
|
> pick 08d98a8350f3 4 five
|
|
> EOF
|
|
abort: duplicated command for changeset eb57da33312f
|
|
[255]
|
|
|
|
Test short version of command
|
|
---------------------------------------
|
|
|
|
Note: we use varying amounts of white space between command name and changeset
|
|
short hash. This tests issue3893.
|
|
|
|
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
|
|
> pick eb57da33312f 2 three
|
|
> p c8e68270e35a 3 four
|
|
> f 08d98a8350f3 4 five
|
|
> EOF
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
reverting alpha
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
four
|
|
***
|
|
five
|
|
|
|
|
|
|
|
HG: Enter commit message. Lines beginning with 'HG:' are removed.
|
|
HG: Leave message empty to abort commit.
|
|
HG: --
|
|
HG: user: test
|
|
HG: branch 'default'
|
|
HG: changed alpha
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
|