[PATCH stable] httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich
mads at kiilerich.com
Wed Apr 23 21:55:39 UTC 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1398288595 -7200
# Wed Apr 23 23:29:55 2014 +0200
# Branch stable
# Node ID 5594e81b7ab8af223b1219868b30488ecddc7da0
# Parent bcfd44abad933390b1b21d7ffcd107fca0023dd2
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Including the missing test coverage that would have caught it.
diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -237,6 +237,9 @@ class httppeer(wireproto.wirepeer):
stream = self._callstream(cmd, **args)
return util.chunkbuffer(zgenerator(stream))
+ def _abort(self, exception):
+ raise exception
+
class httpspeer(httppeer):
def __init__(self, ui, path):
if not url.has_https:
diff --git a/tests/test-identify.t b/tests/test-identify.t
--- a/tests/test-identify.t
+++ b/tests/test-identify.t
@@ -109,6 +109,12 @@ test remote identify with bookmarks
$ hg id --bookmarks -r . http://localhost:$HGPORT1/
Y Z
+test invalid lookup
+
+ $ hg id -r noNoNO http://localhost:$HGPORT1/
+ abort: unknown revision 'noNoNO'!
+ [255]
+
Make sure we do not obscure unknown requires file entries (issue2649)
$ echo fake >> .hg/requires
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -284,6 +284,10 @@ Test remote paths with spaces (issue2983
$ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
73649e48688a
+ $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO"
+ abort: unknown revision 'noNoNO'!
+ [255]
+
Test (non-)escaping of remote paths with spaces when cloning (issue3145):
$ hg clone --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
@@ -382,3 +386,4 @@ Test hg-ssh in read-only mode:
Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
+ Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
More information about the Mercurial-devel
mailing list