[Updated] D10247: rebase: calculate obsolescense-related info earlier

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHGd95edcbe5c99: rebase: calculate obsolescense-related info earlier (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D10247?vs=26560&id=26589

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D10247/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D10247

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -368,6 +368,8 @@
         self.resume = True
         try:
             self.restorestatus()
+            # Calculate self.obsoletenotrebased
+            self._handleskippingobsolete()
             self.collapsemsg = restorecollapsemsg(self.repo, isabort)
         except error.RepoLookupError:
             if isabort:
@@ -434,6 +436,9 @@
 
         self.prepared = True
 
+        # Calculate self.obsoletenotrebased
+        self._handleskippingobsolete()
+
     def _assignworkingcopy(self):
         if self.inmemory:
             from mercurial.context import overlayworkingctx
@@ -467,9 +472,6 @@
                             _(b'cannot collapse multiple named branches')
                         )
 
-        # Calculate self.obsoletenotrebased
-        self._handleskippingobsolete()
-
         # Keep track of the active bookmarks in order to reset them later
         self.activebookmark = self.activebookmark or repo._activebookmark
         if self.activebookmark:



To: martinvonz, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210325/74e680c2/attachment-0002.html>