This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1986

wireprotoserver: remove lock references
ClosedPublic

Authored by indygreg on Feb 1 2018, 6:11 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5a9ff8c20123: wireprotoserver: remove lock references
rHG6edb973da584: wireprotoserver: remove lock references
Summary

AFAICT sshserver.lock is unused. The last caller of it disappeared
in 9f6e0e7ef828 ~18 months ago as part of removing code to support
ancient wire protocol commands. Let's remove some dead code.

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

indygreg created this revision.Feb 1 2018, 6:11 PM
durin42 accepted this revision.Feb 1 2018, 6:24 PM
This revision is now accepted and ready to land.Feb 1 2018, 6:24 PM
Closed by commit rHG6edb973da584: wireprotoserver: remove lock references (authored by indygreg). · Explain WhyFeb 1 2018, 6:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotoserver.py (9 lines)

Diff 5124

mercurial/wireprotoserver.py

req.respond(HTTP_OK, HGERRTYPE, body=rsp) req.respond(HTTP_OK, HGERRTYPE, body=rsp)
return [] return []
raise error.ProgrammingError('hgweb.protocol internal failure', rsp) raise error.ProgrammingError('hgweb.protocol internal failure', rsp)
class sshserver(abstractserverproto): class sshserver(abstractserverproto):
def __init__(self, ui, repo): def __init__(self, ui, repo):
self.ui = ui self.ui = ui
self.repo = repo self.repo = repo
self.lock = None
self.fin = ui.fin self.fin = ui.fin
self.fout = ui.fout self.fout = ui.fout
self.name = 'ssh' self.name = 'ssh'
hook.redirect(True) hook.redirect(True)
ui.fout = repo.ui.fout = ui.ferr ui.fout = repo.ui.fout = ui.ferr
# Prevent insertion/deletion of CRs # Prevent insertion/deletion of CRs
def sendooberror(self, rsp): def sendooberror(self, rsp):
self.ui.ferr.write('%s\n-\n' % rsp.message) self.ui.ferr.write('%s\n-\n' % rsp.message)
self.ui.ferr.flush() self.ui.ferr.flush()
self.fout.write('\n') self.fout.write('\n')
self.fout.flush() self.fout.flush()
def serve_forever(self): def serve_forever(self):
try:
while self.serve_one(): while self.serve_one():
pass pass
finally:
if self.lock is not None:
self.lock.release()
sys.exit(0) sys.exit(0)
handlers = { handlers = {
str: sendresponse, str: sendresponse,
wireproto.streamres: sendstream, wireproto.streamres: sendstream,
wireproto.streamres_legacy: sendstream, wireproto.streamres_legacy: sendstream,
wireproto.pushres: sendpushresponse, wireproto.pushres: sendpushresponse,
wireproto.pusherr: sendpusherror, wireproto.pusherr: sendpusherror,