This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2030

sshpeer: remove frivolous call to _cleanup()
ClosedPublic

Authored by indygreg on Feb 4 2018, 10:35 PM.

Details

Reviewers
lothiraldan
yuja
Group Reviewers
hg-reviewers
Commits
rHG94ba29934f00: sshpeer: remove frivolous call to _cleanup()
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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 4 2018, 10:35 PM
lothiraldan accepted this revision.Feb 5 2018, 8:05 AM
yuja accepted this revision.Feb 6 2018, 8:07 AM
This revision is now accepted and ready to land.Feb 6 2018, 8:07 AM
Closed by commit rHG94ba29934f00: sshpeer: remove frivolous call to _cleanup() (authored by indygreg). · Explain WhyFeb 6 2018, 8:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (3 lines)

Diff 5188

mercurial/sshpeer.py

# Begin of _basewirecommands interface. # Begin of _basewirecommands interface.
def capabilities(self): def capabilities(self):
return self._caps return self._caps
# End of _basewirecommands interface. # End of _basewirecommands interface.
def _validaterepo(self, sshcmd, args, remotecmd, sshenv=None): def _validaterepo(self, sshcmd, args, remotecmd, sshenv=None):
# cleanup up previous run assert self._pipei is None
self._cleanup()
cmd = '%s %s %s' % (sshcmd, args, cmd = '%s %s %s' % (sshcmd, args,
util.shellquote("%s -R %s serve --stdio" % util.shellquote("%s -R %s serve --stdio" %
(_serverquote(remotecmd), _serverquote(self._path)))) (_serverquote(remotecmd), _serverquote(self._path))))
self.ui.debug('running %s\n' % cmd) self.ui.debug('running %s\n' % cmd)
cmd = util.quotecommand(cmd) cmd = util.quotecommand(cmd)
# while self._subprocess isn't used, having it allows the subprocess to # while self._subprocess isn't used, having it allows the subprocess to