##// END OF EJS Templates
rebase: calculate obsolescense-related info earlier...
Martin von Zweigbergk -
r47588:d95edcbe default
parent child Browse files
Show More
@@ -368,6 +368,8 b' class rebaseruntime(object):'
368 self.resume = True
368 self.resume = True
369 try:
369 try:
370 self.restorestatus()
370 self.restorestatus()
371 # Calculate self.obsoletenotrebased
372 self._handleskippingobsolete()
371 self.collapsemsg = restorecollapsemsg(self.repo, isabort)
373 self.collapsemsg = restorecollapsemsg(self.repo, isabort)
372 except error.RepoLookupError:
374 except error.RepoLookupError:
373 if isabort:
375 if isabort:
@@ -434,6 +436,9 b' class rebaseruntime(object):'
434
436
435 self.prepared = True
437 self.prepared = True
436
438
439 # Calculate self.obsoletenotrebased
440 self._handleskippingobsolete()
441
437 def _assignworkingcopy(self):
442 def _assignworkingcopy(self):
438 if self.inmemory:
443 if self.inmemory:
439 from mercurial.context import overlayworkingctx
444 from mercurial.context import overlayworkingctx
@@ -467,9 +472,6 b' class rebaseruntime(object):'
467 _(b'cannot collapse multiple named branches')
472 _(b'cannot collapse multiple named branches')
468 )
473 )
469
474
470 # Calculate self.obsoletenotrebased
471 self._handleskippingobsolete()
472
473 # Keep track of the active bookmarks in order to reset them later
475 # Keep track of the active bookmarks in order to reset them later
474 self.activebookmark = self.activebookmark or repo._activebookmark
476 self.activebookmark = self.activebookmark or repo._activebookmark
475 if self.activebookmark:
477 if self.activebookmark:
General Comments 0
You need to be logged in to leave comments. Login now