( )⚙ D5379 remotefilelog: use progress helper in shallowbundle

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5379

remotefilelog: use progress helper in shallowbundle
ClosedPublic

Authored by martinvonz on Dec 5 2018, 12:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4e08bbfc6d51: remotefilelog: use progress helper in shallowbundle
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Dec 5 2018, 12:39 PM
Closed by commit rHG4e08bbfc6d51: remotefilelog: use progress helper in shallowbundle (authored by martinvonz). · Explain WhyDec 6 2018, 6:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12718

hgext/remotefilelog/shallowbundle.py

return orig(repo, outgoing, version, source, *args, **kwargs) return orig(repo, outgoing, version, source, *args, **kwargs)
finally: finally:
repo.shallowmatch = original repo.shallowmatch = original
def addchangegroupfiles(orig, repo, source, revmap, trp, expectedfiles, *args): def addchangegroupfiles(orig, repo, source, revmap, trp, expectedfiles, *args):
if not shallowutil.isenabled(repo): if not shallowutil.isenabled(repo):
return orig(repo, source, revmap, trp, expectedfiles, *args) return orig(repo, source, revmap, trp, expectedfiles, *args)
files = 0
newfiles = 0 newfiles = 0
visited = set() visited = set()
revisiondatas = {} revisiondatas = {}
queue = [] queue = []
# Normal Mercurial processes each file one at a time, adding all # Normal Mercurial processes each file one at a time, adding all
# the new revisions for that file at once. In remotefilelog a file # the new revisions for that file at once. In remotefilelog a file
# revision may depend on a different file's revision (in the case # revision may depend on a different file's revision (in the case
# of a rename/copy), so we must lay all revisions down across all # of a rename/copy), so we must lay all revisions down across all
# files in topological order. # files in topological order.
# read all the file chunks but don't add them # read all the file chunks but don't add them
progress = repo.ui.makeprogress(_('files'), total=expectedfiles)
while True: while True:
chunkdata = source.filelogheader() chunkdata = source.filelogheader()
if not chunkdata: if not chunkdata:
break break
files += 1
f = chunkdata["filename"] f = chunkdata["filename"]
repo.ui.debug("adding %s revisions\n" % f) repo.ui.debug("adding %s revisions\n" % f)
repo.ui.progress(_('files'), files, total=expectedfiles) progress.increment()
if not repo.shallowmatch(f): if not repo.shallowmatch(f):
fl = repo.file(f) fl = repo.file(f)
deltas = source.deltaiter() deltas = source.deltaiter()
fl.addgroup(deltas, revmap, trp) fl.addgroup(deltas, revmap, trp)
continue continue
chain = None chain = None
if p != nullid: if p != nullid:
if not available(f, node, f, p): if not available(f, node, f, p):
continue continue
fl.add(text, meta, trp, linknode, p1, p2) fl.add(text, meta, trp, linknode, p1, p2)
processed.add((f, node)) processed.add((f, node))
skipcount = 0 skipcount = 0
repo.ui.progress(_('files'), None) progress.complete()
return len(revisiondatas), newfiles return len(revisiondatas), newfiles