##// END OF EJS Templates
index: use `index.has_node` in `exchange._pulldiscoverychangegroup`...
marmoute -
r43851:0a338d8e default draft
parent child Browse files
Show More
@@ -1855,7 +1855,7 b' def _pulldiscoverychangegroup(pullop):'
1855 pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force
1855 pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force
1856 )
1856 )
1857 common, fetch, rheads = tmp
1857 common, fetch, rheads = tmp
1858 nm = pullop.repo.unfiltered().changelog.nodemap
1858 has_node = pullop.repo.unfiltered().changelog.index.has_node
1859 if fetch and rheads:
1859 if fetch and rheads:
1860 # If a remote heads is filtered locally, put in back in common.
1860 # If a remote heads is filtered locally, put in back in common.
1861 #
1861 #
@@ -1868,7 +1868,7 b' def _pulldiscoverychangegroup(pullop):'
1868 # but are not including a remote heads, we'll not be able to detect it,
1868 # but are not including a remote heads, we'll not be able to detect it,
1869 scommon = set(common)
1869 scommon = set(common)
1870 for n in rheads:
1870 for n in rheads:
1871 if n in nm:
1871 if has_node(n):
1872 if n not in scommon:
1872 if n not in scommon:
1873 common.append(n)
1873 common.append(n)
1874 if set(rheads).issubset(set(common)):
1874 if set(rheads).issubset(set(common)):
General Comments 0
You need to be logged in to leave comments. Login now