Ticket #1038: natural_order_sort_for_milestones.diff

trac/ticket/roadmap.py

@@ -21 +21 @@
 from trac.core import *
 from trac.perm import IPermissionRequestor
 from trac.util import escape, format_date, format_datetime, parse_date, \
-                      pretty_timedelta, shorten_line, unescape, CRLF, Markup
+                      pretty_timedelta, shorten_line, unescape, CRLF, Markup, \
+                      natural_order
 from trac.ticket import Milestone, Ticket, TicketSystem
 from trac.Timeline import ITimelineEventProvider
 from trac.web import IRequestHandler
@@ -154 +155 @@
         for idx, milestone in enumerate(Milestone.select(self.env, showall)):
             hdf = milestone_to_hdf(self.env, db, req, milestone)
             milestones.append(hdf)
+        milestones.sort(lambda a, b: natural_order(a['name'], b['name']))
         req.hdf['roadmap.milestones'] = milestones
 
         for idx,milestone in enumerate(milestones):

trac/versioncontrol/web_ui/browser.py

@@ -31 +31 @@
 
 CHUNK_SIZE = 4096
 
-DIGITS = re.compile(r'[0-9]+')
-def _natural_order(x, y):
-    """Comparison function for natural order sorting based on
-    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/214202."""
-    nx = ny = 0
-    while True:
-        a = DIGITS.search(x, nx)
-        b = DIGITS.search(y, ny)
-        if None in (a, b):
-            return cmp(x[nx:], y[ny:])
-        r = (cmp(x[nx:a.start()], y[ny:b.start()]) or
-             cmp(int(x[a.start():a.end()]), int(y[b.start():b.end()])))
-        if r:
-            return r
-        nx, ny = a.end(), b.end()
 
-
 class BrowserModule(Component):
 
     implements(INavigationContributor, IPermissionRequestor, IRequestHandler,
@@ -157 +141 @@
             elif order == 'size':
                 return neg * cmp(a['content_length'], b['content_length'])
             else:
-                return neg * _natural_order(a['name'].lower(),
-                                            b['name'].lower())
+                return neg * util.natural_order(a['name'].lower(),
+                                                b['name'].lower())
         info.sort(cmp_func)
 
         req.hdf['browser.items'] = info

trac/util.py

@@ -260 +260 @@
             shortline = text[:i]+' ...'
     return shortline
 
+DIGITS = re.compile(r'[0-9]+')
+def natural_order(x, y):
+    """Comparison function for natural order sorting based on
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/214202."""
+    nx = ny = 0
+    while True:
+        a = DIGITS.search(x, nx)
+        b = DIGITS.search(y, ny)
+        if None in (a, b):
+            return cmp(x[nx:], y[ny:])
+        r = (cmp(x[nx:a.start()], y[ny:b.start()]) or
+             cmp(int(x[a.start():a.end()]), int(y[b.start():b.end()])))
+        if r:
+            return r
+        nx, ny = a.end(), b.end()
+
 def hex_entropy(bytes=32):
     import md5
     import random