author | Gregory Szorc <gregory.szorc@gmail.com> |
Sun, 20 Apr 2014 17:06:57 -0700 | |
changeset 21489 | f245c1fc7e96 |
parent 20806 | d66862b87ae6 |
child 21858 | 50fd3a36d166 |
permissions | -rw-r--r-- |
19035
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
1 |
Test argument handling and various data parsing |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
2 |
================================================== |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
3 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
4 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
5 |
Enable extensions used by this test. |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
6 |
$ cat >>$HGRCPATH <<EOF |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
7 |
> [extensions] |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
8 |
> histedit= |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
9 |
> EOF |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
10 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
11 |
Repo setup. |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
12 |
$ hg init foo |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
13 |
$ cd foo |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
14 |
$ echo alpha >> alpha |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
15 |
$ hg addr |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
16 |
adding alpha |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
17 |
$ hg ci -m one |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
18 |
$ echo alpha >> alpha |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
19 |
$ hg ci -m two |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
20 |
$ echo alpha >> alpha |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
21 |
$ hg ci -m three |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
22 |
$ echo alpha >> alpha |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
23 |
$ hg ci -m four |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
24 |
$ echo alpha >> alpha |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
25 |
$ hg ci -m five |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
26 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
27 |
$ hg log --style compact --graph |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
28 |
@ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
29 |
| five |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
30 |
| |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
31 |
o 3 c8e68270e35a 1970-01-01 00:00 +0000 test |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
32 |
| four |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
33 |
| |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
34 |
o 2 eb57da33312f 1970-01-01 00:00 +0000 test |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
35 |
| three |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
36 |
| |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
37 |
o 1 579e40513370 1970-01-01 00:00 +0000 test |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
38 |
| two |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
39 |
| |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
40 |
o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
41 |
one |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
42 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
43 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
44 |
Run a dummy edit to make sure we get tip^^ correctly via revsingle. |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
45 |
-------------------------------------------------------------------- |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
46 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
47 |
$ HGEDITOR=cat hg histedit "tip^^" |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
48 |
pick eb57da33312f 2 three |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
49 |
pick c8e68270e35a 3 four |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
50 |
pick 08d98a8350f3 4 five |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
51 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
52 |
# Edit history between eb57da33312f and 08d98a8350f3 |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
53 |
# |
20503
23dc77874191
histedit: clarify description of fold command
Adrian Zgorzałek <adek@fb.com>
parents:
19847
diff
changeset
|
54 |
# Commits are listed from least to most recent |
23dc77874191
histedit: clarify description of fold command
Adrian Zgorzałek <adek@fb.com>
parents:
19847
diff
changeset
|
55 |
# |
19035
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
56 |
# Commands: |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
57 |
# p, pick = use commit |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
58 |
# e, edit = use commit, but stop for amending |
20511
5840da876235
histedit: shorten new fold message
Matt Mackall <mpm@selenic.com>
parents:
20503
diff
changeset
|
59 |
# f, fold = use commit, but combine it with the one above |
19035
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
60 |
# d, drop = remove commit from history |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
61 |
# m, mess = edit message without changing commit content |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
62 |
# |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
63 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
64 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
65 |
Run on a revision not ancestors of the current working directory. |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
66 |
-------------------------------------------------------------------- |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
67 |
|
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
68 |
$ hg up 2 |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
69 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
70 |
$ hg histedit -r 4 |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
71 |
abort: 08d98a8350f3 is not an ancestor of working directory |
85974024ffa3
histedit-test: rename histedit-revspec into histedit-argument
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
72 |
[255] |
19039
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
73 |
$ hg up --quiet |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
74 |
|
20806
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
75 |
|
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
76 |
Test that we pick the minimum of a revrange |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
77 |
--------------------------------------- |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
78 |
|
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
79 |
$ HGEDITOR=cat hg histedit '2::' --commands - << EOF |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
80 |
> pick eb57da33312f 2 three |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
81 |
> pick c8e68270e35a 3 four |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
82 |
> pick 08d98a8350f3 4 five |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
83 |
> EOF |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
84 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
85 |
$ hg up --quiet |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
86 |
|
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
87 |
$ HGEDITOR=cat hg histedit 'tip:2' --commands - << EOF |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
88 |
> pick eb57da33312f 2 three |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
89 |
> pick c8e68270e35a 3 four |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
90 |
> pick 08d98a8350f3 4 five |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
91 |
> EOF |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
92 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
93 |
$ hg up --quiet |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
94 |
|
19847
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
95 |
Run on a revision not descendants of the initial parent |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
96 |
-------------------------------------------------------------------- |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
97 |
|
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
98 |
Test the message shown for inconsistent histedit state, which may be |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
99 |
created (and forgotten) by Mercurial earlier than 2.7. This emulates |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
100 |
Mercurial earlier than 2.7 by renaming ".hg/histedit-state" |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
101 |
temporarily. |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
102 |
|
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
103 |
$ HGEDITOR=cat hg histedit -r 4 --commands - << EOF |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
104 |
> edit 08d98a8350f3 4 five |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
105 |
> EOF |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
106 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
107 |
reverting alpha |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
108 |
Make changes as needed, you may commit or record as needed now. |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
109 |
When you are finished, run hg histedit --continue to resume. |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
110 |
[1] |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
111 |
|
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
112 |
$ mv .hg/histedit-state .hg/histedit-state.back |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
113 |
$ hg update --quiet --clean 2 |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
114 |
$ mv .hg/histedit-state.back .hg/histedit-state |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
115 |
|
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
116 |
$ hg histedit --continue |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
117 |
abort: c8e68270e35a is not an ancestor of working directory |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
118 |
(use "histedit --abort" to clear broken state) |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
119 |
[255] |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
120 |
|
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
121 |
$ hg histedit --abort |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
122 |
$ hg update --quiet --clean |
45c3086880c7
histedit: suggest "histedit --abort" for inconsistent histedit state
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19048
diff
changeset
|
123 |
|
19040
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
124 |
Test that missing revisions are detected |
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
125 |
--------------------------------------- |
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
126 |
|
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
127 |
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF |
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
128 |
> pick eb57da33312f 2 three |
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
129 |
> pick 08d98a8350f3 4 five |
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
130 |
> EOF |
19048
1163ff06ce89
histedit: more precise user message when changeset is missing
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19047
diff
changeset
|
131 |
abort: missing rules for changeset c8e68270e35a |
1163ff06ce89
histedit: more precise user message when changeset is missing
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19047
diff
changeset
|
132 |
(do you want to use the drop action?) |
19040
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
133 |
[255] |
7eb6bfe0b5a2
histedit-test: test that missing revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19039
diff
changeset
|
134 |
|
19041
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
135 |
Test that extra revisions are detected |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
136 |
--------------------------------------- |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
137 |
|
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
138 |
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
139 |
> pick 6058cbb6cfd7 0 one |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
140 |
> pick c8e68270e35a 3 four |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
141 |
> pick 08d98a8350f3 4 five |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
142 |
> EOF |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
143 |
abort: may not use changesets other than the ones listed |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
144 |
[255] |
3b52b15e0b3d
histedit-test: test that extra revisions are detected
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19040
diff
changeset
|
145 |
|
19042
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
146 |
Test malformed line |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
147 |
--------------------------------------- |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
148 |
|
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
149 |
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
150 |
> pickeb57da33312f2three |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
151 |
> pick c8e68270e35a 3 four |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
152 |
> pick 08d98a8350f3 4 five |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
153 |
> EOF |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
154 |
abort: malformed line "pickeb57da33312f2three" |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
155 |
[255] |
52366b37f897
histedit-test: test malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19041
diff
changeset
|
156 |
|
19043
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
157 |
Test unknown changeset |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
158 |
--------------------------------------- |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
159 |
|
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
160 |
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
161 |
> pick 0123456789ab 2 three |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
162 |
> pick c8e68270e35a 3 four |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
163 |
> pick 08d98a8350f3 4 five |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
164 |
> EOF |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
165 |
abort: unknown changeset 0123456789ab listed |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
166 |
[255] |
7d27d80185f0
histedit-test: test unknown changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19042
diff
changeset
|
167 |
|
19044
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
168 |
Test unknown command |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
169 |
--------------------------------------- |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
170 |
|
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
171 |
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
172 |
> coin eb57da33312f 2 three |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
173 |
> pick c8e68270e35a 3 four |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
174 |
> pick 08d98a8350f3 4 five |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
175 |
> EOF |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
176 |
abort: unknown action "coin" |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
177 |
[255] |
f77c23ec09f7
histedit-test: test unknown command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19043
diff
changeset
|
178 |
|
19047
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
179 |
Test duplicated changeset |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
180 |
--------------------------------------- |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
181 |
|
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
182 |
So one is missing and one appear twice. |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
183 |
|
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
184 |
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
185 |
> pick eb57da33312f 2 three |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
186 |
> pick eb57da33312f 2 three |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
187 |
> pick 08d98a8350f3 4 five |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
188 |
> EOF |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
189 |
abort: duplicated command for changeset eb57da33312f |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
190 |
[255] |
81de87f8b480
histedit: protect against duplicated entries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19044
diff
changeset
|
191 |
|
19039
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
192 |
Test short version of command |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
193 |
--------------------------------------- |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
194 |
|
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
195 |
Note: we use varying amounts of white space between command name and changeset |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
196 |
short hash. This tests issue3893. |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
197 |
|
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
198 |
$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
199 |
> pick eb57da33312f 2 three |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
200 |
> p c8e68270e35a 3 four |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
201 |
> f 08d98a8350f3 4 five |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
202 |
> EOF |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
203 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
204 |
reverting alpha |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
205 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
206 |
four |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
207 |
*** |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
208 |
five |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
209 |
|
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
210 |
|
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
211 |
|
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
212 |
HG: Enter commit message. Lines beginning with 'HG:' are removed. |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
213 |
HG: Leave message empty to abort commit. |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
214 |
HG: -- |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
215 |
HG: user: test |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
216 |
HG: branch 'default' |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
217 |
HG: changed alpha |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
218 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
219 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
41669a18a7d6
histedit: handle multiple spaces between action and hash (issue3893)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19035
diff
changeset
|
220 |
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
20806
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
221 |
|
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
222 |
$ hg update -q 2 |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
223 |
$ echo x > x |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
224 |
$ hg add x |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
225 |
$ hg commit -m'x' x |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
226 |
created new head |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
227 |
$ hg histedit -r 'heads(all())' |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
228 |
abort: The specified revisions must have exactly one common root |
d66862b87ae6
histedit: select the lowest rev when looking for a root in a revset (bc)
David Soria Parra <davidsp@fb.com>
parents:
20511
diff
changeset
|
229 |
[255] |