This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7956

lfs: drop the unused progressbar code in the `filewithprogress` class
ClosedPublic

Authored by mharbison72 on Jan 21 2020, 1:37 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5f841daf3b41: lfs: drop the unused progressbar code in the `filewithprogress` class
rHG0e7add24399a: lfs: drop the unused progressbar code in the `filewithprogress` class
Summary

This has been unused since f98fac24b757, which added worker based transfers for
concurrency, shifting the progressbar maintenance to the single thread waiting
on the worker to complete. Since the name no longer fits, rename the class.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/blobstore.py (14 lines)

Diff 19506

hgext/lfs/blobstore.py

def walk(self, path=None, onerror=None): def walk(self, path=None, onerror=None):
return (b'', [], []) return (b'', [], [])
def write(self, oid, data): def write(self, oid, data):
pass pass
class filewithprogress(object): class lfsuploadfile(object):
"""a file-like object that supports __len__ and read. """a file-like object that supports __len__ and read.
Useful to provide progress information for how many bytes are read.
""" """
def __init__(self, fp, callback): def __init__(self, fp):
self._fp = fp self._fp = fp
self._callback = callback # func(readsize)
fp.seek(0, os.SEEK_END) fp.seek(0, os.SEEK_END)
self._len = fp.tell() self._len = fp.tell()
fp.seek(0) fp.seek(0)
def __len__(self): def __len__(self):
return self._len return self._len
def read(self, size): def read(self, size):
if self._fp is None: if self._fp is None:
return b'' return b''
data = self._fp.read(size) data = self._fp.read(size)
if data: if not data:
if self._callback:
self._callback(len(data))
else:
self._fp.close() self._fp.close()
self._fp = None self._fp = None
return data return data
class local(object): class local(object):
"""Local blobstore for large file contents. """Local blobstore for large file contents.
request = util.urlreq.request(pycompat.strurl(href)) request = util.urlreq.request(pycompat.strurl(href))
if action == b'upload': if action == b'upload':
# If uploading blobs, read data from local blobstore. # If uploading blobs, read data from local blobstore.
if not localstore.verify(oid): if not localstore.verify(oid):
raise error.Abort( raise error.Abort(
_(b'detected corrupt lfs object: %s') % oid, _(b'detected corrupt lfs object: %s') % oid,
hint=_(b'run hg verify'), hint=_(b'run hg verify'),
) )
request.data = filewithprogress(localstore.open(oid), None) request.data = lfsuploadfile(localstore.open(oid))
request.get_method = lambda: r'PUT' request.get_method = lambda: r'PUT'
request.add_header('Content-Type', 'application/octet-stream') request.add_header('Content-Type', 'application/octet-stream')
request.add_header('Content-Length', len(request.data)) request.add_header('Content-Length', len(request.data))
for k, v in headers: for k, v in headers:
request.add_header(pycompat.strurl(k), pycompat.strurl(v)) request.add_header(pycompat.strurl(k), pycompat.strurl(v))
try: try: