Merge lp:~jameinel/loggerhead/sort-742390 into lp:loggerhead

[John A Meinel]

Bug #742390, don't sort_natural if it isn't available.

Don't use sort_natural if it isn't available. It was introduced in bzr 2.3, and Launchpad is still using bzr 2.2.

[William Grant (wgrant)]

review: Approve

=== modified file 'loggerhead/history.py'
--- loggerhead/history.py	2011-03-16 14:43:36 +0000
+++ loggerhead/history.py	2011-03-25 12:50:52 +0000
@@ -720,7 +720,11 @@
           # tag.sort_* functions expect (tag, data) pairs, so we generate them,
           # and then strip them
           tags = [(t, None) for t in self._branch_tags[revision.revision_id]]
-          tag.sort_natural(self._branch, tags)
+          sort_func = getattr(tag, 'sort_natural', None)
+          if sort_func is None:
+              tags.sort()
+          else:
+              sort_func(self._branch, tags)
           revtags = u', '.join([t[0] for t in tags])
 
         entry = {

=== modified file 'loggerhead/tests/test_history.py'
--- loggerhead/tests/test_history.py	2011-03-16 14:43:36 +0000
+++ loggerhead/tests/test_history.py	2011-03-25 12:50:52 +0000
@@ -18,7 +18,7 @@
 """Direct tests of the loggerhead/history.py module"""
 
 from datetime import datetime
-from bzrlib import tests
+from bzrlib import tag, tests
 
 from loggerhead import history as _mod_history
 
@@ -224,9 +224,12 @@
         b.tags.set_tag('tag-2', rev.revision_id)
         b.tags.set_tag('Tag-10', rev.revision_id)
         change = history._change_from_revision(rev)
-        # tags are 'naturally' sorted, sorting numbers in order, and ignoring
-        # case, etc.
-        self.assertEqual('tag-1, tag-2, Tag-10', change.tags)
+        # If available, tags are 'naturally' sorted. (sorting numbers in order,
+        # and ignoring case, etc.)
+        if getattr(tag, 'sort_natural', None) is not None:
+            self.assertEqual('tag-1, tag-2, Tag-10', change.tags)
+        else:
+            self.assertEqual('Tag-10, tag-1, tag-2', change.tags)
 
     def test_committer_vs_authors(self):
         tree = self.make_branch_and_tree('test')