This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7959

lfs: move the initialization of the upload request into the try block
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG46c8f15fb2b4: lfs: move the initialization of the upload request into the try block
rHG71d6f2849dbb: lfs: move the initialization of the upload request into the try block
Summary

This (almost) guarantees that the file is closed in the case of an exception.
The one hole is if the seek(SEEK_END)/tell()/seek(0) sequence fails. But
that's going to go away when subclassing httpconnection.httpsendfile to fix
the worker problem, so I'm not going to worry too much. (And that class appears
to have the same problem.)

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

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

Diff 19493

hgext/lfs/blobstore.py

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 = lfsuploadfile(localstore.open(oid))
request.get_method = lambda: 'PUT'
request.add_header('Content-Type', 'application/octet-stream')
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:
if action == b'upload':
request.data = lfsuploadfile(localstore.open(oid))
request.get_method = lambda: 'PUT'
request.add_header('Content-Type', 'application/octet-stream')
request.add_header('Content-Length', len(request.data))
with contextlib.closing(self.urlopener.open(request)) as res: with contextlib.closing(self.urlopener.open(request)) as res:
contentlength = res.info().get(b"content-length") contentlength = res.info().get(b"content-length")
ui = self.ui # Shorten debug lines ui = self.ui # Shorten debug lines
if self.ui.debugflag: if self.ui.debugflag:
ui.debug(b'Status: %d\n' % res.status) ui.debug(b'Status: %d\n' % res.status)
# lfs-test-server and hg serve return headers in different # lfs-test-server and hg serve return headers in different
# order # order
headers = pycompat.bytestr(res.info()).strip() headers = pycompat.bytestr(res.info()).strip()