test-histedit-arguments.t
169 lines
| 4.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-histedit-arguments.t
Pierre-Yves David
|
r19035 | 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] | ||||
Pierre-Yves David
|
r19039 | $ hg up --quiet | ||
Pierre-Yves David
|
r19040 | Test that missing revisions are detected | ||
--------------------------------------- | ||||
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF | ||||
> pick eb57da33312f 2 three | ||||
> pick 08d98a8350f3 4 five | ||||
> EOF | ||||
Pierre-Yves David
|
r19048 | abort: missing rules for changeset c8e68270e35a | ||
(do you want to use the drop action?) | ||||
Pierre-Yves David
|
r19040 | [255] | ||
Pierre-Yves David
|
r19041 | 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] | ||||
Pierre-Yves David
|
r19042 | 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] | ||||
Pierre-Yves David
|
r19043 | 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] | ||||
Pierre-Yves David
|
r19044 | 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] | ||||
Pierre-Yves David
|
r19047 | 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] | ||||
Pierre-Yves David
|
r19039 | 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) | ||||