diff options
Diffstat (limited to 'mercurial/sshserver.py')
| -rw-r--r-- | mercurial/sshserver.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mercurial/sshserver.py b/mercurial/sshserver.py index 7c0a4e8..d231178 100644 --- a/mercurial/sshserver.py +++ b/mercurial/sshserver.py @@ -82,12 +82,6 @@ class sshserver(object): def sendpusherror(self, rsp): self.sendresponse(rsp.res) - def sendooberror(self, rsp): - self.ui.ferr.write('%s\n-\n' % rsp.message) - self.ui.ferr.flush() - self.fout.write('\n') - self.fout.flush() - def serve_forever(self): try: while self.serve_one(): @@ -102,7 +96,6 @@ class sshserver(object): wireproto.streamres: sendstream, wireproto.pushres: sendpushresponse, wireproto.pusherr: sendpusherror, - wireproto.ooberror: sendooberror, } def serve_one(self): @@ -142,8 +135,8 @@ class sshserver(object): self.sendresponse("") cg = changegroup.unbundle10(self.fin, "UN") - r = self.repo.addchangegroup(cg, 'serve', self._client()) - self.lock.release() + r = self.repo.addchangegroup(cg, 'serve', self._client(), + lock=self.lock) return str(r) def _client(self): |