Merge lp:~a1s/brz/3.2-windows-local-paths into lp:brz/3.2

[Aleksandr Smyshliaev]

Fix: location_to_url didn't call local_path_to_url for plain ASCII paths

On Windows, this produced "ssh:" urls instead of "file:"

[Aleksandr Smyshliaev (a1s)]

The test is https://bugs.launchpad.net/brz/+bug/1951112

[Jelmer Vernooij (jelmer)]

Please add a test in breezy/tests/test_location.py as well?

[Aleksandr Smyshliaev (a1s)]

> Please add a test in breezy/tests/test_location.py as well?

The test for this is test_location.TestLocationToUrl.test_path, as said in https://bugs.launchpad.net/brz/+bug/1951112

The test is failing without this fix, and passing with it.

[Jelmer Vernooij (jelmer)]

> > Please add a test in breezy/tests/test_location.py as well?
>
> The test for this is test_location.TestLocationToUrl.test_path, as said in
> https://bugs.launchpad.net/brz/+bug/1951112
>
> The test is failing without this fix, and passing with it.
It doesn't fail on Linux without this change, and adding a test will help prevent this regressing.

[Aleksandr Smyshliaev (a1s)]

> > The test for this is test_location.TestLocationToUrl.test_path, as said
> > in https://bugs.launchpad.net/brz/+bug/1951112
> >
> > The test is failing without this fix, and passing with it.
>
> It doesn't fail on Linux without this change, and adding a test will help
> prevent this regressing.

Ah, I see. Ok, here it is.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/location.py'
--- breezy/location.py	2021-06-04 19:21:33 +0000
+++ breezy/location.py	2021-12-07 13:25:31 +0000
@@ -47,7 +47,8 @@
     :return: A URL, e.g. "ssh://foo/bar"
     :raises ValueError: if this is not a RCP-style URL
     """
-    m = re.match('^(?P<user>[^@:/]+@)?(?P<host>[^/:]+):(?P<path>.*)$', location)
+    m = re.match('^(?P<user>[^@:/]+@)?(?P<host>[^/:]{2,}):(?P<path>.*)$',
+        location)
     if not m:
         raise ValueError("Not a RCP URL")
     if m.group('path').startswith('//'):

=== modified file 'breezy/tests/test_location.py'
--- breezy/tests/test_location.py	2021-06-04 19:21:33 +0000
+++ breezy/tests/test_location.py	2021-12-07 13:25:31 +0000
@@ -131,3 +131,5 @@
     def test_invalid(self):
         self.assertRaises(ValueError, rcp_location_to_url, "http://srv/git/bar")
         self.assertRaises(ValueError, rcp_location_to_url, "git/bar")
+        # rcp host names cannot be shorter than two characters
+        self.assertRaises(ValueError, rcp_location_to_url, "c:/git/bar")