changeset 21188:d36440d84328 stable

httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa Including the missing test coverage that would have caught it.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 23 Apr 2014 23:29:55 +0200
parents bcfd44abad93
children 2a74c5af892f
files mercurial/httppeer.py tests/test-identify.t tests/test-ssh.t
diffstat 3 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/httppeer.py	Mon Apr 21 16:13:15 2014 -0700
+++ b/mercurial/httppeer.py	Wed Apr 23 23:29:55 2014 +0200
@@ -237,6 +237,9 @@
         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:
--- a/tests/test-identify.t	Mon Apr 21 16:13:15 2014 -0700
+++ b/tests/test-identify.t	Wed Apr 23 23:29:55 2014 +0200
@@ -109,6 +109,12 @@
   $ 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
--- a/tests/test-ssh.t	Mon Apr 21 16:13:15 2014 -0700
+++ b/tests/test-ssh.t	Wed Apr 23 23:29:55 2014 +0200
@@ -284,6 +284,10 @@
   $ 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 @@
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
+  Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio