This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6784

httppeer: use context manager when reading temporary bundle to send
ClosedPublic

Authored by martinvonz on Sep 5 2019, 12:36 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG37debb6771f5: httppeer: use context manager when reading temporary bundle to send

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.Sep 5 2019, 12:36 AM
martinvonz added a commit: rHG37debb6771f5: httppeer: use context manager when reading temporary bundle to send.Sep 5 2019, 2:57 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG37debb6771f5: httppeer: use context manager when reading temporary bundle to send (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/httppeer.py (9 lines)

Diff 16373

mercurial/httppeer.py

if err.args[0] in (errno.ECONNRESET, errno.EPIPE): if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
raise error.Abort(_('push failed: %s') % err.args[1]) raise error.Abort(_('push failed: %s') % err.args[1])
raise error.Abort(err.args[1]) raise error.Abort(err.args[1])
finally: finally:
fp.close() fp.close()
os.unlink(tempname) os.unlink(tempname)
def _calltwowaystream(self, cmd, fp, **args): def _calltwowaystream(self, cmd, fp, **args):
fp_ = None
filename = None filename = None
try: try:
# dump bundle to disk # dump bundle to disk
fd, filename = pycompat.mkstemp(prefix="hg-bundle-", suffix=".hg") fd, filename = pycompat.mkstemp(prefix="hg-bundle-", suffix=".hg")
with os.fdopen(fd, r"wb") as fh: with os.fdopen(fd, r"wb") as fh:
d = fp.read(4096) d = fp.read(4096)
while d: while d:
fh.write(d) fh.write(d)
d = fp.read(4096) d = fp.read(4096)
# start http push # start http push
fp_ = httpconnection.httpsendfile(self.ui, filename, "rb") with httpconnection.httpsendfile(self.ui, filename, "rb") as fp_:
headers = {r'Content-Type': r'application/mercurial-0.1'} headers = {r'Content-Type': r'application/mercurial-0.1'}
return self._callstream(cmd, data=fp_, headers=headers, **args) return self._callstream(cmd, data=fp_, headers=headers, **args)
finally: finally:
if fp_ is not None:
fp_.close()
if filename is not None: if filename is not None:
os.unlink(filename) os.unlink(filename)
def _callcompressable(self, cmd, **args): def _callcompressable(self, cmd, **args):
return self._callstream(cmd, _compressible=True, **args) return self._callstream(cmd, _compressible=True, **args)
def _abort(self, exception): def _abort(self, exception):
raise exception raise exception