diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
---|---|---|
committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /mercurial/sshserver.py | |
parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
download | mercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
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): |