Mercurial > public > mercurial-scm > hg-stable
diff mercurial/sshserver.py @ 15017:f4522df38c65
wireproto: add out-of-band error class to allow remote repo to report errors
Older clients will still print the provided error message and not much else:
over ssh, this will be each line prefixed with 'remote: ' in addition to an
"abort: unexpected response: '\n'"; over http, this will be the '---%<---'
banners in addition to the 'does not appear to be a repository' message.
Currently, clients with this patch will display 'abort: remote error:\n' and
the provided error text, but it is trivial to style the error text however is
deemed appropriate.
| author | Andrew Pritchard <andrewp@fogcreek.com> |
|---|---|
| date | Tue, 02 Aug 2011 15:21:10 -0400 |
| parents | afccc64eea73 |
| children | a348739da8f0 |
line wrap: on
line diff
--- a/mercurial/sshserver.py Wed Aug 03 16:41:14 2011 -0500 +++ b/mercurial/sshserver.py Tue Aug 02 15:21:10 2011 -0400 @@ -82,6 +82,12 @@ 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(): @@ -96,6 +102,7 @@ wireproto.streamres: sendstream, wireproto.pushres: sendpushresponse, wireproto.pusherr: sendpusherror, + wireproto.ooberror: sendooberror, } def serve_one(self):