Show More
@@ -447,13 +447,18 b' class histeditaction(object):' | |||
|
447 | 447 | parentctx, but does not commit them.""" |
|
448 | 448 | repo = self.repo |
|
449 | 449 | rulectx = repo[self.node] |
|
450 | repo.ui.pushbuffer(error=True, labeled=True) | |
|
450 | 451 | hg.update(repo, self.state.parentctxnode, quietempty=True) |
|
451 | 452 | stats = applychanges(repo.ui, repo, rulectx, {}) |
|
452 | 453 | if stats and stats[3] > 0: |
|
454 | buf = repo.ui.popbuffer() | |
|
455 | repo.ui.write(*buf) | |
|
453 | 456 | raise error.InterventionRequired( |
|
454 | 457 | _('Fix up the change (%s %s)') % |
|
455 | 458 | (self.verb, node.short(self.node)), |
|
456 | 459 | hint=_('hg histedit --continue to resume')) |
|
460 | else: | |
|
461 | repo.ui.popbuffer() | |
|
457 | 462 | |
|
458 | 463 | def continuedirty(self): |
|
459 | 464 | """Continues the action when changes have been applied to the working |
@@ -733,7 +738,9 b' class fold(histeditaction):' | |||
|
733 | 738 | |
|
734 | 739 | def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges): |
|
735 | 740 | parent = ctx.parents()[0].node() |
|
741 | repo.ui.pushbuffer() | |
|
736 | 742 | hg.update(repo, parent) |
|
743 | repo.ui.popbuffer() | |
|
737 | 744 | ### prepare new commit data |
|
738 | 745 | commitopts = {} |
|
739 | 746 | commitopts['user'] = ctx.user() |
@@ -764,7 +771,9 b' class fold(histeditaction):' | |||
|
764 | 771 | repo.ui.restoreconfig(phasebackup) |
|
765 | 772 | if n is None: |
|
766 | 773 | return ctx, [] |
|
774 | repo.ui.pushbuffer() | |
|
767 | 775 | hg.update(repo, n) |
|
776 | repo.ui.popbuffer() | |
|
768 | 777 | replacements = [(oldctx.node(), (newnode,)), |
|
769 | 778 | (ctx.node(), (n,)), |
|
770 | 779 | (newnode, (n,)), |
@@ -1167,7 +1176,9 b' def _histedit(ui, repo, state, *freeargs' | |||
|
1167 | 1176 | state.write() |
|
1168 | 1177 | ui.progress(_("editing"), None) |
|
1169 | 1178 | |
|
1179 | repo.ui.pushbuffer() | |
|
1170 | 1180 | hg.update(repo, state.parentctxnode, quietempty=True) |
|
1181 | repo.ui.popbuffer() | |
|
1171 | 1182 | |
|
1172 | 1183 | mapping, tmpnodes, created, ntm = processreplacement(state) |
|
1173 | 1184 | if mapping: |
@@ -243,9 +243,6 b' short hash. This tests issue3893.' | |||
|
243 | 243 | > p c8e68270e35a 3 four |
|
244 | 244 | > f 08d98a8350f3 4 five |
|
245 | 245 | > EOF |
|
246 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
247 | reverting alpha | |
|
248 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
249 | 246 | four |
|
250 | 247 | *** |
|
251 | 248 | five |
@@ -258,7 +255,6 b' short hash. This tests issue3893.' | |||
|
258 | 255 | HG: user: test |
|
259 | 256 | HG: branch 'default' |
|
260 | 257 | HG: changed alpha |
|
261 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
262 | 258 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
|
263 | 259 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
|
264 | 260 |
@@ -104,7 +104,6 b' rules should end up in .hg/histedit-last' | |||
|
104 | 104 | > pick 055a42cdd887 d |
|
105 | 105 | > EOF |
|
106 | 106 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
|
107 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
108 | 107 | |
|
109 | 108 | log after edit |
|
110 | 109 | $ hg log --graph |
@@ -148,7 +147,6 b' put things back' | |||
|
148 | 147 | > pick d8249471110a e |
|
149 | 148 | > pick 8ade9693061e f |
|
150 | 149 | > EOF |
|
151 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
152 | 150 | |
|
153 | 151 | $ hg log --graph |
|
154 | 152 | @ changeset: 5:7eca9b5b1148 |
@@ -191,7 +189,6 b' slightly different this time' | |||
|
191 | 189 | > pick 915da888f2de e |
|
192 | 190 | > pick 177f92b77385 c |
|
193 | 191 | > EOF |
|
194 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
|
195 | 192 | $ hg log --graph |
|
196 | 193 | @ changeset: 5:38b92f448761 |
|
197 | 194 | | tag: tip |
@@ -232,7 +229,6 b' keep prevents stripping dead revs' | |||
|
232 | 229 | > pick 38b92f448761 c |
|
233 | 230 | > pick de71b079d9ce e |
|
234 | 231 | > EOF |
|
235 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
236 | 232 | $ hg log --graph |
|
237 | 233 | @ changeset: 7:803ef1c6fcfd |
|
238 | 234 | | tag: tip |
@@ -417,11 +413,6 b" Now, let's try to fold the second commit" | |||
|
417 | 413 | > EOF |
|
418 | 414 | |
|
419 | 415 | $ HGEDITOR="sh ./editor.sh" hg histedit 0 |
|
420 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
421 | adding another-dir/initial-file (glob) | |
|
422 | removing initial-dir/initial-file (glob) | |
|
423 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
424 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
425 | 416 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
|
426 | 417 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
|
427 | 418 |
@@ -59,7 +59,6 b' edit the history' | |||
|
59 | 59 | > pick 652413bf663e f |
|
60 | 60 | > pick 055a42cdd887 d |
|
61 | 61 | > EOF |
|
62 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
|
63 | 62 | |
|
64 | 63 | log after edit |
|
65 | 64 | $ hg log --graph |
@@ -124,7 +123,6 b' Drop the last changeset' | |||
|
124 | 123 | > pick a4f7421b80f7 f |
|
125 | 124 | > drop f518305ce889 d |
|
126 | 125 | > EOF |
|
127 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
128 | 126 | $ hg log --graph |
|
129 | 127 | @ changeset: 3:a4f7421b80f7 |
|
130 | 128 | | tag: tip |
@@ -158,7 +156,6 b' Drop the last changeset' | |||
|
158 | 156 | > pick cb9a9f314b8b a |
|
159 | 157 | > pick ee283cb5f2d5 e |
|
160 | 158 | > EOF |
|
161 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
162 | 159 | $ hg log --graph |
|
163 | 160 | @ changeset: 1:e99c679bf03e |
|
164 | 161 | | tag: tip |
@@ -286,7 +286,6 b" say we'll change the message, but don't." | |||
|
286 | 286 | > mv tmp "\$1" |
|
287 | 287 | > EOF |
|
288 | 288 | $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle |
|
289 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
290 | 289 | $ hg status |
|
291 | 290 | $ hg log --limit 1 |
|
292 | 291 | changeset: 6:1fd3b2fe7754 |
@@ -327,7 +326,6 b' check saving last-message.txt, at first' | |||
|
327 | 326 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | fixbundle |
|
328 | 327 | > mess 1fd3b2fe7754 f |
|
329 | 328 | > EOF |
|
330 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
331 | 329 | abort: emulating unexpected abort |
|
332 | 330 | $ test -f .hg/last-message.txt |
|
333 | 331 | [1] |
@@ -354,8 +352,6 b' check saving last-message.txt, at first' | |||
|
354 | 352 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF |
|
355 | 353 | > mess 1fd3b2fe7754 f |
|
356 | 354 | > EOF |
|
357 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
358 | adding f | |
|
359 | 355 | ==== before editing |
|
360 | 356 | f |
|
361 | 357 | |
@@ -408,7 +404,6 b' then, check "modify the message" itself' | |||
|
408 | 404 | $ hg histedit tip --commands - 2>&1 << EOF | fixbundle |
|
409 | 405 | > mess 1fd3b2fe7754 f |
|
410 | 406 | > EOF |
|
411 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
412 | 407 | $ hg status |
|
413 | 408 | $ hg log --limit 1 |
|
414 | 409 | changeset: 6:62feedb1200e |
@@ -104,7 +104,6 b' fix up' | |||
|
104 | 104 | |
|
105 | 105 | > EOF |
|
106 | 106 | $ HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
|
107 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
108 | 107 | d |
|
109 | 108 | *** |
|
110 | 109 | does not commute with e |
@@ -121,7 +120,6 b' fix up' | |||
|
121 | 120 | |
|
122 | 121 | |
|
123 | 122 | |
|
124 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
125 | 123 | merging e |
|
126 | 124 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
127 | 125 | Fix up the change (pick 7b4e2f4b7bcd) |
@@ -262,8 +260,6 b' fix up' | |||
|
262 | 260 | (no more unresolved files) |
|
263 | 261 | continue: hg histedit --continue |
|
264 | 262 | $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
|
265 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
266 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
267 | 263 | merging e |
|
268 | 264 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
269 | 265 | Fix up the change (pick 7b4e2f4b7bcd) |
@@ -54,9 +54,6 b' log before edit' | |||
|
54 | 54 | > fold 177f92b77385 c |
|
55 | 55 | > pick 055a42cdd887 d |
|
56 | 56 | > EOF |
|
57 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
|
58 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
59 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
60 | 57 | |
|
61 | 58 | log after edit |
|
62 | 59 | $ hg logt --graph |
@@ -111,9 +108,6 b' rollup will fold without preserving the ' | |||
|
111 | 108 | > pick 6de59d13424a f |
|
112 | 109 | > pick 9c277da72c9b d |
|
113 | 110 | > EOF |
|
114 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
|
115 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
116 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
117 | 111 | |
|
118 | 112 | $ HGEDITOR=$OLDHGEDITOR |
|
119 | 113 | |
@@ -177,10 +171,7 b' check saving last-message.txt' | |||
|
177 | 171 | > pick 8e03a72b6f83 f |
|
178 | 172 | > fold c4a9eb7989fc d |
|
179 | 173 | > EOF |
|
180 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
181 | adding d | |
|
182 | 174 | allow non-folding commit |
|
183 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
184 | 175 | ==== before editing |
|
185 | 176 | f |
|
186 | 177 | *** |
@@ -242,9 +233,6 b' tip before edit' | |||
|
242 | 233 | > EOF |
|
243 | 234 | editing: pick e860deea161a 4 e 1/2 changes (50.00%) |
|
244 | 235 | editing: fold a00ad806cb55 5 f 2/2 changes (100.00%) |
|
245 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
246 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
247 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
248 | 236 | |
|
249 | 237 | tip after edit |
|
250 | 238 | $ hg log --rev . |
@@ -372,7 +360,6 b' dropped revision.' | |||
|
372 | 360 | created new head |
|
373 | 361 | $ echo 6 >> file |
|
374 | 362 | $ HGEDITOR=cat hg histedit --continue |
|
375 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
376 | 363 | +4 |
|
377 | 364 | *** |
|
378 | 365 | +5.2 |
@@ -387,7 +374,6 b' dropped revision.' | |||
|
387 | 374 | HG: user: test |
|
388 | 375 | HG: branch 'default' |
|
389 | 376 | HG: changed file |
|
390 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
391 | 377 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob) |
|
392 | 378 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob) |
|
393 | 379 | $ hg logt -G |
@@ -443,10 +429,6 b' Folding with initial rename (issue3729)' | |||
|
443 | 429 | > pick 1c4f440a8085 rename |
|
444 | 430 | > fold e0371e0426bc b |
|
445 | 431 | > EOF |
|
446 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
447 | reverting b.txt | |
|
448 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
449 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
450 | 432 | |
|
451 | 433 | $ hg logt --follow b.txt |
|
452 | 434 | 1:cf858d235c76 rename |
@@ -489,9 +471,6 b' into the hook command.' | |||
|
489 | 471 | > fold a1a953ffb4b0 c |
|
490 | 472 | > pick 6c795aa153cb a |
|
491 | 473 | > EOF |
|
492 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
493 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
494 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
495 | 474 | commit 9599899f62c05f4377548c32bf1c9f1a39634b0c |
|
496 | 475 | |
|
497 | 476 | $ hg logt |
@@ -530,13 +509,6 b' editors.' | |||
|
530 | 509 | > fold b7389cc4d66e 3 foo2 |
|
531 | 510 | > fold 21679ff7675c 4 foo3 |
|
532 | 511 | > EOF |
|
533 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
534 | reverting foo | |
|
535 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
536 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
537 | merging foo | |
|
538 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
539 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
540 | 512 | $ hg logt |
|
541 | 513 | 2:e8bedbda72c1 merged foos |
|
542 | 514 | 1:578c7455730c a |
@@ -69,7 +69,6 b' edit the history' | |||
|
69 | 69 | > pick e860deea161a e |
|
70 | 70 | > pick 652413bf663e f |
|
71 | 71 | > EOF |
|
72 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
73 | 72 | merging e |
|
74 | 73 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
75 | 74 | Fix up the change (pick e860deea161a) |
@@ -108,7 +108,6 b' create an hidden revision' | |||
|
108 | 108 | > drop 59d9f330561f 7 d |
|
109 | 109 | > pick cacdfd884a93 8 f |
|
110 | 110 | > EOF |
|
111 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
112 | 111 | $ hg log --graph |
|
113 | 112 | @ 11:c13eb81022ca f |
|
114 | 113 | | |
@@ -167,7 +166,6 b' dropped changeset to be hidden.' | |||
|
167 | 166 | > pick 40db8afa467b 10 c |
|
168 | 167 | > drop b449568bf7fc 11 f |
|
169 | 168 | > EOF |
|
170 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
171 | 169 | $ hg log -G |
|
172 | 170 | @ 12:40db8afa467b c |
|
173 | 171 | | |
@@ -187,7 +185,6 b' With rewritten ancestors' | |||
|
187 | 185 | > pick 40db8afa467b 10 c |
|
188 | 186 | > drop 1b3b05f35ff0 13 h |
|
189 | 187 | > EOF |
|
190 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
191 | 188 | $ hg log -G |
|
192 | 189 | @ 17:ee6544123ab8 c |
|
193 | 190 | | |
@@ -357,7 +354,6 b' It seems more important to present the s' | |||
|
357 | 354 | > pick 7395e1ff83bd 13 h |
|
358 | 355 | > pick ee118ab9fa44 16 k |
|
359 | 356 | > EOF |
|
360 | 0 files updated, 0 files merged, 5 files removed, 0 files unresolved | |
|
361 | 357 | $ hg log -G |
|
362 | 358 | @ 23:558246857888 (secret) k |
|
363 | 359 | | |
@@ -399,13 +395,6 b' Note that there is a few reordering in t' | |||
|
399 | 395 | > pick b605fb7503f2 14 i |
|
400 | 396 | > fold ee118ab9fa44 16 k |
|
401 | 397 | > EOF |
|
402 | 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | |
|
403 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
404 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
405 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
406 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
407 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
408 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
409 | 398 | $ hg log -G |
|
410 | 399 | @ 27:f9daec13fb98 (secret) i |
|
411 | 400 | | |
General Comments 0
You need to be logged in to leave comments.
Login now