Skip to content
Snippets Groups Projects
Commit 2e1a9b81 authored by Sune Foldager's avatar Sune Foldager
Browse files

httprepo: normalize output from unbundle with ssh

Lines from the remote are prefixed with 'remote: ' and written
locally using ui.status, similar to what sshrepo does.
parent dd352616
No related branches found
No related tags found
No related merge requests found
......@@ -239,7 +239,8 @@
except ValueError, err:
raise error.ResponseError(
_('push failed (unexpected response):'), resp)
self.ui.write(output)
for l in output.splitlines(True):
self.ui.status(_('remote: '), l)
return ret
except socket.error, err:
if err[0] in (errno.ECONNRESET, errno.EPIPE):
......
......@@ -4,7 +4,7 @@
% expect ssl error
pushing to http://localhost:$HGPORT/
searching for changes
ssl required
remote: ssl required
% serve errors
% expect authorization error
abort: authorization failed
......@@ -19,10 +19,10 @@
% expect success
pushing to http://localhost:$HGPORT/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
% serve errors
changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http
rolling back last transaction
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment