author | Yuya Nishihara <yuya@tcha.org> |
Wed, 20 Jan 2016 00:08:00 +0900 | |
branch | stable |
changeset 27915 | 5f2a308bac94 |
parent 26998 | 4414d500604f |
child 31556 | 448acdee9161 |
permissions | -rw-r--r-- |
7296
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2990
diff
changeset
|
1 |
|
12466 | 2 |
$ catpatch() { |
3 |
> cat $1 | sed -e "s/^\(# Parent \).*/\1/" |
|
4 |
> } |
|
5 |
$ echo "[extensions]" >> $HGRCPATH |
|
6 |
$ echo "mq=" >> $HGRCPATH |
|
7 |
$ runtest() { |
|
8 |
> hg init mq |
|
9 |
> cd mq |
|
10 |
> |
|
11 |
> echo a > a |
|
12 |
> hg ci -Ama |
|
13 |
> |
|
14 |
> echo '% qnew should refuse bad patch names' |
|
15 |
> hg qnew series |
|
16 |
> hg qnew status |
|
17 |
> hg qnew guards |
|
14051
2b1226693c70
mq: add '.' and '..' to list of forbidden patch names
Idan Kamara <idankk86@gmail.com>
parents:
13197
diff
changeset
|
18 |
> hg qnew . |
2b1226693c70
mq: add '.' and '..' to list of forbidden patch names
Idan Kamara <idankk86@gmail.com>
parents:
13197
diff
changeset
|
19 |
> hg qnew .. |
12466 | 20 |
> hg qnew .hgignore |
21 |
> hg qnew .mqfoo |
|
22 |
> hg qnew 'foo#bar' |
|
23 |
> hg qnew 'foo:bar' |
|
25454
b5a8bc09b0db
mq: ban \r and \n in patch names (issue4711)
Augie Fackler <augie@google.com>
parents:
25453
diff
changeset
|
24 |
> hg qnew "`echo foo; echo bar`" |
12466 | 25 |
> |
26 |
> hg qinit -c |
|
27 |
> |
|
28 |
> echo '% qnew with name containing slash' |
|
12878
1634287b6ab1
qnew: give better feedback when doing 'hg qnew foo/' (issue2464)
Martin Geisler <mg@aragost.com>
parents:
12466
diff
changeset
|
29 |
> hg qnew foo/ |
12466 | 30 |
> hg qnew foo/bar.patch |
12879
da4a9ed369c8
qnew: distinguish between existing file and directory (issue2464)
Martin Geisler <mg@aragost.com>
parents:
12878
diff
changeset
|
31 |
> hg qnew foo |
12466 | 32 |
> hg qseries |
33 |
> hg qpop |
|
34 |
> hg qdelete foo/bar.patch |
|
35 |
> |
|
36 |
> echo '% qnew with uncommitted changes' |
|
37 |
> echo a > somefile |
|
38 |
> hg add somefile |
|
39 |
> hg qnew uncommitted.patch |
|
40 |
> hg st |
|
41 |
> hg qseries |
|
42 |
> |
|
43 |
> echo '% qnew implies add' |
|
44 |
> hg -R .hg/patches st |
|
45 |
> |
|
46 |
> echo '% qnew missing' |
|
47 |
> hg qnew missing.patch missing |
|
48 |
> |
|
49 |
> echo '% qnew -m' |
|
50 |
> hg qnew -m 'foo bar' mtest.patch |
|
51 |
> catpatch .hg/patches/mtest.patch |
|
52 |
> |
|
53 |
> echo '% qnew twice' |
|
54 |
> hg qnew first.patch |
|
55 |
> hg qnew first.patch |
|
56 |
> |
|
57 |
> touch ../first.patch |
|
58 |
> hg qimport ../first.patch |
|
59 |
> |
|
60 |
> echo '% qnew -f from a subdirectory' |
|
61 |
> hg qpop -a |
|
62 |
> mkdir d |
|
63 |
> cd d |
|
64 |
> echo b > b |
|
65 |
> hg ci -Am t |
|
66 |
> echo b >> b |
|
67 |
> hg st |
|
68 |
> hg qnew -g -f p |
|
69 |
> catpatch ../.hg/patches/p |
|
70 |
> |
|
71 |
> echo '% qnew -u with no username configured' |
|
72 |
> HGUSER= hg qnew -u blue red |
|
73 |
> catpatch ../.hg/patches/red |
|
74 |
> |
|
75 |
> echo '% qnew -e -u with no username configured' |
|
76 |
> HGUSER= hg qnew -e -u chartreuse fucsia |
|
77 |
> catpatch ../.hg/patches/fucsia |
|
78 |
> |
|
79 |
> echo '% fail when trying to import a merge' |
|
80 |
> hg init merge |
|
81 |
> cd merge |
|
82 |
> touch a |
|
83 |
> hg ci -Am null |
|
84 |
> echo a >> a |
|
85 |
> hg ci -m a |
|
86 |
> hg up -r 0 |
|
87 |
> echo b >> a |
|
88 |
> hg ci -m b |
|
89 |
> hg merge -f 1 |
|
90 |
> hg resolve --mark a |
|
91 |
> hg qnew -f merge |
|
92 |
> |
|
93 |
> cd ../../.. |
|
94 |
> rm -r mq |
|
95 |
> } |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
96 |
|
12466 | 97 |
plain headers |
7296
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2990
diff
changeset
|
98 |
|
12466 | 99 |
$ echo "[mq]" >> $HGRCPATH |
100 |
$ echo "plain=true" >> $HGRCPATH |
|
101 |
$ mkdir sandbox |
|
102 |
$ (cd sandbox ; runtest) |
|
103 |
adding a |
|
104 |
% qnew should refuse bad patch names |
|
105 |
abort: "series" cannot be used as the name of a patch |
|
106 |
abort: "status" cannot be used as the name of a patch |
|
107 |
abort: "guards" cannot be used as the name of a patch |
|
14051
2b1226693c70
mq: add '.' and '..' to list of forbidden patch names
Idan Kamara <idankk86@gmail.com>
parents:
13197
diff
changeset
|
108 |
abort: "." cannot be used as the name of a patch |
2b1226693c70
mq: add '.' and '..' to list of forbidden patch names
Idan Kamara <idankk86@gmail.com>
parents:
13197
diff
changeset
|
109 |
abort: ".." cannot be used as the name of a patch |
14054
3c616f512a5b
mq: be more explicit on invalid patch name message
Idan Kamara <idankk86@gmail.com>
parents:
14051
diff
changeset
|
110 |
abort: patch name cannot begin with ".hg" |
3c616f512a5b
mq: be more explicit on invalid patch name message
Idan Kamara <idankk86@gmail.com>
parents:
14051
diff
changeset
|
111 |
abort: patch name cannot begin with ".mq" |
25453
d3a00fc3680f
mq: use %r to format illegal characters instead of manually quoting
Augie Fackler <augie@google.com>
parents:
22521
diff
changeset
|
112 |
abort: '#' cannot be used in the name of a patch |
d3a00fc3680f
mq: use %r to format illegal characters instead of manually quoting
Augie Fackler <augie@google.com>
parents:
22521
diff
changeset
|
113 |
abort: ':' cannot be used in the name of a patch |
25454
b5a8bc09b0db
mq: ban \r and \n in patch names (issue4711)
Augie Fackler <augie@google.com>
parents:
25453
diff
changeset
|
114 |
abort: '\n' cannot be used in the name of a patch |
12466 | 115 |
% qnew with name containing slash |
16540
4fe8eb4a6e2c
tests: add missing accept of native pathname separator
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
116 |
abort: path ends in directory separator: foo/ (glob) |
12879
da4a9ed369c8
qnew: distinguish between existing file and directory (issue2464)
Martin Geisler <mg@aragost.com>
parents:
12878
diff
changeset
|
117 |
abort: "foo" already exists as a directory |
12466 | 118 |
foo/bar.patch |
119 |
popping foo/bar.patch |
|
120 |
patch queue now empty |
|
121 |
% qnew with uncommitted changes |
|
122 |
uncommitted.patch |
|
123 |
% qnew implies add |
|
124 |
A .hgignore |
|
125 |
A series |
|
126 |
A uncommitted.patch |
|
127 |
% qnew missing |
|
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
14054
diff
changeset
|
128 |
abort: missing: * (glob) |
12466 | 129 |
% qnew -m |
130 |
foo bar |
|
131 |
||
132 |
% qnew twice |
|
133 |
abort: patch "first.patch" already exists |
|
134 |
abort: patch "first.patch" already exists |
|
135 |
% qnew -f from a subdirectory |
|
136 |
popping first.patch |
|
137 |
popping mtest.patch |
|
138 |
popping uncommitted.patch |
|
139 |
patch queue now empty |
|
140 |
adding d/b |
|
141 |
M d/b |
|
142 |
diff --git a/d/b b/d/b |
|
143 |
--- a/d/b |
|
144 |
+++ b/d/b |
|
145 |
@@ -1,1 +1,2 @@ |
|
146 |
b |
|
147 |
+b |
|
148 |
% qnew -u with no username configured |
|
149 |
From: blue |
|
150 |
||
151 |
% qnew -e -u with no username configured |
|
152 |
From: chartreuse |
|
153 |
||
154 |
% fail when trying to import a merge |
|
155 |
adding a |
|
156 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
157 |
created new head |
|
158 |
merging a |
|
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26587
diff
changeset
|
159 |
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
12466 | 160 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
161 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21930
diff
changeset
|
162 |
(no more unresolved files) |
12466 | 163 |
abort: cannot manage merge changesets |
164 |
$ rm -r sandbox |
|
2714
85070b784896
Fix test-mq-qnew-twice exit code and output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2711
diff
changeset
|
165 |
|
12466 | 166 |
hg headers |
11575
a5903e612f07
mq: evaluate --user before invoking editor with -e (issue2289)
Brendan Cully <brendan@kublai.com>
parents:
11513
diff
changeset
|
167 |
|
12466 | 168 |
$ echo "plain=false" >> $HGRCPATH |
169 |
$ mkdir sandbox |
|
170 |
$ (cd sandbox ; runtest) |
|
171 |
adding a |
|
172 |
% qnew should refuse bad patch names |
|
173 |
abort: "series" cannot be used as the name of a patch |
|
174 |
abort: "status" cannot be used as the name of a patch |
|
175 |
abort: "guards" cannot be used as the name of a patch |
|
14051
2b1226693c70
mq: add '.' and '..' to list of forbidden patch names
Idan Kamara <idankk86@gmail.com>
parents:
13197
diff
changeset
|
176 |
abort: "." cannot be used as the name of a patch |
2b1226693c70
mq: add '.' and '..' to list of forbidden patch names
Idan Kamara <idankk86@gmail.com>
parents:
13197
diff
changeset
|
177 |
abort: ".." cannot be used as the name of a patch |
14054
3c616f512a5b
mq: be more explicit on invalid patch name message
Idan Kamara <idankk86@gmail.com>
parents:
14051
diff
changeset
|
178 |
abort: patch name cannot begin with ".hg" |
3c616f512a5b
mq: be more explicit on invalid patch name message
Idan Kamara <idankk86@gmail.com>
parents:
14051
diff
changeset
|
179 |
abort: patch name cannot begin with ".mq" |
25453
d3a00fc3680f
mq: use %r to format illegal characters instead of manually quoting
Augie Fackler <augie@google.com>
parents:
22521
diff
changeset
|
180 |
abort: '#' cannot be used in the name of a patch |
d3a00fc3680f
mq: use %r to format illegal characters instead of manually quoting
Augie Fackler <augie@google.com>
parents:
22521
diff
changeset
|
181 |
abort: ':' cannot be used in the name of a patch |
25454
b5a8bc09b0db
mq: ban \r and \n in patch names (issue4711)
Augie Fackler <augie@google.com>
parents:
25453
diff
changeset
|
182 |
abort: '\n' cannot be used in the name of a patch |
12466 | 183 |
% qnew with name containing slash |
16540
4fe8eb4a6e2c
tests: add missing accept of native pathname separator
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
184 |
abort: path ends in directory separator: foo/ (glob) |
12879
da4a9ed369c8
qnew: distinguish between existing file and directory (issue2464)
Martin Geisler <mg@aragost.com>
parents:
12878
diff
changeset
|
185 |
abort: "foo" already exists as a directory |
12466 | 186 |
foo/bar.patch |
187 |
popping foo/bar.patch |
|
188 |
patch queue now empty |
|
189 |
% qnew with uncommitted changes |
|
190 |
uncommitted.patch |
|
191 |
% qnew implies add |
|
192 |
A .hgignore |
|
193 |
A series |
|
194 |
A uncommitted.patch |
|
195 |
% qnew missing |
|
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
14054
diff
changeset
|
196 |
abort: missing: * (glob) |
12466 | 197 |
% qnew -m |
198 |
# HG changeset patch |
|
199 |
# Parent |
|
200 |
foo bar |
|
201 |
||
202 |
% qnew twice |
|
203 |
abort: patch "first.patch" already exists |
|
204 |
abort: patch "first.patch" already exists |
|
205 |
% qnew -f from a subdirectory |
|
206 |
popping first.patch |
|
207 |
popping mtest.patch |
|
208 |
popping uncommitted.patch |
|
209 |
patch queue now empty |
|
210 |
adding d/b |
|
211 |
M d/b |
|
212 |
# HG changeset patch |
|
213 |
# Parent |
|
22519
c87f2a5a6e49
mq: correctly make an empty line after description in new patches
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
214 |
|
12466 | 215 |
diff --git a/d/b b/d/b |
216 |
--- a/d/b |
|
217 |
+++ b/d/b |
|
218 |
@@ -1,1 +1,2 @@ |
|
219 |
b |
|
220 |
+b |
|
221 |
% qnew -u with no username configured |
|
222 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
223 |
# User blue |
12466 | 224 |
# Parent |
22519
c87f2a5a6e49
mq: correctly make an empty line after description in new patches
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
225 |
|
12466 | 226 |
% qnew -e -u with no username configured |
227 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
228 |
# User chartreuse |
12466 | 229 |
# Parent |
22519
c87f2a5a6e49
mq: correctly make an empty line after description in new patches
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
230 |
|
12466 | 231 |
% fail when trying to import a merge |
232 |
adding a |
|
233 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
234 |
created new head |
|
235 |
merging a |
|
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26587
diff
changeset
|
236 |
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
12466 | 237 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
238 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21930
diff
changeset
|
239 |
(no more unresolved files) |
12466 | 240 |
abort: cannot manage merge changesets |
241 |
$ rm -r sandbox |
|
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
242 |
|
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
243 |
Test saving last-message.txt |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
244 |
|
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
245 |
$ hg init repo |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
246 |
$ cd repo |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
247 |
|
20859
e259d4c462b5
tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents:
20768
diff
changeset
|
248 |
$ cat > $TESTTMP/commitfailure.py <<EOF |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25454
diff
changeset
|
249 |
> from mercurial import error |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
250 |
> def reposetup(ui, repo): |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
251 |
> class commitfailure(repo.__class__): |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
252 |
> def commit(self, *args, **kwargs): |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25454
diff
changeset
|
253 |
> raise error.Abort('emulating unexpected abort') |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
254 |
> repo.__class__ = commitfailure |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
255 |
> EOF |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
256 |
$ cat >> .hg/hgrc <<EOF |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
257 |
> [extensions] |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
258 |
> # this failure occurs before editor invocation |
20859
e259d4c462b5
tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents:
20768
diff
changeset
|
259 |
> commitfailure = $TESTTMP/commitfailure.py |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
260 |
> EOF |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
261 |
|
20859
e259d4c462b5
tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents:
20768
diff
changeset
|
262 |
$ cat > $TESTTMP/editor.sh << EOF |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
263 |
> echo "==== before editing" |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
264 |
> cat \$1 |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
265 |
> echo "====" |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
266 |
> echo "test saving last-message.txt" >> \$1 |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
267 |
> EOF |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
268 |
|
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
269 |
(test that editor is not invoked before transaction starting) |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
270 |
|
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
271 |
$ rm -f .hg/last-message.txt |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
272 |
$ HGEDITOR="sh $TESTTMP/editor.sh" hg qnew -e patch |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
273 |
abort: emulating unexpected abort |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
274 |
[255] |
21930
a5168eb9b2bc
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21421
diff
changeset
|
275 |
$ test -f .hg/last-message.txt |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
276 |
[1] |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
277 |
|
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
278 |
(test that editor is invoked and commit message is saved into |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
279 |
"last-message.txt") |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
280 |
|
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
281 |
$ cat >> .hg/hgrc <<EOF |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
282 |
> [extensions] |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
283 |
> commitfailure = ! |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
284 |
> [hooks] |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
285 |
> # this failure occurs after editor invocation |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
286 |
> pretxncommit.unexpectedabort = false |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
287 |
> EOF |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
288 |
|
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
289 |
$ rm -f .hg/last-message.txt |
21421
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
290 |
$ hg status |
20859
e259d4c462b5
tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents:
20768
diff
changeset
|
291 |
$ HGEDITOR="sh $TESTTMP/editor.sh" hg qnew -e patch |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
292 |
==== before editing |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
293 |
|
21421
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
294 |
|
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
295 |
HG: Enter commit message. Lines beginning with 'HG:' are removed. |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
296 |
HG: Leave message empty to use default message. |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
297 |
HG: -- |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
298 |
HG: user: test |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
299 |
HG: branch 'default' |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
300 |
HG: no files changed |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
301 |
==== |
26998
4414d500604f
localrepo: put bookmark move following commit in one transaction
Laurent Charignon <lcharignon@fb.com>
parents:
26614
diff
changeset
|
302 |
note: commit message saved in .hg/last-message.txt |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
303 |
transaction abort! |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
304 |
rollback completed |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
305 |
abort: pretxncommit.unexpectedabort hook exited with status 1 |
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
306 |
[255] |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
307 |
$ cat .hg/last-message.txt |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
308 |
|
21421
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
309 |
|
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
310 |
test saving last-message.txt |
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
311 |
|
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
312 |
$ cat >> .hg/hgrc <<EOF |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
313 |
> [hooks] |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
314 |
> pretxncommit.unexpectedabort = |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
315 |
> EOF |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
316 |
|
21276
25b7c760235a
tests: fix test failure on vfat
Matt Mackall <mpm@selenic.com>
parents:
21267
diff
changeset
|
317 |
#if unix-permissions |
25b7c760235a
tests: fix test failure on vfat
Matt Mackall <mpm@selenic.com>
parents:
21267
diff
changeset
|
318 |
|
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
319 |
Test handling default message with the patch filename with tail whitespaces |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
320 |
|
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
321 |
$ cat > $TESTTMP/editor.sh << EOF |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
322 |
> echo "==== before editing" |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
323 |
> cat \$1 |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
324 |
> echo "====" |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
325 |
> echo "[mq]: patch " > \$1 |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
326 |
> EOF |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
327 |
|
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
328 |
$ rm -f .hg/last-message.txt |
21421
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
329 |
$ hg status |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
330 |
$ HGEDITOR="sh $TESTTMP/editor.sh" hg qnew -e "patch " |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
331 |
==== before editing |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
332 |
|
21421
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
333 |
|
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
334 |
HG: Enter commit message. Lines beginning with 'HG:' are removed. |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
335 |
HG: Leave message empty to use default message. |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
336 |
HG: -- |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
337 |
HG: user: test |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
338 |
HG: branch 'default' |
4941caa9f0f8
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21276
diff
changeset
|
339 |
HG: no files changed |
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
340 |
==== |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
341 |
$ cat ".hg/patches/patch " |
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
342 |
# HG changeset patch |
22521
3f948469bac0
mq: write '# Parent ' lines with two spaces like export does (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
343 |
# Parent 0000000000000000000000000000000000000000 |
22519
c87f2a5a6e49
mq: correctly make an empty line after description in new patches
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
344 |
|
21234
b9a16ed5acec
qnew: use "editor" argument of "commit()" instead of explicit "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20859
diff
changeset
|
345 |
|
20768
57d0c8c3b947
qnew: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16540
diff
changeset
|
346 |
$ cd .. |
21276
25b7c760235a
tests: fix test failure on vfat
Matt Mackall <mpm@selenic.com>
parents:
21267
diff
changeset
|
347 |
|
25b7c760235a
tests: fix test failure on vfat
Matt Mackall <mpm@selenic.com>
parents:
21267
diff
changeset
|
348 |
#endif |