diff mercurial/rewriteutil.py @ 47553:debc29900b97

rewriteutil: look up common predecessor on unfiltered repo

Before this patch, the code looking for divergence could crash when
tried to look up a common predecessor in the filtered repo. This patch
fixes that by looking up the common predecessor in an unfiltered repo.

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

--- a/mercurial/rewriteutil.py	Wed Jul 07 10:07:28 2021 -0700
+++ b/mercurial/rewriteutil.py	Tue Jun 29 14:02:34 2021 -0700
@@ -145,7 +145,7 @@
     for r in obsrevs:
         div = find_new_divergence_from(repo, repo[r])
         if div:
-            return (repo[r], repo[div[0]], repo[div[1]])
+            return (repo[r], repo[div[0]], repo.unfiltered()[div[1]])
     return None