This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5382

remotefilelog: avoid temporarily using "count" variable as synonym for "total"
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb34b1b865ef9: remotefilelog: avoid temporarily using "count" variable as synonym for "total"
Summary

The "count" variable is generally used for updating progress, but
early in fileserverclient.request(), its used to mean the total
count. We already have another "total" variable for that, so it seems
much clearer to use that.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 12721

hgext/remotefilelog/fileserverclient.py

If the connection fails, an exception is raised. If the connection fails, an exception is raised.
""" """
if not self.remotecache.connected: if not self.remotecache.connected:
self.connect() self.connect()
cache = self.remotecache cache = self.remotecache
writedata = self.writedata writedata = self.writedata
repo = self.repo repo = self.repo
count = len(fileids) total = len(fileids)
request = "get\n%d\n" % count request = "get\n%d\n" % total
idmap = {} idmap = {}
reponame = repo.name reponame = repo.name
for file, id in fileids: for file, id in fileids:
fullid = getcachekey(reponame, file, id) fullid = getcachekey(reponame, file, id)
if self.cacheprocesspasspath: if self.cacheprocesspasspath:
request += file + '\0' request += file + '\0'
request += fullid + "\n" request += fullid + "\n"
idmap[fullid] = file idmap[fullid] = file
cache.request(request) cache.request(request)
total = count progress = self.ui.makeprogress(_('downloading'), total=total)
progress = self.ui.makeprogress(_('downloading'), total=count)
progress.update(0) progress.update(0)
missed = [] missed = []
count = 0 count = 0
while True: while True:
missingid = cache.receiveline() missingid = cache.receiveline()
if not missingid: if not missingid:
missedset = set(missed) missedset = set(missed)