Patchwork D2030: sshpeer: remove frivolous call to _cleanup()

login
register
mail settings
Submitter phabricator
Date Feb. 5, 2018, 3:35 a.m.
Message ID <differential-rev-PHID-DREV-xp5eva75tk62hyyv5drj-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27289/
State Superseded
Headers show

Comments

phabricator - Feb. 5, 2018, 3:35 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  _validaterepo() is called once during __init__. _cleanup()
  no-ops if the self._pipe* attributes aren't set. These attributes
  are set during _validaterepo(). So the call to _cleanup() isn't
  necessary.
  
  But just to be on the safe side, we add an assertion.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2030

AFFECTED FILES
  mercurial/sshpeer.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py
--- a/mercurial/sshpeer.py
+++ b/mercurial/sshpeer.py
@@ -173,8 +173,7 @@ 
     # End of _basewirecommands interface.
 
     def _validaterepo(self, sshcmd, args, remotecmd, sshenv=None):
-        # cleanup up previous run
-        self._cleanup()
+        assert self._pipei is None
 
         cmd = '%s %s %s' % (sshcmd, args,
             util.shellquote("%s -R %s serve --stdio" %