1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
|
Test that qpush cleans things up if it doesn't complete
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
$ hg init repo
$ cd repo
$ echo foo > foo
$ hg ci -Am 'add foo'
adding foo
$ touch untracked-file
$ echo 'syntax: glob' > .hgignore
$ echo '.hgignore' >> .hgignore
$ hg qinit
test qpush on empty series
$ hg qpush
no patches in series
$ hg qnew patch1
$ echo >> foo
$ hg qrefresh -m 'patch 1'
$ hg qnew patch2
$ echo bar > bar
$ hg add bar
$ hg qrefresh -m 'patch 2'
$ hg qnew --config 'mq.plain=true' bad-patch
$ echo >> foo
$ hg qrefresh
$ hg qpop -a
popping bad-patch
popping patch2
popping patch1
patch queue now empty
$ python -c 'print "\xe9"' > message
$ cat .hg/patches/bad-patch >> message
$ mv message .hg/patches/bad-patch
$ hg qpush -a && echo 'qpush succeded?!'
applying patch1
applying patch2
applying bad-patch
transaction abort!
rollback completed
cleaning up working directory...done
abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
[255]
$ hg parents
changeset: 0:bbd179dfa0a7
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo
test corrupt status file
$ hg qpush
applying patch1
now at: patch1
$ cp .hg/patches/status .hg/patches/status.orig
$ hg qpop
popping patch1
patch queue now empty
$ cp .hg/patches/status.orig .hg/patches/status
$ hg qpush
mq status file refers to unknown node * (glob)
abort: working directory revision is not qtip
[255]
$ rm .hg/patches/status .hg/patches/status.orig
bar should be gone; other unknown/ignored files should still be around
$ hg status -A
? untracked-file
I .hgignore
C foo
preparing qpush of a missing patch
$ hg qpop -a
no patches applied
$ hg qpush
applying patch1
now at: patch1
$ rm .hg/patches/patch2
now we expect the push to fail, but it should NOT complain about patch1
$ hg qpush
applying patch2
unable to read patch2
now at: patch1
[1]
preparing qpush of missing patch with no patch applied
$ hg qpop -a
popping patch1
patch queue now empty
$ rm .hg/patches/patch1
qpush should fail the same way as below
$ hg qpush
applying patch1
unable to read patch1
[1]
Test qpush to a patch below the currently applied patch.
$ hg qq -c guardedseriesorder
$ hg qnew a
$ hg qguard +block
$ hg qnew b
$ hg qnew c
$ hg qpop -a
popping c
popping b
popping a
patch queue now empty
try to push and pop while a is guarded
$ hg qpush a
cannot push 'a' - guarded by '+block'
[1]
$ hg qpush -a
applying b
patch b is empty
applying c
patch c is empty
now at: c
now try it when a is unguarded, and we're at the top of the queue
$ hg qsel block
number of guarded, applied patches has changed from 1 to 0
$ hg qpush b
abort: cannot push to a previous patch: b
[255]
$ hg qpush a
abort: cannot push to a previous patch: a
[255]
and now we try it one more time with a unguarded, while we're not at the top of the queue
$ hg qpop b
popping c
now at: b
$ hg qpush a
abort: cannot push to a previous patch: a
[255]
test qpop --force and backup files
$ hg qpop -a
popping b
patch queue now empty
$ hg qq --create force
$ echo a > a
$ echo b > b
$ echo c > c
$ hg ci -Am add a b c
$ echo a >> a
$ hg rm b
$ hg rm c
$ hg qnew p1
$ echo a >> a
$ echo bb > b
$ hg add b
$ echo cc > c
$ hg add c
$ hg qpop --force --verbose
saving current version of a as a.orig
saving current version of b as b.orig
saving current version of c as c.orig
popping p1
patch queue now empty
$ hg st
? a.orig
? b.orig
? c.orig
? untracked-file
$ cat a.orig
a
a
a
$ cat b.orig
bb
$ cat c.orig
cc
test qpop --force --no-backup
$ hg qpush
applying p1
now at: p1
$ rm a.orig
$ echo a >> a
$ hg qpop --force --no-backup --verbose
popping p1
patch queue now empty
$ test -f a.orig && echo 'error: backup with --no-backup'
[1]
test qpop --keep-changes
$ hg qpush
applying p1
now at: p1
$ hg qpop --keep-changes --force
abort: cannot use both --force and --keep-changes
[255]
$ echo a >> a
$ hg qpop --keep-changes
abort: local changes found, refresh first
[255]
$ hg revert -qa a
$ rm a
$ hg qpop --keep-changes
abort: local changes found, refresh first
[255]
$ hg rm -A a
$ hg qpop --keep-changes
abort: local changes found, refresh first
[255]
$ hg revert -qa a
$ echo b > b
$ hg add b
$ hg qpop --keep-changes
abort: local changes found, refresh first
[255]
$ hg forget b
$ echo d > d
$ hg add d
$ hg qpop --keep-changes
popping p1
patch queue now empty
$ hg forget d
$ rm d
test qpush --force and backup files
$ echo a >> a
$ hg qnew p2
$ echo b >> b
$ echo d > d
$ echo e > e
$ hg add d e
$ hg rm c
$ hg qnew p3
$ hg qpop -a
popping p3
popping p2
patch queue now empty
$ echo a >> a
$ echo b1 >> b
$ echo d1 > d
$ hg add d
$ echo e1 > e
$ hg qpush -a --force --verbose
applying p2
saving current version of a as a.orig
patching file a
a
applying p3
saving current version of b as b.orig
saving current version of d as d.orig
patching file b
patching file c
patching file d
file d already exists
1 out of 1 hunks FAILED -- saving rejects to file d.rej
patching file e
file e already exists
1 out of 1 hunks FAILED -- saving rejects to file e.rej
patch failed to apply
b
patch failed, rejects left in working dir
errors during apply, please fix and refresh p3
[2]
$ cat a.orig
a
a
$ cat b.orig
b
b1
$ cat d.orig
d1
test qpush --force --no-backup
$ hg revert -qa
$ hg qpop -a
popping p3
popping p2
patch queue now empty
$ echo a >> a
$ rm a.orig
$ hg qpush --force --no-backup --verbose
applying p2
patching file a
a
now at: p2
$ test -f a.orig && echo 'error: backup with --no-backup'
[1]
test qgoto --force --no-backup
$ hg qpop
popping p2
patch queue now empty
$ echo a >> a
$ hg qgoto --force --no-backup p2 --verbose
applying p2
patching file a
a
now at: p2
$ test -f a.orig && echo 'error: backup with --no-backup'
[1]
test qpush --keep-changes
$ hg qpush --keep-changes --force
abort: cannot use both --force and --keep-changes
[255]
$ hg qpush --keep-changes --exact
abort: cannot use --exact and --keep-changes together
[255]
$ echo b >> b
$ hg qpush --keep-changes
applying p3
errors during apply, please fix and refresh p2
[2]
$ rm b
$ hg qpush --keep-changes
applying p3
errors during apply, please fix and refresh p2
[2]
$ hg rm -A b
$ hg qpush --keep-changes
applying p3
errors during apply, please fix and refresh p2
[2]
$ hg revert -aq b
$ echo d > d
$ hg add d
$ hg qpush --keep-changes
applying p3
errors during apply, please fix and refresh p2
[2]
$ hg forget d
$ rm d
$ hg qpop
popping p2
patch queue now empty
$ echo b >> b
$ hg qpush -a --keep-changes
applying p2
applying p3
errors during apply, please fix and refresh p2
[2]
$ hg qtop
p2
$ hg parents --template "{rev} {desc}\n"
2 imported patch p2
$ hg st b
M b
$ cat b
b
b
test qgoto --keep-changes
$ hg revert -aq b
$ rm e
$ hg qgoto --keep-changes --force p3
abort: cannot use both --force and --keep-changes
[255]
$ echo a >> a
$ hg qgoto --keep-changes p3
applying p3
now at: p3
$ hg st a
M a
$ hg qgoto --keep-changes p2
popping p3
now at: p2
$ hg st a
M a
test mq.keepchanges setting
$ hg --config mq.keepchanges=1 qpush
applying p3
now at: p3
$ hg st a
M a
$ hg --config mq.keepchanges=1 qpop
popping p3
now at: p2
$ hg st a
M a
$ hg --config mq.keepchanges=1 qgoto p3
applying p3
now at: p3
$ hg st a
M a
$ echo b >> b
$ hg --config mq.keepchanges=1 qpop --force
popping p3
now at: p2
$ hg st b
$ hg --config mq.keepchanges=1 qpush --exact
abort: local changes found, refresh first
[255]
$ hg revert -qa a
$ hg qpop
popping p2
patch queue now empty
$ echo a >> a
$ hg --config mq.keepchanges=1 qpush --force
applying p2
now at: p2
$ hg st a
$ cd ..
|