Merge lp:~jelmer/bzr-builddeb/move-upstream-tag into lp:bzr-builddeb

[Jelmer Vernooij]

Move upstream tag code to upstream/pristinetar.py, as it is specific to pristine tar branches.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-06-24 10:51:46 +0000
+++ cmds.py	2011-06-27 10:35:50 +0000
@@ -86,10 +86,6 @@
         MergeModeDistiller,
         NativeSourceDistiller,
         )
-from bzrlib.plugins.builddeb.tagging import (
-        is_upstream_tag,
-        upstream_tag_version,
-        )
 from bzrlib.plugins.builddeb.upstream import (
         AptSource,
         GetOrigSourceSource,
@@ -952,11 +948,8 @@
         if db.pristine_upstream_source.has_version(None, version):
             raise BzrCommandError("Version %s is already present." % version)
         tagged_versions = {}
-        for tag_name, tag_revid in branch.tags.get_tag_dict().iteritems():
-            if not is_upstream_tag(tag_name):
-                continue
-            tag_version = Version(upstream_tag_version(tag_name))
-            tagged_versions[tag_version] = tag_revid
+        for tag, tag_version, revid in db.pristine_upstream_source.iter_versions():
+            tagged_versions[Version(tag_version)] = revid
         tag_order = sorted(tagged_versions.keys())
         if tag_order:
             parents = [tagged_versions[tag_order[-1]]]

=== modified file 'tagging.py'
--- tagging.py	2011-01-10 22:44:18 +0000
+++ tagging.py	2011-06-27 10:35:50 +0000
@@ -19,9 +19,6 @@
 
 """Tagging related functions for bzr-builddeb."""
 
-__all__ = ['is_upstream_tag', 'upstream_tag_version']
-
-
 try:
     from debian.changelog import Version
 except ImportError:
@@ -29,41 +26,6 @@
     from debian_bundle.changelog import Version
 
 
-def is_upstream_tag(tag):
-    """Return true if tag is an upstream tag.
-    
-    :param tag: The string name of the tag.
-    :return: True if the tag name is one generated by upstream tag operations.
-
-    >>> is_upstream_tag('2.1')
-    False
-    >>> is_upstream_tag('upstream-2.1')
-    True
-    """
-    return tag.startswith('upstream-') or tag.startswith('upstream/')
-
-
-def upstream_tag_version(tag):
-    """Return the upstream version portion of an upstream tag name.
-
-    :param tag: The string name of the tag.
-    :return: The version portion of the tag.
-
-    >>> upstream_tag_version('upstream-2.1')
-    '2.1'
-    """
-    assert is_upstream_tag(tag), "Not an upstream tag: %s" % tag
-    if tag.startswith('upstream/'):
-        tag = tag[len('upstream/'):]
-    elif tag.startswith('upstream-'):
-        tag = tag[len('upstream-'):]
-        if tag.startswith('debian-'):
-            tag = tag[len('debian-'):]
-        elif tag.startswith('ubuntu-'):
-            tag = tag[len('ubuntu-'):]
-    return tag
-
-
 def sort_debversion(branch, tags):
     """Sort tags using Debian version in-place.
 

=== modified file 'tests/test_tagging.py'
--- tests/test_tagging.py	2011-01-10 22:44:18 +0000
+++ tests/test_tagging.py	2011-06-27 10:35:50 +0000
@@ -25,34 +25,6 @@
     )
 
 
-class TestIsUpstreamTag(TestCase):
-
-    def test_plain_version(self):
-        self.assertFalse(tagging.is_upstream_tag('2.1'))
-
-    def test_simple_upstream(self):
-        self.assertTrue(tagging.is_upstream_tag('upstream-2.1'))
-
-    def test_distro_upstream(self):
-        self.assertTrue(tagging.is_upstream_tag('upstream-debian-2.1'))
-
-    def test_git_upstream(self):
-        self.assertTrue(tagging.is_upstream_tag('upstream/2.1'))
-
-
-class TestUpstreamTagVersion(TestCase):
-
-    def test_simple_upstream(self):
-        self.assertEqual('2.1', tagging.upstream_tag_version('upstream-2.1'))
-
-    def test_distro_upstream(self):
-        self.assertEqual('2.1',
-            tagging.upstream_tag_version('upstream-debian-2.1'))
-
-    def test_git_upstream(self):
-        self.assertEqual('2.1', tagging.upstream_tag_version('upstream/2.1'))
-
-
 class TestDebVersionSort(TestCase):
 
     def test_sort(self):

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-06-15 18:44:09 +0000
+++ tests/test_upstream.py	2011-06-27 10:35:50 +0000
@@ -71,6 +71,8 @@
     )
 from bzrlib.plugins.builddeb.upstream.pristinetar import (
     PristineTarSource,
+    is_upstream_tag,
+    upstream_tag_version,
     )
 
 
@@ -661,6 +663,34 @@
         self.assertEquals("svn:2424", get_snapshot_revision("0.4.4+svn2424"))
 
 
+class TestIsUpstreamTag(TestCase):
+
+    def test_plain_version(self):
+        self.assertFalse(is_upstream_tag('2.1'))
+
+    def test_simple_upstream(self):
+        self.assertTrue(is_upstream_tag('upstream-2.1'))
+
+    def test_distro_upstream(self):
+        self.assertTrue(is_upstream_tag('upstream-debian-2.1'))
+
+    def test_git_upstream(self):
+        self.assertTrue(is_upstream_tag('upstream/2.1'))
+
+
+class TestUpstreamTagVersion(TestCase):
+
+    def test_simple_upstream(self):
+        self.assertEqual('2.1', upstream_tag_version('upstream-2.1'))
+
+    def test_distro_upstream(self):
+        self.assertEqual('2.1',
+            upstream_tag_version('upstream-debian-2.1'))
+
+    def test_git_upstream(self):
+        self.assertEqual('2.1', upstream_tag_version('upstream/2.1'))
+
+
 class PristineTarSourceTests(TestCaseWithTransport):
 
     def setUp(self):

=== modified file 'upstream/pristinetar.py'
--- upstream/pristinetar.py	2011-06-23 21:41:36 +0000
+++ upstream/pristinetar.py	2011-06-27 10:35:50 +0000
@@ -318,3 +318,40 @@
         else:
             ret["deb-pristine-delta"] = uuencoded
         return ret
+
+    def iter_versions(self):
+        """Iterate over all upstream versions.
+
+        :return: Iterator over (tag_name, version, revid) tuples
+        """
+        for tag_name, tag_revid in self.branch.tags.get_tag_dict().iteritems():
+            if not is_upstream_tag(tag_name):
+                continue
+            yield (tag_name, upstream_tag_version(tag_name), tag_revid)
+
+
+def is_upstream_tag(tag):
+    """Return true if tag is an upstream tag.
+
+    :param tag: The string name of the tag.
+    :return: True if the tag name is one generated by upstream tag operations.
+    """
+    return tag.startswith('upstream-') or tag.startswith('upstream/')
+
+
+def upstream_tag_version(tag):
+    """Return the upstream version portion of an upstream tag name.
+
+    :param tag: The string name of the tag.
+    :return: The version portion of the tag.
+    """
+    assert is_upstream_tag(tag), "Not an upstream tag: %s" % tag
+    if tag.startswith('upstream/'):
+        tag = tag[len('upstream/'):]
+    elif tag.startswith('upstream-'):
+        tag = tag[len('upstream-'):]
+        if tag.startswith('debian-'):
+            tag = tag[len('debian-'):]
+        elif tag.startswith('ubuntu-'):
+            tag = tag[len('ubuntu-'):]
+    return tag