Mercurial > public > mercurial-scm > hg-stable

diff mercurial/sshrepo.py @ 15017:f4522df38c65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3c7907dc95ca
children d8fa35c28335
line wrap: on
line diff
--- a/mercurial/sshrepo.py	Wed Aug 03 16:41:14 2011 -0500
+++ b/mercurial/sshrepo.py	Tue Aug 02 15:21:10 2011 -0400
@@ -164,6 +164,17 @@
 
     def _recv(self):
         l = self.pipei.readline()
+        if l == '\n':
+            err = []
+            while True:
+                line = self.pipee.readline()
+                if line == '-\n':
+                    break
+                err.extend([line])
+            if len(err) > 0:
+                # strip the trailing newline added to the last line server-side
+                err[-1] = err[-1][:-1]
+            self._abort(error.OutOfBandError(*err))
         self.readerr()
         try:
             l = int(l)