facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

addchangegroup: adjust for new upstream API

Browse Source 
Summary:
addchangegropfiles doesn't take the pr function as a parameter anymore.
The upstream change https://selenic.com/hg/rev/982e3ef7f5bf

Test Plan: tests are passing now on the release branch

Reviewers: #sourcecontrol, ttung, durham

Reviewed By: durham

Differential Revision: https://phabricator.fb.com/D3107217

Signature: t1:3107217:1459211189:4ece7531aff6043fc3acbfe43e2f471781c25c9d
This commit is contained in:
Mateusz Kwapich 2016-03-30 14:17:49 -07:00
parent be261ba980
commit cc54a98956
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
remotefilelog/shallowbundle.py
View File

@ -238,11 +238,12 @@ def getchangegroup(orig, repo, source, heads=None, common=None, bundlecaps=None,
finally:
repo.shallowmatch = original
def addchangegroupfiles(orig, repo, source, revmap, trp, pr, *args):
def addchangegroupfiles(orig, repo, source, revmap, trp, expectedfiles, *args):
if not requirement in repo.requirements:
return orig(repo, source, revmap, trp, pr, *args)
files = 0
newfiles = 0
visited = set()
revisiondatas = {}
queue = []
@ -258,9 +259,10 @@ def addchangegroupfiles(orig, repo, source, revmap, trp, pr, *args):
chunkdata = source.filelogheader()
if not chunkdata:
break
files += 1
f = chunkdata["filename"]
repo.ui.debug("adding %s revisions\n" % f)
pr()
repo.ui.progress(_('files'), files, total=expectedfiles)
if not repo.shallowmatch(f):
fl = repo.file(f)
@ -279,7 +281,7 @@ def addchangegroupfiles(orig, repo, source, revmap, trp, pr, *args):
queue.append((f, chain))
if f not in visited:
files += 1
newfiles +=1
visited.add(f)
if chain == None:
@ -362,4 +364,4 @@ def addchangegroupfiles(orig, repo, source, revmap, trp, pr, *args):
repo.ui.progress(_('files'), None)
return len(revisiondatas), files
return len(revisiondatas), newfiles