##// END OF EJS Templates
remotefilelog: return expected type from copies overrides...
Martin von Zweigbergk -
r42286:b287ed6e default
parent child Browse files
Show More
@@ -497,20 +497,20 b' def onetimeclientsetup(ui):'
497
497
498 sparsematch1 = repo.maybesparsematch(c1.rev())
498 sparsematch1 = repo.maybesparsematch(c1.rev())
499 if sparsematch1:
499 if sparsematch1:
500 sparseu1 = []
500 sparseu1 = set()
501 for f in u1:
501 for f in u1:
502 if sparsematch1(f):
502 if sparsematch1(f):
503 files.append((f, hex(m1[f])))
503 files.append((f, hex(m1[f])))
504 sparseu1.append(f)
504 sparseu1.add(f)
505 u1 = sparseu1
505 u1 = sparseu1
506
506
507 sparsematch2 = repo.maybesparsematch(c2.rev())
507 sparsematch2 = repo.maybesparsematch(c2.rev())
508 if sparsematch2:
508 if sparsematch2:
509 sparseu2 = []
509 sparseu2 = set()
510 for f in u2:
510 for f in u2:
511 if sparsematch2(f):
511 if sparsematch2(f):
512 files.append((f, hex(m2[f])))
512 files.append((f, hex(m2[f])))
513 sparseu2.append(f)
513 sparseu2.add(f)
514 u2 = sparseu2
514 u2 = sparseu2
515
515
516 # batch fetch the needed files from the server
516 # batch fetch the needed files from the server
@@ -520,7 +520,7 b' def onetimeclientsetup(ui):'
520
520
521 # prefetch files before pathcopies check
521 # prefetch files before pathcopies check
522 def computeforwardmissing(orig, a, b, match=None):
522 def computeforwardmissing(orig, a, b, match=None):
523 missing = list(orig(a, b, match=match))
523 missing = orig(a, b, match=match)
524 repo = a._repo
524 repo = a._repo
525 if isenabled(repo):
525 if isenabled(repo):
526 mb = b.manifest()
526 mb = b.manifest()
@@ -528,11 +528,11 b' def onetimeclientsetup(ui):'
528 files = []
528 files = []
529 sparsematch = repo.maybesparsematch(b.rev())
529 sparsematch = repo.maybesparsematch(b.rev())
530 if sparsematch:
530 if sparsematch:
531 sparsemissing = []
531 sparsemissing = set()
532 for f in missing:
532 for f in missing:
533 if sparsematch(f):
533 if sparsematch(f):
534 files.append((f, hex(mb[f])))
534 files.append((f, hex(mb[f])))
535 sparsemissing.append(f)
535 sparsemissing.add(f)
536 missing = sparsemissing
536 missing = sparsemissing
537
537
538 # batch fetch the needed files from the server
538 # batch fetch the needed files from the server
General Comments 0
You need to be logged in to leave comments. Login now