Merge lp:~jelmer/bzr-builddeb/get-export-upstream-revision-version into lp:bzr-builddeb

[Jelmer Vernooij]

Some trivial refactoring to make get_export_upstream_revision take an upstream version string rather than a version object.

This is required for the fix of bug 295274.

[James Westby (james-w)]

Hi,

Looks ok, but I might like an assert here similar to the ones you added when
we made similar changes elsewhere. It's easy to get the type wrong and
because Version defines __str__ get the wrong results. What do you think?

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

I've added an assertion.

=== modified file 'cmds.py'
--- cmds.py	2011-01-17 20:23:53 +0000
+++ cmds.py	2011-01-24 02:13:57 +0000
@@ -308,8 +308,8 @@
                 try:
                     if export_upstream_revision is None:
                         export_upstream_revision = \
-                                    get_export_upstream_revision(config,
-                                            version=version)
+                            get_export_upstream_revision(config,
+                                version=str(version.upstream_version))
                     if export_upstream_revision is None:
                         upstream_revision = \
                                 upstream_branch.last_revision()
 
=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-01-11 00:24:12 +0000
+++ tests/test_util.py	2011-01-24 02:13:57 +0000
@@ -721,25 +721,25 @@
     def test_snapshot_rev(self):
         config = DebBuildConfig([])
         self.assertEquals("34", 
-            get_export_upstream_revision(config, Version("0.1+bzr34-1")))
+            get_export_upstream_revision(config, "0.1+bzr34"))
 
     def test_export_upstream_rev(self):
         config = DebBuildConfig([
             ({"BUILDDEB": {"export-upstream-revision": "tag:foobar"}}, True)])
         self.assertEquals("tag:foobar", 
-            get_export_upstream_revision(config, Version("0.1-1")))
+            get_export_upstream_revision(config, "0.1"))
 
     def test_export_upstream_rev_var(self):
         config = DebBuildConfig([({"BUILDDEB": 
             {"export-upstream-revision": "tag:foobar-$UPSTREAM_VERSION"}},
             True)])
         self.assertEquals("tag:foobar-0.1", 
-            get_export_upstream_revision(config, Version("0.1-1")))
+            get_export_upstream_revision(config, "0.1"))
 
     def test_export_upstream_rev_not_set(self):
         config = DebBuildConfig([])
         self.assertEquals(None, 
-            get_export_upstream_revision(config, Version("0.1-1")))
+            get_export_upstream_revision(config, "0.1"))
 
 
 class FindPreviousUploadTests(TestCase):
 
=== modified file 'util.py'
--- util.py	2011-01-13 18:14:01 +0000
+++ util.py	2011-01-24 02:13:57 +0000
@@ -249,17 +249,17 @@
     """Find the revision to use when exporting the upstream source.
 
     :param config: Config object
-    :param version: Optional version to find revision for, if not the latest.
+    :param version: Optional upstream version to find revision for, if not the
+        latest.
     :return: Revision id
     """
     rev = None
     if version is not None:
-        rev = get_snapshot_revision(str(version.upstream_version))
+        rev = get_snapshot_revision(version)
     if rev is None:
         rev = config._get_best_opt('export-upstream-revision')
         if rev is not None and version is not None:
-            rev = rev.replace('$UPSTREAM_VERSION',
-                              str(version.upstream_version))
+            rev = rev.replace('$UPSTREAM_VERSION', version)
     return rev