D2029: sshpeer: extract pipe cleanup logic to own function
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Tue Feb 6 08:24:22 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG805edf16e8e0: sshpeer: extract pipe cleanup logic to own function (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2029?vs=5187&id=5246
REVISION DETAIL
https://phab.mercurial-scm.org/D2029
AFFECTED FILES
mercurial/sshpeer.py
CHANGE DETAILS
diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py
--- a/mercurial/sshpeer.py
+++ b/mercurial/sshpeer.py
@@ -114,6 +114,23 @@
def flush(self):
return self._main.flush()
+def _cleanuppipes(ui, pipei, pipeo, pipee):
+ """Clean up pipes used by an SSH connection."""
+ if pipeo:
+ pipeo.close()
+ if pipei:
+ pipei.close()
+
+ if pipee:
+ # Try to read from the err descriptor until EOF.
+ try:
+ for l in pipee:
+ ui.status(_('remote: '), l)
+ except (IOError, ValueError):
+ pass
+
+ pipee.close()
+
class sshpeer(wireproto.wirepeer):
def __init__(self, ui, path, create=False, sshstate=None):
self._url = path
@@ -221,17 +238,7 @@
raise exception
def _cleanup(self):
- if self._pipeo is None:
- return
- self._pipeo.close()
- self._pipei.close()
- try:
- # read the error descriptor until EOF
- for l in self._pipee:
- self.ui.status(_("remote: "), l)
- except (IOError, ValueError):
- pass
- self._pipee.close()
+ _cleanuppipes(self.ui, self._pipei, self._pipeo, self._pipee)
__del__ = _cleanup
To: indygreg, #hg-reviewers, lothiraldan, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list