Merge lp:~jelmer/bzr-builddeb/sort-tags-debversion into lp:bzr-builddeb

[Jelmer Vernooij]

This adds support for "bzr tags --sort=debversion", if the version of bzr that is loaded supports it.

[Andrew Bennetts (spiv)]

Looks good!

review: Approve

=== modified file '__init__.py'
--- __init__.py	2010-09-10 02:46:41 +0000
+++ __init__.py	2011-01-10 22:48:21 +0000
@@ -173,6 +173,15 @@
     from bzrlib.plugins.builddeb.revspec import RevisionSpec_package
     SPEC_TYPES.append(RevisionSpec_package)
 
+try:
+    from bzrlib.tag import tag_sort_methods
+except ImportError:
+    pass # bzr tags --sort= can not be extended
+else:
+    tag_sort_methods.register_lazy("debversion",
+        "bzrlib.plugins.builddeb.tagging", "sort_debversion",
+        "Sort like Debian versions.")
+
 
 def load_tests(standard_tests, module, loader):
     return loader.loadTestsFromModuleNames(['bzrlib.plugins.builddeb.tests'])

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-10 02:53:47 +0000
+++ debian/changelog	2011-01-10 22:48:21 +0000
@@ -22,8 +22,9 @@
     if we can't find the tarball.
   * Determine Bazaar home directory using bzrlib to prevent test
     isolation issues. LP: #614125
+  * Support 'bzr tags --sort=debversion'. Closes #701244.
 
- -- James Westby <[e-mail]>  Wed, 18 Aug 2010 20:12:20 -0400
+ -- Jelmer Vernooij <[e-mail]>  Mon, 10 Jan 2011 23:43:30 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low
 

=== modified file 'tagging.py'
--- tagging.py	2010-05-04 11:27:46 +0000
+++ tagging.py	2011-01-10 22:48:21 +0000
@@ -21,6 +21,14 @@
 
 __all__ = ['is_upstream_tag', 'upstream_tag_version']
 
+
+try:
+    from debian.changelog import Version
+except ImportError:
+    # Prior to 0.1.15 the debian module was called debian_bundle
+    from debian_bundle.changelog import Version
+
+
 def is_upstream_tag(tag):
     """Return true if tag is an upstream tag.
     
@@ -54,3 +62,14 @@
         elif tag.startswith('ubuntu-'):
             tag = tag[len('ubuntu-'):]
     return tag
+
+
+def sort_debversion(branch, tags):
+    """Sort tags using Debian version in-place.
+
+    :param branch: Branch to use
+    :param tags: List of tuples with name and version.
+    """
+    def debversion_key((version, revid)):
+        return Version(version)
+    tags.sort(key=debversion_key)

=== modified file 'tests/test_tagging.py'
--- tests/test_tagging.py	2010-05-04 11:27:46 +0000
+++ tests/test_tagging.py	2011-01-10 22:48:21 +0000
@@ -51,3 +51,12 @@
 
     def test_git_upstream(self):
         self.assertEqual('2.1', tagging.upstream_tag_version('upstream/2.1'))
+
+
+class TestDebVersionSort(TestCase):
+
+    def test_sort(self):
+        tags = [("1.0", "revid"), ("1.0.1", "revid"), ("1.0~1", "revid")]
+        tagging.sort_debversion(None, tags)
+        self.assertEquals(tags,
+            [("1.0~1", "revid"), ("1.0", "revid"), ("1.0.1", "revid")])