Merge lp:~jelmer/brz/fix-redirects into lp:brz

[Jelmer Vernooij]

Raise an informational message when unable to interpret redirect.

Raise an informational message when unable to interpret redirect.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/transport/__init__.py'
--- breezy/transport/__init__.py	2019-02-09 03:23:20 +0000
+++ breezy/transport/__init__.py	2019-09-21 14:46:19 +0000
@@ -31,19 +31,8 @@
 import errno
 import sys
 
-from ..lazy_import import lazy_import
-lazy_import(globals(), """
 from stat import S_ISDIR
 
-from breezy import (
-    errors,
-    location as _mod_location,
-    osutils,
-    ui,
-    urlutils,
-    )
-""")
-
 from ..sixish import (
     BytesIO,
     PY3,
@@ -53,8 +42,12 @@
     mutter,
     )
 from .. import (
+    errors,
     hooks,
     registry,
+    osutils,
+    ui,
+    urlutils,
     )
 
 
@@ -96,6 +89,16 @@
     return result
 
 
+class UnusableRedirect(errors.BzrError):
+
+    _fmt = ("Unable to follow redirect from %(source)s to %(target)s: "
+            "%(reason)s.")
+
+    def __init__(self, source, target, reason):
+        super(UnusableRedirect, self).__init__(
+            source=source, target=target, reason=reason)
+
+
 class TransportListRegistry(registry.Registry):
     """A registry which simplifies tracking available Transports.
 
@@ -1235,11 +1238,13 @@
         The redirection can be handled only if the relpath involved is not
         renamed by the redirection.
 
-        :returns: A transport or None.
+        :returns: A transport
+        :raise UnusableRedirect: when redirection can not be provided
         """
         # This returns None by default, meaning the transport can't handle the
         # redirection.
-        return None
+        raise UnusableRedirect(
+            source, target, "transport does not support redirection")
 
 
 class _SharedConnection(object):
@@ -1569,8 +1574,9 @@
     """
     if base is None:
         base = '.'
+    from ..location import location_to_url
     return get_transport_from_url(
-        _mod_location.location_to_url(base, purpose=purpose),
+        location_to_url(base, purpose=purpose),
         possible_transports)
 
 
 
=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2019-08-11 16:27:38 +0000
+++ breezy/transport/http/__init__.py	2019-09-21 14:46:19 +0000
@@ -81,6 +81,7 @@
 from ...trace import mutter
 from ...transport import (
     ConnectedTransport,
+    UnusableRedirect,
     )
 
 
@@ -2500,7 +2501,8 @@
         The redirection can be handled only if the relpath involved is not
         renamed by the redirection.
 
-        :returns: A transport or None.
+        :returns: A transport
+        :raise UnusableRedirect: when the URL can not be reinterpreted
         """
         parsed_source = self._split_url(source)
         parsed_target = self._split_url(target)
@@ -2511,7 +2513,8 @@
         if not parsed_target.path.endswith(excess_tail):
             # The final part of the url has been renamed, we can't handle the
             # redirection.
-            return None
+            raise UnusableRedirect(
+                source, target, "final part of the url was renamed")
 
         target_path = parsed_target.path
         if excess_tail: