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