D6234: remotefilelog: return expected type from copies overrides
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Apr 13 06:31:32 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
copies._computeforwardmissing() and copies._computenonoverlap() return
sets, so the overrides should also do that.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6234
AFFECTED FILES
hgext/remotefilelog/__init__.py
CHANGE DETAILS
diff --git a/hgext/remotefilelog/__init__.py b/hgext/remotefilelog/__init__.py
--- a/hgext/remotefilelog/__init__.py
+++ b/hgext/remotefilelog/__init__.py
@@ -497,20 +497,20 @@
sparsematch1 = repo.maybesparsematch(c1.rev())
if sparsematch1:
- sparseu1 = []
+ sparseu1 = set()
for f in u1:
if sparsematch1(f):
files.append((f, hex(m1[f])))
- sparseu1.append(f)
+ sparseu1.add(f)
u1 = sparseu1
sparsematch2 = repo.maybesparsematch(c2.rev())
if sparsematch2:
- sparseu2 = []
+ sparseu2 = set()
for f in u2:
if sparsematch2(f):
files.append((f, hex(m2[f])))
- sparseu2.append(f)
+ sparseu2.add(f)
u2 = sparseu2
# batch fetch the needed files from the server
@@ -520,19 +520,19 @@
# prefetch files before pathcopies check
def computeforwardmissing(orig, a, b, match=None):
- missing = list(orig(a, b, match=match))
+ missing = orig(a, b, match=match)
repo = a._repo
if isenabled(repo):
mb = b.manifest()
files = []
sparsematch = repo.maybesparsematch(b.rev())
if sparsematch:
- sparsemissing = []
+ sparsemissing = set()
for f in missing:
if sparsematch(f):
files.append((f, hex(mb[f])))
- sparsemissing.append(f)
+ sparsemissing.add(f)
missing = sparsemissing
# batch fetch the needed files from the server
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list