Mercurial > hg
annotate tests/test-histedit-edit.t @ 26354:c1fb2cab6260
clone: check update rev for being True
In 30be3aeb5344, there was an attempt to fallback to looking up the update
revision assuming it was always a rev but the documentation states:
True means update to default rev, anything else is treated as a revision
Therefore, we should only fallback to looking up the update rev if it is not
True. This bug was found in hg-git and I couldn't think of a test that does
this in pure Mercurial since the source repository is checked for the revision
as well (and therefore gracefully falls back).
author | Sean Farley <sean@farley.io> |
---|---|
date | Thu, 24 Sep 2015 15:52:11 -0700 |
parents | 43906060a3f4 |
children | 56b2bcea2529 |
rev | line source |
---|---|
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
1 $ . "$TESTDIR/histedit-helpers.sh" |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
2 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
4 > [extensions] |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
5 > histedit= |
24111
11d72683f3de
histedit: don't allow to strip nodes which are necessary to continue histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
23835
diff
changeset
|
6 > strip= |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
7 > EOF |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
8 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
9 $ initrepo () |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
10 > { |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
11 > hg init r |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
12 > cd r |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
13 > for x in a b c d e f g; do |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
14 > echo $x > $x |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
15 > hg add $x |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
16 > hg ci -m $x |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
17 > done |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
18 > } |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
19 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
20 $ initrepo |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
21 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
22 log before edit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
23 $ hg log --graph |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
24 @ changeset: 6:3c6a8ed2ebe8 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
25 | tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
26 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
27 | date: Thu Jan 01 00:00:00 1970 +0000 |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
28 | summary: g |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
29 | |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
30 o changeset: 5:652413bf663e |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
31 | user: test |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
32 | date: Thu Jan 01 00:00:00 1970 +0000 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
33 | summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
34 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
35 o changeset: 4:e860deea161a |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
36 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
37 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
38 | summary: e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
39 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
40 o changeset: 3:055a42cdd887 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
41 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
42 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
43 | summary: d |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
44 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
45 o changeset: 2:177f92b77385 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
46 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
47 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
48 | summary: c |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
49 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
50 o changeset: 1:d2ae7f538514 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
51 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
52 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
53 | summary: b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
54 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
55 o changeset: 0:cb9a9f314b8b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
56 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
57 date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
58 summary: a |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
59 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
60 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
61 edit the history |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
62 $ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
63 > pick 177f92b77385 c |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
64 > pick 055a42cdd887 d |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
65 > edit e860deea161a e |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
66 > pick 652413bf663e f |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
67 > pick 3c6a8ed2ebe8 g |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
68 > EOF |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
69 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18913
diff
changeset
|
70 Make changes as needed, you may commit or record as needed now. |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
71 When you are finished, run hg histedit --continue to resume. |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
72 |
24920 | 73 edit the plan via the editor |
24933
5bc506ee87d2
histedit: fix test-histedit-edit on vfat
Durham Goode <durham@fb.com>
parents:
24920
diff
changeset
|
74 $ cat >> $TESTTMP/editplan.sh <<EOF |
24920 | 75 > cat > \$1 <<EOF2 |
76 > drop e860deea161a e | |
77 > drop 652413bf663e f | |
78 > drop 3c6a8ed2ebe8 g | |
79 > EOF2 | |
80 > EOF | |
24933
5bc506ee87d2
histedit: fix test-histedit-edit on vfat
Durham Goode <durham@fb.com>
parents:
24920
diff
changeset
|
81 $ HGEDITOR="sh $TESTTMP/editplan.sh" hg histedit --edit-plan |
24920 | 82 $ cat .hg/histedit-state |
83 v1 | |
84 055a42cdd88768532f9cf79daa407fc8d138de9b | |
85 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
86 False | |
87 3 | |
88 drop | |
89 e860deea161a2f77de56603b340ebbb4536308ae | |
90 drop | |
91 652413bf663ef2a641cab26574e46d5f5a64a55a | |
92 drop | |
93 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
94 0 | |
95 strip-backup/177f92b77385-0ebe6a8f-histedit.hg | |
96 | |
97 edit the plan via --commands | |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
98 $ hg histedit --edit-plan --commands - 2>&1 << EOF |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
99 > edit e860deea161a e |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
100 > pick 652413bf663e f |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
101 > drop 3c6a8ed2ebe8 g |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
102 > EOF |
24920 | 103 $ cat .hg/histedit-state |
104 v1 | |
105 055a42cdd88768532f9cf79daa407fc8d138de9b | |
106 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
107 False | |
108 3 | |
109 edit | |
110 e860deea161a2f77de56603b340ebbb4536308ae | |
111 pick | |
112 652413bf663ef2a641cab26574e46d5f5a64a55a | |
113 drop | |
114 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
115 0 | |
116 strip-backup/177f92b77385-0ebe6a8f-histedit.hg | |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
117 |
17749
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
118 Go at a random point and try to continue |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
119 |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
120 $ hg id -n |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
121 3+ |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
122 $ hg up 0 |
19479
11664641fbad
histedit: add checkunfinished support (issue3955)
Matt Mackall <mpm@selenic.com>
parents:
19215
diff
changeset
|
123 abort: histedit in progress |
11664641fbad
histedit: add checkunfinished support (issue3955)
Matt Mackall <mpm@selenic.com>
parents:
19215
diff
changeset
|
124 (use 'hg histedit --continue' or 'hg histedit --abort') |
17749
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
125 [255] |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
126 |
24111
11d72683f3de
histedit: don't allow to strip nodes which are necessary to continue histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
23835
diff
changeset
|
127 Try to delete necessary commit |
24626
e767f5aba810
histedit: fix preventing strips during histedit
Durham Goode <durham@fb.com>
parents:
24299
diff
changeset
|
128 $ hg strip -r 652413b |
e767f5aba810
histedit: fix preventing strips during histedit
Durham Goode <durham@fb.com>
parents:
24299
diff
changeset
|
129 abort: histedit in progress, can't strip 652413bf663e |
24111
11d72683f3de
histedit: don't allow to strip nodes which are necessary to continue histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
23835
diff
changeset
|
130 [255] |
11d72683f3de
histedit: don't allow to strip nodes which are necessary to continue histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
23835
diff
changeset
|
131 |
19496
607191a45f8c
checkunfinished: accommodate histedit quirk
Matt Mackall <mpm@selenic.com>
parents:
19479
diff
changeset
|
132 commit, then edit the revision |
607191a45f8c
checkunfinished: accommodate histedit quirk
Matt Mackall <mpm@selenic.com>
parents:
19479
diff
changeset
|
133 $ hg ci -m 'wat' |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
134 created new head |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
135 $ echo a > e |
24299
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
136 |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
137 qnew should fail while we're in the middle of the edit step |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
138 |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
139 $ hg --config extensions.mq= qnew please-fail |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
140 abort: histedit in progress |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
141 (use 'hg histedit --continue' or 'hg histedit --abort') |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
142 [255] |
17087
a79776f427b4
tests: make histedit pass on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17086
diff
changeset
|
143 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
144 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
145 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
146 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
147 $ hg log --graph |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
148 @ changeset: 6:b5f70786f9b0 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
149 | tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
150 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
151 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
152 | summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
153 | |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
154 o changeset: 5:a5e1ba2f7afb |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
155 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
156 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
157 | summary: foobaz |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
158 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
159 o changeset: 4:1a60820cd1f6 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
160 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
161 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
162 | summary: wat |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
163 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
164 o changeset: 3:055a42cdd887 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
165 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
166 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
167 | summary: d |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
168 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
169 o changeset: 2:177f92b77385 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
170 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
171 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
172 | summary: c |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
173 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
174 o changeset: 1:d2ae7f538514 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
175 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
176 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
177 | summary: b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
178 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
179 o changeset: 0:cb9a9f314b8b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
180 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
181 date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
182 summary: a |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
183 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
184 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
185 $ hg cat e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
186 a |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
187 |
24757
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
188 Stripping necessary commits should not break --abort |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
189 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
190 $ hg histedit 1a60820cd1f6 --commands - 2>&1 << EOF| fixbundle |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
191 > edit 1a60820cd1f6 wat |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
192 > pick a5e1ba2f7afb foobaz |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
193 > pick b5f70786f9b0 g |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
194 > EOF |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
195 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
196 Make changes as needed, you may commit or record as needed now. |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
197 When you are finished, run hg histedit --continue to resume. |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
198 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
199 $ mv .hg/histedit-state .hg/histedit-state.bak |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
200 $ hg strip -q -r b5f70786f9b0 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
201 $ mv .hg/histedit-state.bak .hg/histedit-state |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
202 $ hg histedit --abort |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
203 adding changesets |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
204 adding manifests |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
205 adding file changes |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
206 added 1 changesets with 1 changes to 3 files |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
207 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
208 $ hg log -r . |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
209 changeset: 6:b5f70786f9b0 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
210 tag: tip |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
211 user: test |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
212 date: Thu Jan 01 00:00:00 1970 +0000 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
213 summary: f |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
214 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
215 |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
216 check histedit_source |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
217 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
218 $ hg log --debug --rev 5 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
219 changeset: 5:a5e1ba2f7afb899ef1581cea528fd885d2fca70d |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
220 phase: draft |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
221 parent: 4:1a60820cd1f6004a362aa622ebc47d59bc48eb34 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
222 parent: -1:0000000000000000000000000000000000000000 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
223 manifest: 5:5ad3be8791f39117565557781f5464363b918a45 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
224 user: test |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
225 date: Thu Jan 01 00:00:00 1970 +0000 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
226 files: e |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
227 extra: branch=default |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
228 extra: histedit_source=e860deea161a2f77de56603b340ebbb4536308ae |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
229 description: |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
230 foobaz |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
231 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
232 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
233 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
234 $ hg histedit tip --commands - 2>&1 <<EOF| fixbundle |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
235 > edit b5f70786f9b0 f |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
236 > EOF |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
237 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18913
diff
changeset
|
238 Make changes as needed, you may commit or record as needed now. |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
239 When you are finished, run hg histedit --continue to resume. |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
240 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
241 A f |
19213
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
242 |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
243 $ hg summary |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
244 parent: 5:a5e1ba2f7afb |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
245 foobaz |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
246 branch: default |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
247 commit: 1 added (new branch head) |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
248 update: 1 new changesets (update) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
249 phases: 7 draft |
19215
f184fe1e2ac5
summary: add a histedit hook
Bryan O'Sullivan <bryano@fb.com>
parents:
19213
diff
changeset
|
250 hist: 1 remaining (histedit --continue) |
19213
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
251 |
21409
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
252 (test also that editor is invoked if histedit is continued for |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
253 "edit" action) |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
254 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
255 $ HGEDITOR='cat' hg histedit --continue |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
256 f |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
257 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
258 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
259 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
260 HG: Leave message empty to abort commit. |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
261 HG: -- |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
262 HG: user: test |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
263 HG: branch 'default' |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
264 HG: added f |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
265 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
21930
diff
changeset
|
266 saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-backup.hg (glob) |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
267 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
268 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
269 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
270 log after edit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
271 $ hg log --limit 1 |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
272 changeset: 6:a107ee126658 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
273 tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
274 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
275 date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
276 summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
277 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
278 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
279 say we'll change the message, but don't. |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
280 $ cat > ../edit.sh <<EOF |
17086
5f2cacb715dc
tests: make histedit tests more resilient to filesystem variation
Mads Kiilerich <mads@kiilerich.com>
parents:
17085
diff
changeset
|
281 > cat "\$1" | sed s/pick/mess/ > tmp |
5f2cacb715dc
tests: make histedit tests more resilient to filesystem variation
Mads Kiilerich <mads@kiilerich.com>
parents:
17085
diff
changeset
|
282 > mv tmp "\$1" |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
283 > EOF |
17086
5f2cacb715dc
tests: make histedit tests more resilient to filesystem variation
Mads Kiilerich <mads@kiilerich.com>
parents:
17085
diff
changeset
|
284 $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
285 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
287 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
288 $ hg log --limit 1 |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
289 changeset: 6:1fd3b2fe7754 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
290 tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
291 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
292 date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
293 summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
294 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
295 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
296 modify the message |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
297 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
298 check saving last-message.txt, at first |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
299 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
300 $ cat > $TESTTMP/commitfailure.py <<EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
301 > from mercurial import util |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
302 > def reposetup(ui, repo): |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
303 > class commitfailure(repo.__class__): |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
304 > def commit(self, *args, **kwargs): |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
305 > raise util.Abort('emulating unexpected abort') |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
306 > repo.__class__ = commitfailure |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
307 > EOF |
21233
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
308 $ cat >> .hg/hgrc <<EOF |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
309 > [extensions] |
21233
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
310 > # this failure occurs before editor invocation |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
311 > commitfailure = $TESTTMP/commitfailure.py |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
312 > EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
313 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
314 $ cat > $TESTTMP/editor.sh <<EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
315 > echo "==== before editing" |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
316 > cat \$1 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
317 > echo "====" |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
318 > echo "check saving last-message.txt" >> \$1 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
319 > EOF |
21233
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
320 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
321 (test that editor is not invoked before transaction starting) |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
322 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
323 $ rm -f .hg/last-message.txt |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
324 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | fixbundle |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
325 > mess 1fd3b2fe7754 f |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
326 > EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
328 abort: emulating unexpected abort |
21930
a5168eb9b2bc
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21409
diff
changeset
|
329 $ test -f .hg/last-message.txt |
21233
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
330 [1] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
331 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
332 $ cat >> .hg/hgrc <<EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
333 > [extensions] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
334 > commitfailure = ! |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
335 > EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
336 $ hg histedit --abort -q |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
337 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
338 (test that editor is invoked and commit message is saved into |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
339 "last-message.txt") |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
340 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
341 $ cat >> .hg/hgrc <<EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
342 > [hooks] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
343 > # this failure occurs after editor invocation |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
344 > pretxncommit.unexpectedabort = false |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
345 > EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
346 |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
347 $ hg status --rev '1fd3b2fe7754^1' --rev 1fd3b2fe7754 |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
348 A f |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
349 |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
350 $ rm -f .hg/last-message.txt |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
351 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
352 > mess 1fd3b2fe7754 f |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
353 > EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
354 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
355 adding f |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
356 ==== before editing |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
357 f |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
358 |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
359 |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
360 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
361 HG: Leave message empty to abort commit. |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
362 HG: -- |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
363 HG: user: test |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
364 HG: branch 'default' |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
365 HG: added f |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
366 ==== |
21233
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
367 transaction abort! |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
368 rollback completed |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
369 note: commit message saved in .hg/last-message.txt |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
370 abort: pretxncommit.unexpectedabort hook exited with status 1 |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
371 [255] |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
372 $ cat .hg/last-message.txt |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
373 f |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
374 |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
375 |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
376 check saving last-message.txt |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
377 |
21409
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
378 (test also that editor is invoked if histedit is continued for "message" |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
379 action) |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
380 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
381 $ HGEDITOR=cat hg histedit --continue |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
382 f |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
383 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
384 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
385 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
386 HG: Leave message empty to abort commit. |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
387 HG: -- |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
388 HG: user: test |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
389 HG: branch 'default' |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
390 HG: added f |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
391 transaction abort! |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
392 rollback completed |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
393 note: commit message saved in .hg/last-message.txt |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
394 abort: pretxncommit.unexpectedabort hook exited with status 1 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
395 [255] |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
396 |
21233
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
397 $ cat >> .hg/hgrc <<EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
398 > [hooks] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
399 > pretxncommit.unexpectedabort = |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
400 > EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
401 $ hg histedit --abort -q |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
402 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
403 then, check "modify the message" itself |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
404 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
405 $ hg histedit tip --commands - 2>&1 << EOF | fixbundle |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
406 > mess 1fd3b2fe7754 f |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
407 > EOF |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
408 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
409 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
410 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
411 $ hg log --limit 1 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
412 changeset: 6:62feedb1200e |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
413 tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
414 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
415 date: Thu Jan 01 00:00:00 1970 +0000 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
416 summary: f |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
417 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
418 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
419 rollback should not work after a histedit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
420 $ hg rollback |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
421 no rollback information available |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
422 [1] |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
423 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
424 $ cd .. |
18913
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
425 $ hg clone -qr0 r r0 |
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
426 $ cd r0 |
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
427 $ hg phase -fdr0 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
428 $ hg histedit --commands - 0 2>&1 << EOF |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
429 > edit cb9a9f314b8b a > $EDITED |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
430 > EOF |
18913
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
431 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
432 adding a |
18942
6891e361bec6
histedit: update tests for new intervention framework
Matt Mackall <mpm@selenic.com>
parents:
18934
diff
changeset
|
433 Make changes as needed, you may commit or record as needed now. |
18913
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
434 When you are finished, run hg histedit --continue to resume. |
18942
6891e361bec6
histedit: update tests for new intervention framework
Matt Mackall <mpm@selenic.com>
parents:
18934
diff
changeset
|
435 [1] |
18913
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
436 $ HGEDITOR=true hg histedit --continue |
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
437 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
21930
diff
changeset
|
438 saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob) |
25451
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
439 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
440 $ hg log -G |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
441 @ changeset: 0:0efcea34f18a |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
442 tag: tip |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
443 user: test |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
444 date: Thu Jan 01 00:00:00 1970 +0000 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
445 summary: a |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
446 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
447 $ echo foo >> b |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
448 $ hg addr |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
449 adding b |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
450 $ hg ci -m 'add b' |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
451 $ echo foo >> a |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
452 $ hg ci -m 'extend a' |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
453 $ hg phase --public 1 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
454 Attempting to fold a change into a public change should not work: |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
455 $ cat > ../edit.sh <<EOF |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
456 > cat "\$1" | sed s/pick/fold/ > tmp |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
457 > mv tmp "\$1" |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
458 > EOF |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
459 $ HGEDITOR="sh ../edit.sh" hg histedit 2 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
460 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
461 reverting a |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
462 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
25452
43906060a3f4
histedit: abort rather than edit a public changeset (issue4704)
Augie Fackler <augie@google.com>
parents:
25451
diff
changeset
|
463 abort: cannot fold into public change 18aa70c8ad22 |
43906060a3f4
histedit: abort rather than edit a public changeset (issue4704)
Augie Fackler <augie@google.com>
parents:
25451
diff
changeset
|
464 [255] |
43906060a3f4
histedit: abort rather than edit a public changeset (issue4704)
Augie Fackler <augie@google.com>
parents:
25451
diff
changeset
|
465 TODO: this abort shouldn't be required, but it is for now to leave the repo in |
43906060a3f4
histedit: abort rather than edit a public changeset (issue4704)
Augie Fackler <augie@google.com>
parents:
25451
diff
changeset
|
466 a clean state. |
43906060a3f4
histedit: abort rather than edit a public changeset (issue4704)
Augie Fackler <augie@google.com>
parents:
25451
diff
changeset
|
467 $ hg histedit --abort |