diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /mercurial/sshserver.py | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-baserock/morph.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
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): |