Show More
@@ -343,7 +343,7 b' class rebaseruntime(object):' | |||
|
343 | 343 | if dest.closesbranch() and not self.keepbranchesf: |
|
344 | 344 | self.ui.status(_('reopening closed branch head %s\n') % dest) |
|
345 | 345 | |
|
346 |
def _performrebase(self |
|
|
346 | def _performrebase(self): | |
|
347 | 347 | repo, ui, opts = self.repo, self.ui, self.opts |
|
348 | 348 | if self.keepbranchesf: |
|
349 | 349 | # insert _savebranch at the start of extrafns so if |
@@ -393,7 +393,7 b' class rebaseruntime(object):' | |||
|
393 | 393 | self.state, |
|
394 | 394 | self.targetancestors, |
|
395 | 395 | self.obsoletenotrebased) |
|
396 |
self.storestatus( |
|
|
396 | self.storestatus() | |
|
397 | 397 | storecollapsemsg(repo, self.collapsemsg) |
|
398 | 398 | if len(repo[None].parents()) == 2: |
|
399 | 399 | repo.ui.debug('resuming interrupted rebase\n') |
@@ -721,12 +721,7 b' def rebase(ui, repo, **opts):' | |||
|
721 | 721 | if retcode is not None: |
|
722 | 722 | return retcode |
|
723 | 723 | |
|
724 | with repo.transaction('rebase') as tr: | |
|
725 | try: | |
|
726 | rbsrt._performrebase(tr) | |
|
727 | except error.InterventionRequired: | |
|
728 | tr.close() | |
|
729 | raise | |
|
724 | rbsrt._performrebase() | |
|
730 | 725 | rbsrt._finishrebase() |
|
731 | 726 | finally: |
|
732 | 727 | release(lock, wlock) |
@@ -374,11 +374,10 b' test aborting an interrupted series (iss' | |||
|
374 | 374 | $ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip |
|
375 | 375 | rebasing 3:3a71550954f1 "b" |
|
376 | 376 | rebasing 4:e80b69427d80 "c" |
|
377 | transaction abort! | |
|
378 | rollback completed | |
|
379 | 377 | abort: ^C |
|
380 | 378 | [255] |
|
381 | 379 | $ hg rebase --abort |
|
380 | saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg (glob) | |
|
382 | 381 | rebase aborted |
|
383 | 382 | $ hg log -G --template "{rev} {desc} {bookmarks}" |
|
384 | 383 | o 6 no-a |
@@ -399,7 +398,7 b' test aborting an interrupted series (iss' | |||
|
399 | 398 | parent: 0:df4f53cec30a |
|
400 | 399 | base |
|
401 | 400 | branch: default |
|
402 |
commit: |
|
|
401 | commit: (clean) | |
|
403 | 402 | update: 6 new changesets (update) |
|
404 | 403 | phases: 7 draft |
|
405 | 404 |
@@ -225,6 +225,7 b' Check that the right ancestors is used w' | |||
|
225 | 225 | ignoring null merge rebase of 8 |
|
226 | 226 | rebasing 9:e31216eec445 "more changes to f1" |
|
227 | 227 | future parents are 2 and -1 |
|
228 | rebase status stored | |
|
228 | 229 | update to 2:4bc80088dc6b |
|
229 | 230 | resolving manifests |
|
230 | 231 | branchmerge: False, force: True, partial: False |
@@ -250,6 +251,7 b' Check that the right ancestors is used w' | |||
|
250 | 251 | rebased as 19c888675e13 |
|
251 | 252 | rebasing 10:2f2496ddf49d "merge" (tip) |
|
252 | 253 | future parents are 11 and 7 |
|
254 | rebase status stored | |
|
253 | 255 | already in target |
|
254 | 256 | merge against 10:2f2496ddf49d |
|
255 | 257 | detach base 9:e31216eec445 |
@@ -267,7 +269,6 b' Check that the right ancestors is used w' | |||
|
267 | 269 | committing changelog |
|
268 | 270 | rebased as 2a7f09cac94c |
|
269 | 271 | rebase merging completed |
|
270 | rebase status stored | |
|
271 | 272 | update back to initial working directory parent |
|
272 | 273 | resolving manifests |
|
273 | 274 | branchmerge: False, force: False, partial: False |
General Comments 0
You need to be logged in to leave comments.
Login now