# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1613174702 28800
# Node ID d95edcbe5c99e8f489022f7627f27304c06c90b3
# Parent  7d80622fc21276aa17b0cc958c3d2494eb6ddf0e
rebase: calculate obsolescense-related info earlier

My goal is to use `rewriteutil.precheck()` in the rebase code. Since
rebase does its own handling of divergent commits (it skips them
instead of erroring out), we need to have divergence-causing commits
filtered out early. This patch helps prepare for that.

Differential Revision: https://phab.mercurial-scm.org/D10247

diff -r 7d80622fc212 -r d95edcbe5c99 hgext/rebase.py
--- a/hgext/rebase.py	Fri Feb 12 16:19:33 2021 -0800
+++ b/hgext/rebase.py	Fri Feb 12 16:05:02 2021 -0800
@@ -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: