D7346: index: use `index.has_node` in `exchange._pulldiscoverychangegroup`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Nov 8 16:27:38 UTC 2019
marmoute created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
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
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list