D7346: index: use `index.has_node` in `exchange._pulldiscoverychangegroup`

marmoute (Pierre-Yves David) phabricator at mercurial-scm.org
Sat Nov 9 03:42:01 EST 2019


Closed by commit rHG0a338d8e6704: index: use `index.has_node` in `exchange._pulldiscoverychangegroup` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7346?vs=17848&id=17876

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

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

AFFECTED FILES
  mercurial/exchange.py

CHANGE DETAILS

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1855,7 +1855,7 @@
         pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force
     )
     common, fetch, rheads = tmp
-    nm = pullop.repo.unfiltered().changelog.nodemap
+    has_node = pullop.repo.unfiltered().changelog.index.has_node
     if fetch and rheads:
         # If a remote heads is filtered locally, put in back in common.
         #
@@ -1868,7 +1868,7 @@
         # but are not including a remote heads, we'll not be able to detect it,
         scommon = set(common)
         for n in rheads:
-            if n in nm:
+            if has_node(n):
                 if n not in scommon:
                     common.append(n)
         if set(rheads).issubset(set(common)):



To: marmoute, #hg-reviewers, indygreg
Cc: mercurial-devel


More information about the Mercurial-devel mailing list