Merge lp:~jelmer/bzr-builddeb/version-bytestrings into lp:~jelmer/bzr-builddeb/716854-fix-build

[Jelmer Vernooij]

[lp:~jelmer/bzr-builddeb/version-bytestrings]

522. By Jelmer Vernooij on 2011-02-20

Force upstream version to byte string.

Unmerged revisions

522. By Jelmer Vernooij on 2011-02-20

Force upstream version to byte string.

521. By Jelmer Vernooij on 2011-02-20

Use upstream version strings as byte strings everywhere, properly convert unicode tags to byte strings.

520. By Jelmer Vernooij on 2011-02-11

Merge build fixes.

519. By Jelmer Vernooij on 2011-02-11

Merge addition of more PristineTarSource tests.

=== modified file 'cmds.py'
--- cmds.py	2011-02-11 14:29:07 +0000
+++ cmds.py	2011-02-20 17:17:01 +0000
@@ -708,6 +708,7 @@
                     package, current_version)
             if version is None:
                 raise BzrCommandError("You must specify the version number using --version.")
+            assert isinstance(version, str)
             note("Using version string %s." % (version))
             # Look up the revision id from the version string
             if upstream_revision is None and upstream_branch_source is not None:

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-02-11 14:29:07 +0000
+++ import_dsc.py	2011-02-20 17:17:01 +0000
@@ -1385,8 +1385,8 @@
             upstream_tip = self.pristine_tar_source.version_as_revision(
                     package, previous_version)
             self.extract_upstream_tree(upstream_tip, tempdir)
-        elif upstream_branch is not None:
-            upstream_tip = self.upstream_branch_source.version_as_revision(package, previous_version)
+        elif self.upstream_source is not None:
+            upstream_tip = self.upstream_source.version_as_revision(package, previous_version)
             self.extract_upstream_tree(upstream_tip, tempdir)
         else:
             raise BzrCommandError("Unable to find the tag for the "

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-04 11:30:52 +0000
+++ tests/test_upstream.py	2011-02-20 17:17:01 +0000
@@ -22,6 +22,7 @@
 
 """Tests for the upstream module."""
 
+from base64 import standard_b64encode
 
 import os
 import tarfile
@@ -386,7 +387,7 @@
       """Last revision is tagged - use as upstream version."""
       self.revhistory = ["somerevid"]
       self.assertEquals(Version("1.3"),
-          _upstream_branch_version(self.revhistory, {"somerevid": ["1.3"]}, "bla", "1.2", self.get_suffix))
+          _upstream_branch_version(self.revhistory, {"somerevid": [u"1.3"]}, "bla", "1.2", self.get_suffix))
 
     def test_refresh_snapshot_pre(self):
       self.revhistory = ["oldrevid", "somerevid"]
@@ -402,25 +403,28 @@
       self.revhistory = ["oldrevid", "somerevid", "newrevid"]
       self.assertEquals(Version("1.3+bzr3"),
             _upstream_branch_version(self.revhistory,
-                {"somerevid": ["1.3"]}, "bla", "1.2+bzr1", self.get_suffix))
+                {"somerevid": [u"1.3"]}, "bla", "1.2+bzr1", self.get_suffix))
 
 
 class TestUpstreamTagToVersion(TestCase):
 
     def test_prefix(self):
-        self.assertEquals(Version("5.0"), upstream_tag_to_version("release-5.0"))
+        self.assertEquals(Version("5.0"), upstream_tag_to_version(u"release-5.0"))
 
     def test_gibberish(self):
-        self.assertIs(None, upstream_tag_to_version("blabla"))
+        self.assertIs(None, upstream_tag_to_version(u"blabla"))
 
     def test_vprefix(self):
-        self.assertEquals(Version("2.0"), upstream_tag_to_version("v2.0"))
+        self.assertEquals("2.0", upstream_tag_to_version(u"v2.0"))
 
     def test_plain(self):
-        self.assertEquals(Version("2.0"), upstream_tag_to_version("2.0"))
+        self.assertEquals("2.0", upstream_tag_to_version(u"2.0"))
 
     def test_package_prefix(self):
-        self.assertEquals(Version("42.0"), upstream_tag_to_version("bla-42.0", "bla"))
+        self.assertEquals("42.0", upstream_tag_to_version(u"bla-42.0", "bla"))
+
+    def test_unicode(self):
+        self.assertEquals("42.0\xc2\xa9", upstream_tag_to_version("bla-42.0\xc2\xa9".decode("utf-8"), "bla"))
 
 
 class TestUpstreamVersionAddRevision(TestCaseWithTransport):
@@ -531,11 +535,40 @@
         self.assertEqual(self.source.tag_name(upstream_v_no),
                 "upstream-" + upstream_v_no)
 
+    def test_tag_name_distro(self):
+        self.assertEquals(self.source.tag_name("0.3", "ubuntu"),
+                "upstream-ubuntu-0.3")
+
     def test_version(self):
         self.assertEquals(['upstream-3.3', 'upstream-debian-3.3',
             'upstream-ubuntu-3.3', 'upstream/3.3'],
             self.source.possible_tag_names("3.3"))
 
+    def test_pristine_tar_format_gz(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta"] = "1"
+        self.assertEquals("gz", self.source.pristine_tar_format(rev))
+
+    def test_pristine_tar_format_bz2(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta-bz2"] = "1"
+        self.assertEquals("bz2", self.source.pristine_tar_format(rev))
+
+    def test_pristine_tar_format_unknown(self):
+        rev = Revision("myrevid")
+        self.assertRaises(AssertionError,
+            self.source.pristine_tar_format, rev)
+
+    def test_pristine_tar_delta_unknown(self):
+        rev = Revision("myrevid")
+        self.assertRaises(AssertionError,
+            self.source.pristine_tar_delta, rev)
+
+    def test_pristine_tar_delta_gz(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta"] = standard_b64encode("bla")
+        self.assertEquals("bla", self.source.pristine_tar_delta(rev))
+
 
 class TarfileSourceTests(TestCaseWithTransport):
     """Tests for TarfileSource."""

=== modified file 'upstream/branch.py'
--- upstream/branch.py	2011-01-29 01:03:18 +0000
+++ upstream/branch.py	2011-02-20 17:17:01 +0000
@@ -33,16 +33,17 @@
 
 def upstream_tag_to_version(tag_name, package=None):
     """Take a tag name and return the upstream version, or None."""
+    assert isinstance(tag_name, unicode)
     if (package is not None and (
           tag_name.startswith("%s-" % package) or
           tag_name.startswith("%s_" % package))):
-        return tag_name[len(package)+1:]
+        return tag_name[len(package)+1:].encode("utf-8")
     if tag_name.startswith("release-"):
-        return tag_name[len("release-"):]
+        return tag_name[len("release-"):].encode("utf-8")
     if tag_name[0] == "v" and tag_name[1].isdigit():
-        return tag_name[1:]
+        return tag_name[1:].encode("utf-8")
     if all([c.isdigit() or c in (".", "~") for c in tag_name]):
-        return tag_name
+        return tag_name.encode("utf-8")
     return None
 
 
@@ -227,6 +228,7 @@
             self.upstream_revision_map = upstream_revision_map
 
     def version_as_revision(self, package, version):
+        assert isinstance(version, str)
         if version in self.upstream_revision_map:
              return self.upstream_revision_map[version]
         revspec = get_export_upstream_revision(self.config,