# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2011-03-07 21:50:55
# Node ID cc9366a3751b913323a198797972c187e56f51bd
# Parent  617483af1cc0eb79f088295b0ae90949aa5135c6

httprepo: use the original exception after falling back to static-http failed

Before the fine exception handling in httprepo was never shown.

The static-http exception will now only be shown when static-http is requested
explicitly.

diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py
--- a/mercurial/httprepo.py
+++ b/mercurial/httprepo.py
@@ -224,6 +224,10 @@ def instance(ui, path, create):
             # No luck, try older compatibility check.
             inst.between([(nullid, nullid)])
         return inst
-    except error.RepoError:
-        ui.note('(falling back to static-http)\n')
-        return statichttprepo.instance(ui, "static-" + path, create)
+    except error.RepoError, httpexception:
+        try:
+            r = statichttprepo.instance(ui, "static-" + path, create)
+            ui.note('(falling back to static-http)\n')
+            return r
+        except error.RepoError:
+            raise httpexception # use the original http RepoError instead