diff mercurial/branchmap.py @ 51526:a03fa40afd01

filteredhash: rename the filteredhash function

The new name is less ambiguous, as we are about to introduce an alternative
function it seems like a good idea to have clearer name to distinct the two.

--- a/mercurial/branchmap.py	Wed Mar 06 01:43:51 2024 +0100
+++ b/mercurial/branchmap.py	Wed Mar 06 01:53:52 2024 +0100
@@ -466,7 +466,11 @@
             # tiprev doesn't correspond to tipnode: repo was stripped, or this
             # repo has a different order of changesets
             return False
-        tiphash = scmutil.filteredhash(repo, self.tiprev, needobsolete=True)
+        tiphash = scmutil.combined_filtered_and_obsolete_hash(
+            repo,
+            self.tiprev,
+            needobsolete=True,
+        )
         # hashes don't match if this repo view has a different set of filtered
         # revisions (e.g. due to phase changes) or obsolete revisions (e.g.
         # history was rewritten)
@@ -710,8 +714,10 @@
             # However. we've just updated the cache and we assume it's valid,
             # so let's make the cache key valid as well by recomputing it from
             # the cached data
-            self.filteredhash = scmutil.filteredhash(
-                repo, self.tiprev, needobsolete=True
+            self.filteredhash = scmutil.combined_filtered_and_obsolete_hash(
+                repo,
+                self.tiprev,
+                needobsolete=True,
             )
 
         self._state = STATE_DIRTY