hgext/rebase.py
changeset 46836 80cac9936324
parent 46835 c2438f2f635c
child 46837 27ba8acd5684
--- a/hgext/rebase.py	Tue Mar 23 14:49:31 2021 -0700
+++ b/hgext/rebase.py	Tue Mar 23 14:15:40 2021 -0700
@@ -413,15 +413,6 @@
         if not destmap:
             return _nothingtorebase()
 
-        rebaseset = destmap.keys()
-        if not self.keepf:
-            try:
-                rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
-            except error.Abort as e:
-                if e.hint is None:
-                    e.hint = _(b'use --keep to keep original changesets')
-                raise e
-
         result = buildstate(self.repo, destmap, self.collapsef)
 
         if not result:
@@ -450,6 +441,15 @@
         # Calculate self.obsolete_* sets
         self._handleskippingobsolete()
 
+        rebaseset = destmap.keys()
+        if not self.keepf:
+            try:
+                rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
+            except error.Abort as e:
+                if e.hint is None:
+                    e.hint = _(b'use --keep to keep original changesets')
+                raise e
+
         self.prepared = True
 
     def _assignworkingcopy(self):