Mercurial > hg
annotate tests/test-histedit-edit.t @ 28945:05982f7ab231
py3: use absolute_import in revlog-formatv0.py
author | Robert Stanca <robert.stanca7@gmail.com> |
---|---|
date | Sat, 16 Apr 2016 05:33:23 +0300 |
parents | 468339891670 |
children | 37ab9e20991c |
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 |
27544
a4f008612727
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org>
parents:
27542
diff
changeset
|
60 dirty a file |
a4f008612727
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org>
parents:
27542
diff
changeset
|
61 $ echo a > g |
a4f008612727
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org>
parents:
27542
diff
changeset
|
62 $ hg histedit 177f92b77385 --commands - 2>&1 << EOF |
a4f008612727
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org>
parents:
27542
diff
changeset
|
63 > EOF |
a4f008612727
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org>
parents:
27542
diff
changeset
|
64 abort: uncommitted changes |
a4f008612727
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org>
parents:
27542
diff
changeset
|
65 [255] |
a4f008612727
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org>
parents:
27542
diff
changeset
|
66 $ echo g > g |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
67 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
68 edit the history |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
69 $ 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
|
70 > pick 177f92b77385 c |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
71 > pick 055a42cdd887 d |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
72 > edit e860deea161a e |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
73 > pick 652413bf663e f |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
74 > pick 3c6a8ed2ebe8 g |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
75 > EOF |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
76 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
27629
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
77 Editing (e860deea161a), you may commit or record as needed now. |
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
78 (hg histedit --continue to resume) |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
79 |
28890
468339891670
tests: ensure that 'hg update' is disabled during histedit (issue3655)
Jason Gauci <jjg@fb.com>
parents:
28396
diff
changeset
|
80 try to update and get an error |
468339891670
tests: ensure that 'hg update' is disabled during histedit (issue3655)
Jason Gauci <jjg@fb.com>
parents:
28396
diff
changeset
|
81 $ hg update tip |
468339891670
tests: ensure that 'hg update' is disabled during histedit (issue3655)
Jason Gauci <jjg@fb.com>
parents:
28396
diff
changeset
|
82 abort: histedit in progress |
468339891670
tests: ensure that 'hg update' is disabled during histedit (issue3655)
Jason Gauci <jjg@fb.com>
parents:
28396
diff
changeset
|
83 (use 'hg histedit --continue' or 'hg histedit --abort') |
468339891670
tests: ensure that 'hg update' is disabled during histedit (issue3655)
Jason Gauci <jjg@fb.com>
parents:
28396
diff
changeset
|
84 [255] |
468339891670
tests: ensure that 'hg update' is disabled during histedit (issue3655)
Jason Gauci <jjg@fb.com>
parents:
28396
diff
changeset
|
85 |
24920 | 86 edit the plan via the editor |
24933
5bc506ee87d2
histedit: fix test-histedit-edit on vfat
Durham Goode <durham@fb.com>
parents:
24920
diff
changeset
|
87 $ cat >> $TESTTMP/editplan.sh <<EOF |
24920 | 88 > cat > \$1 <<EOF2 |
89 > drop e860deea161a e | |
90 > drop 652413bf663e f | |
91 > drop 3c6a8ed2ebe8 g | |
92 > EOF2 | |
93 > EOF | |
24933
5bc506ee87d2
histedit: fix test-histedit-edit on vfat
Durham Goode <durham@fb.com>
parents:
24920
diff
changeset
|
94 $ HGEDITOR="sh $TESTTMP/editplan.sh" hg histedit --edit-plan |
24920 | 95 $ cat .hg/histedit-state |
96 v1 | |
97 055a42cdd88768532f9cf79daa407fc8d138de9b | |
98 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
99 False | |
100 3 | |
101 drop | |
102 e860deea161a2f77de56603b340ebbb4536308ae | |
103 drop | |
104 652413bf663ef2a641cab26574e46d5f5a64a55a | |
105 drop | |
106 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
107 0 | |
108 strip-backup/177f92b77385-0ebe6a8f-histedit.hg | |
109 | |
110 edit the plan via --commands | |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
111 $ 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
|
112 > edit e860deea161a e |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
113 > pick 652413bf663e f |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
114 > drop 3c6a8ed2ebe8 g |
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
115 > EOF |
24920 | 116 $ cat .hg/histedit-state |
117 v1 | |
118 055a42cdd88768532f9cf79daa407fc8d138de9b | |
119 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
120 False | |
121 3 | |
122 edit | |
123 e860deea161a2f77de56603b340ebbb4536308ae | |
124 pick | |
125 652413bf663ef2a641cab26574e46d5f5a64a55a | |
126 drop | |
127 3c6a8ed2ebe862cc949d2caa30775dd6f16fb799 | |
128 0 | |
129 strip-backup/177f92b77385-0ebe6a8f-histedit.hg | |
24142
be7cb25186be
histedit: add --edit-plan option to histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
24111
diff
changeset
|
130 |
17749
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
131 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
|
132 |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
133 $ hg id -n |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
134 3+ |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
135 $ hg up 0 |
19479
11664641fbad
histedit: add checkunfinished support (issue3955)
Matt Mackall <mpm@selenic.com>
parents:
19215
diff
changeset
|
136 abort: histedit in progress |
11664641fbad
histedit: add checkunfinished support (issue3955)
Matt Mackall <mpm@selenic.com>
parents:
19215
diff
changeset
|
137 (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
|
138 [255] |
40601f2b7608
histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17087
diff
changeset
|
139 |
24111
11d72683f3de
histedit: don't allow to strip nodes which are necessary to continue histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
23835
diff
changeset
|
140 Try to delete necessary commit |
24626
e767f5aba810
histedit: fix preventing strips during histedit
Durham Goode <durham@fb.com>
parents:
24299
diff
changeset
|
141 $ hg strip -r 652413b |
e767f5aba810
histedit: fix preventing strips during histedit
Durham Goode <durham@fb.com>
parents:
24299
diff
changeset
|
142 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
|
143 [255] |
11d72683f3de
histedit: don't allow to strip nodes which are necessary to continue histedit
Mateusz Kwapich <mitrandir@fb.com>
parents:
23835
diff
changeset
|
144 |
19496
607191a45f8c
checkunfinished: accommodate histedit quirk
Matt Mackall <mpm@selenic.com>
parents:
19479
diff
changeset
|
145 commit, then edit the revision |
607191a45f8c
checkunfinished: accommodate histedit quirk
Matt Mackall <mpm@selenic.com>
parents:
19479
diff
changeset
|
146 $ hg ci -m 'wat' |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
147 created new head |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
148 $ 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
|
149 |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
150 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
|
151 |
68d998a76994
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)
Augie Fackler <augie@google.com>
parents:
24196
diff
changeset
|
152 $ 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
|
153 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
|
154 (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
|
155 [255] |
17087
a79776f427b4
tests: make histedit pass on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17086
diff
changeset
|
156 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
157 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
158 $ hg log --graph |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
159 @ changeset: 6:b5f70786f9b0 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
160 | tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
161 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
162 | 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
|
163 | summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
164 | |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
165 o changeset: 5:a5e1ba2f7afb |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
166 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
167 | 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
|
168 | summary: foobaz |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
169 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
170 o changeset: 4:1a60820cd1f6 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
171 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
172 | 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
|
173 | summary: wat |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
174 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
175 o changeset: 3:055a42cdd887 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
176 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
177 | 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
|
178 | summary: d |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
179 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
180 o changeset: 2:177f92b77385 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
181 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
182 | 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
|
183 | summary: c |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
184 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
185 o changeset: 1:d2ae7f538514 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
186 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
187 | 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
|
188 | summary: b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
189 | |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
190 o changeset: 0:cb9a9f314b8b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
191 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
192 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
|
193 summary: a |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
194 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
195 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
196 $ hg cat e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
197 a |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
198 |
24757
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
199 Stripping necessary commits should not break --abort |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
200 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
201 $ hg histedit 1a60820cd1f6 --commands - 2>&1 << EOF| fixbundle |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
202 > edit 1a60820cd1f6 wat |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
203 > pick a5e1ba2f7afb foobaz |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
204 > pick b5f70786f9b0 g |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
205 > EOF |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
206 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
27629
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
207 Editing (1a60820cd1f6), you may commit or record as needed now. |
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
208 (hg histedit --continue to resume) |
24757
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
209 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
210 $ mv .hg/histedit-state .hg/histedit-state.bak |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
211 $ hg strip -q -r b5f70786f9b0 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
212 $ mv .hg/histedit-state.bak .hg/histedit-state |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
213 $ hg histedit --abort |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
214 adding changesets |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
215 adding manifests |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
216 adding file changes |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
217 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
|
218 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
|
219 $ hg log -r . |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
220 changeset: 6:b5f70786f9b0 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
221 tag: tip |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
222 user: test |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
223 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
|
224 summary: f |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
225 |
7b59f16174c5
histedit: store backup file before histedit
Durham Goode <durham@fb.com>
parents:
24626
diff
changeset
|
226 |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
227 check histedit_source |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
228 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
229 $ hg log --debug --rev 5 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
230 changeset: 5:a5e1ba2f7afb899ef1581cea528fd885d2fca70d |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
231 phase: draft |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
232 parent: 4:1a60820cd1f6004a362aa622ebc47d59bc48eb34 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
233 parent: -1:0000000000000000000000000000000000000000 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
234 manifest: 5:5ad3be8791f39117565557781f5464363b918a45 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
235 user: test |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
236 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
|
237 files: e |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
238 extra: branch=default |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
239 extra: histedit_source=e860deea161a2f77de56603b340ebbb4536308ae |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
240 description: |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
241 foobaz |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
242 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
243 |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
244 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
245 $ 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
|
246 > edit b5f70786f9b0 f |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
247 > EOF |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
248 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
27629
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
249 Editing (b5f70786f9b0), you may commit or record as needed now. |
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
250 (hg histedit --continue to resume) |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
251 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
252 A f |
19213
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
253 |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
254 $ hg summary |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
255 parent: 5:a5e1ba2f7afb |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
256 foobaz |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
257 branch: default |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
19019
diff
changeset
|
258 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
|
259 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
|
260 phases: 7 draft |
19215
f184fe1e2ac5
summary: add a histedit hook
Bryan O'Sullivan <bryano@fb.com>
parents:
19213
diff
changeset
|
261 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
|
262 |
21409
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
263 (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
|
264 "edit" action) |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
265 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
266 $ 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
|
267 f |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
268 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
269 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
270 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
|
271 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
|
272 HG: -- |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
273 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
|
274 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
|
275 HG: added f |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
21930
diff
changeset
|
276 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
|
277 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
278 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
279 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
280 log after edit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
281 $ hg log --limit 1 |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
282 changeset: 6:a107ee126658 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
283 tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
284 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
285 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
|
286 summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
287 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
288 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
289 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
|
290 $ cat > ../edit.sh <<EOF |
17086
5f2cacb715dc
tests: make histedit tests more resilient to filesystem variation
Mads Kiilerich <mads@kiilerich.com>
parents:
17085
diff
changeset
|
291 > 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
|
292 > mv tmp "\$1" |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
293 > EOF |
17086
5f2cacb715dc
tests: make histedit tests more resilient to filesystem variation
Mads Kiilerich <mads@kiilerich.com>
parents:
17085
diff
changeset
|
294 $ 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
|
295 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
296 $ hg log --limit 1 |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17749
diff
changeset
|
297 changeset: 6:1fd3b2fe7754 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
298 tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
299 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
300 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
|
301 summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
302 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
303 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
304 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
|
305 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
306 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
|
307 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
308 $ cat > $TESTTMP/commitfailure.py <<EOF |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25452
diff
changeset
|
309 > from mercurial import error |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
310 > 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
|
311 > 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
|
312 > def commit(self, *args, **kwargs): |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25452
diff
changeset
|
313 > raise error.Abort('emulating unexpected abort') |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
314 > 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
|
315 > 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
|
316 $ 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
|
317 > [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
|
318 > # 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
|
319 > 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
|
320 > EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
321 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
322 $ 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
|
323 > 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
|
324 > 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
|
325 > echo "====" |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
326 > 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
|
327 > 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
|
328 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
329 (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
|
330 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
331 $ 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
|
332 $ 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
|
333 > 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
|
334 > EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
335 abort: emulating unexpected abort |
21930
a5168eb9b2bc
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21409
diff
changeset
|
336 $ 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
|
337 [1] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
338 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
339 $ 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
|
340 > [extensions] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
341 > commitfailure = ! |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
342 > EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
343 $ 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
|
344 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
345 (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
|
346 "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
|
347 |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
348 $ 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
|
349 > [hooks] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
350 > # 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
|
351 > 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
|
352 > EOF |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
353 |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
354 $ 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
|
355 A f |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
356 |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
357 $ 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
|
358 $ 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
|
359 > 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
|
360 > EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
361 ==== 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
|
362 f |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
363 |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
364 |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
365 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
|
366 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
|
367 HG: -- |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
368 HG: user: test |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
369 HG: branch 'default' |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
370 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
|
371 ==== |
26998
4414d500604f
localrepo: put bookmark move following commit in one transaction
Laurent Charignon <lcharignon@fb.com>
parents:
26587
diff
changeset
|
372 note: commit message saved in .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
|
373 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
|
374 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
|
375 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
|
376 [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
|
377 $ 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
|
378 f |
21407
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
379 |
47bfe5d433ac
histedit: use the editor gotten by "getcommiteditor()" for "message"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21233
diff
changeset
|
380 |
21028
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
381 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
|
382 |
21409
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
383 (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
|
384 action) |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
385 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
386 $ 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
|
387 f |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
388 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
389 |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
390 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
|
391 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
|
392 HG: -- |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
393 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
|
394 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
|
395 HG: added f |
26998
4414d500604f
localrepo: put bookmark move following commit in one transaction
Laurent Charignon <lcharignon@fb.com>
parents:
26587
diff
changeset
|
396 note: commit message saved in .hg/last-message.txt |
21409
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
397 transaction abort! |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
398 rollback completed |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
399 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
|
400 [255] |
37a3ac247c0d
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21407
diff
changeset
|
401 |
21233
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
402 $ 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
|
403 > [hooks] |
213fd1a99cd9
histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21028
diff
changeset
|
404 > 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
|
405 > EOF |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
406 $ 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
|
407 |
a0f437e2f5a9
histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
408 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
|
409 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
410 $ 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
|
411 > mess 1fd3b2fe7754 f |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
412 > EOF |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
413 $ hg status |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
414 $ hg log --limit 1 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
415 changeset: 6:62feedb1200e |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
416 tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
417 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
418 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
|
419 summary: f |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
420 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
421 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
422 rollback should not work after a histedit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
423 $ hg rollback |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
424 no rollback information available |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
425 [1] |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
426 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17067
diff
changeset
|
427 $ cd .. |
18913
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
428 $ hg clone -qr0 r r0 |
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
429 $ cd r0 |
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
430 $ hg phase -fdr0 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
431 $ 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
|
432 > edit cb9a9f314b8b a > $EDITED |
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18942
diff
changeset
|
433 > EOF |
18913
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
434 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
|
435 adding a |
27629
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
436 Editing (cb9a9f314b8b), you may commit or record as needed now. |
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
437 (hg histedit --continue to resume) |
18942
6891e361bec6
histedit: update tests for new intervention framework
Matt Mackall <mpm@selenic.com>
parents:
18934
diff
changeset
|
438 [1] |
18913
79580b3140cd
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan <bryano@fb.com>
parents:
18609
diff
changeset
|
439 $ HGEDITOR=true hg histedit --continue |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
21930
diff
changeset
|
440 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
|
441 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
442 $ hg log -G |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
443 @ changeset: 0:0efcea34f18a |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
444 tag: tip |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
445 user: test |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
446 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
|
447 summary: a |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
448 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
449 $ echo foo >> b |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
450 $ hg addr |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
451 adding b |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
452 $ 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
|
453 $ echo foo >> a |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
454 $ 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
|
455 $ hg phase --public 1 |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
456 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
|
457 $ cat > ../edit.sh <<EOF |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
458 > 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
|
459 > mv tmp "\$1" |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
460 > EOF |
f0acc3e0bd32
test-histedit-edit: add test that demonstrates bug in issue4704
Augie Fackler <augie@google.com>
parents:
25382
diff
changeset
|
461 $ HGEDITOR="sh ../edit.sh" hg histedit 2 |
27171
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
462 warning: histedit rules saved to: .hg/histedit-last-edit.txt |
27545
a67d2e059a51
histedit: use parse-error exception for parsing
timeless <timeless@mozdev.org>
parents:
27544
diff
changeset
|
463 hg: parse error: cannot fold into public change 18aa70c8ad22 |
25452
43906060a3f4
histedit: abort rather than edit a public changeset (issue4704)
Augie Fackler <augie@google.com>
parents:
25451
diff
changeset
|
464 [255] |
27171
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
465 $ cat .hg/histedit-last-edit.txt |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
466 fold 0012be4a27ea 2 extend a |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
467 |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
468 # Edit history between 0012be4a27ea and 0012be4a27ea |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
469 # |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
470 # Commits are listed from least to most recent |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
471 # |
28396
5490b04e6132
histedit: adds hint how to reorder changesets at editor (issue3766)
liscju <piotr.listkiewicz@gmail.com>
parents:
28004
diff
changeset
|
472 # You can reorder changesets by reordering the lines |
5490b04e6132
histedit: adds hint how to reorder changesets at editor (issue3766)
liscju <piotr.listkiewicz@gmail.com>
parents:
28004
diff
changeset
|
473 # |
27171
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
474 # Commands: |
27674
78d86664e3a2
histedit: prefer edit commit, edit message, use commit
timeless <timeless@mozdev.org>
parents:
27629
diff
changeset
|
475 # |
78d86664e3a2
histedit: prefer edit commit, edit message, use commit
timeless <timeless@mozdev.org>
parents:
27629
diff
changeset
|
476 # e, edit = use commit, but stop for amending |
78d86664e3a2
histedit: prefer edit commit, edit message, use commit
timeless <timeless@mozdev.org>
parents:
27629
diff
changeset
|
477 # m, mess = edit commit message without changing commit content |
27171
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
478 # p, fold = use commit |
27674
78d86664e3a2
histedit: prefer edit commit, edit message, use commit
timeless <timeless@mozdev.org>
parents:
27629
diff
changeset
|
479 # d, drop = remove commit from history |
27171
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
480 # f, fold = use commit, but combine it with the one above |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
481 # r, roll = like fold, but discard this commit's description |
3028ea0aff46
histedit: mention histedit-last-edit.txt on abort
timeless <timeless@mozdev.org>
parents:
26998
diff
changeset
|
482 # |