( )⚙ D3775 progress: make the progress helper a context manager

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3775

progress: make the progress helper a context manager
ClosedPublic

Authored by martinvonz on Jun 18 2018, 3:04 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG800f5a2c869e: progress: make the progress helper a context manager
Summary

This lets us simplify the use site in streamclone.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 18 2018, 3:04 AM
Closed by commit rHG800f5a2c869e: progress: make the progress helper a context manager (authored by martinvonz). · Explain WhyJun 18 2018, 10:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (6 lines)
Mmercurial/streamclone.py (59 lines)

Diff 9179

mercurial/scmutil.py

class progress(object): class progress(object):
def __init__(self, ui, topic, unit="", total=None): def __init__(self, ui, topic, unit="", total=None):
self.ui = ui self.ui = ui
self.pos = 0 self.pos = 0
self.topic = topic self.topic = topic
self.unit = unit self.unit = unit
self.total = total self.total = total
def __enter__(self):
pass
def __exit__(self, exc_type, exc_value, exc_tb):
self.complete()
def update(self, pos, item="", total=None): def update(self, pos, item="", total=None):
if total: if total:
self.total = total self.total = total
self.pos = pos self.pos = pos
self._print(item) self._print(item)
def increment(self, step=1, item="", total=None): def increment(self, step=1, item="", total=None):
self.update(self.pos + step, item, total) self.update(self.pos + step, item, total)

mercurial/streamclone.py

return vfsmap return vfsmap
def _emit2(repo, entries, totalfilesize): def _emit2(repo, entries, totalfilesize):
"""actually emit the stream bundle""" """actually emit the stream bundle"""
vfsmap = _makemap(repo) vfsmap = _makemap(repo)
progress = repo.ui.makeprogress(_('bundle'), total=totalfilesize, progress = repo.ui.makeprogress(_('bundle'), total=totalfilesize,
unit=_('bytes')) unit=_('bytes'))
progress.update(0) progress.update(0)
with maketempcopies() as copy: with maketempcopies() as copy, progress:
try:
# copy is delayed until we are in the try # copy is delayed until we are in the try
entries = [_filterfull(e, copy, vfsmap) for e in entries] entries = [_filterfull(e, copy, vfsmap) for e in entries]
yield None # this release the lock on the repository yield None # this release the lock on the repository
seen = 0 seen = 0
for src, name, ftype, data in entries: for src, name, ftype, data in entries:
vfs = vfsmap[src] vfs = vfsmap[src]
yield src yield src
yield util.uvarintencode(len(name)) yield util.uvarintencode(len(name))
if ftype == _fileappend: if ftype == _fileappend:
fp = vfs(name) fp = vfs(name)
size = data size = data
elif ftype == _filefull: elif ftype == _filefull:
fp = open(data, 'rb') fp = open(data, 'rb')
size = util.fstat(fp).st_size size = util.fstat(fp).st_size
try: try:
yield util.uvarintencode(size) yield util.uvarintencode(size)
yield name yield name
if size <= 65536: if size <= 65536:
chunks = (fp.read(size),) chunks = (fp.read(size),)
else: else:
chunks = util.filechunkiter(fp, limit=size) chunks = util.filechunkiter(fp, limit=size)
for chunk in chunks: for chunk in chunks:
seen += len(chunk) seen += len(chunk)
progress.update(seen) progress.update(seen)
yield chunk yield chunk
finally: finally:
fp.close() fp.close()
finally:
progress.complete()
def generatev2(repo): def generatev2(repo):
"""Emit content for version 2 of a streaming clone. """Emit content for version 2 of a streaming clone.
the data stream consists the following entries: the data stream consists the following entries:
1) A char representing the file destination (eg: store or cache) 1) A char representing the file destination (eg: store or cache)
2) A varint containing the length of the filename 2) A varint containing the length of the filename
3) A varint containing the length of file data 3) A varint containing the length of file data