Merge lp:~jelmer/brz/fix-foreign-commits into lp:brz

[Jelmer Vernooij]

Fix parsing of foreign revision ids.

Fix parsing of foreign revision ids.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/4/

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/5/

=== modified file 'breezy/foreign.py'
--- breezy/foreign.py	2018-07-19 22:55:15 +0000
+++ breezy/foreign.py	2018-11-15 22:42:55 +0000
@@ -171,7 +171,7 @@
         :param foreign_vcs: ForeignVCS instance
         :param help: Description of the foreign VCS
         """
-        if b":" in key or b"-" in key:
+        if ":" in key or "-" in key:
             raise ValueError("vcs name can not contain : or -")
         registry.Registry.register(self, key, foreign_vcs, help)
 
@@ -185,7 +185,7 @@
         if b":" not in revid or b"-" not in revid:
             raise errors.InvalidRevisionId(revid, None)
         try:
-            foreign_vcs = self.get(revid.split(b"-")[0])
+            foreign_vcs = self.get(revid.split(b"-")[0].decode('ascii'))
         except KeyError:
             raise errors.InvalidRevisionId(revid, None)
         return foreign_vcs.mapping_registry.revision_id_bzr_to_foreign(revid)

=== modified file 'breezy/tests/test_foreign.py'
--- breezy/tests/test_foreign.py	2018-08-02 01:10:26 +0000
+++ breezy/tests/test_foreign.py	2018-11-15 22:42:55 +0000
@@ -396,7 +396,7 @@
     def test_parse_revision_id(self):
         reg = foreign.ForeignVcsRegistry()
         vcs = DummyForeignVcs()
-        reg.register(b"dummy", vcs, "Dummy VCS")
+        reg.register("dummy", vcs, "Dummy VCS")
         self.assertEqual((
             (b"some", b"foreign", b"revid"), DummyForeignVcsMapping(vcs)),
             reg.parse_revision_id(b"dummy-v1:some-foreign-revid"))