Sort by name when browsing svn filesystem incorrect

[pw@…]

The way a sort is done in Browser.py causes the display order of names in the view to be inconsistent with normal python string order, can be seen at ​http://projects.edgewall.com/trac/browser/tags/ where 0.6 is listed after 0.6.1.

The following patch fixes this by stripping the trailing / from the name before doing the comparison in the sort. May not be the best way to do it but gives the desired results.

—-Browser.py 2004-04-22 09:09:36.000000000 -0400 +++ ../../../python2.3/site-packages/trac/Browser.py 2004-04-22 09:12:51.000000000 -0400 @@ -144,9 +144,9 @@

elif order == 'Date':

info.sort(lambda y, x: cmp(xdate_seconds, ydate_seconds))

elif order == 'Name':

• info.sort(lambda y, x: cmp(xname.rstrip('/'), yname.rstrip('/')))

+ info.sort(lambda y, x: cmp(xname, yname))

else:

• info.sort(lambda x, y: cmp(xname.rstrip('/'), yname.rstrip('/')))

+ info.sort(lambda x, y: cmp(xname, yname))

# Always put directories before files info.sort(lambda x, y: cmp(yis_dir, xis_dir))

[pw@…]

Sorry about the formatting…

--- Browser.py  2004-04-22 09:09:36.000000000 -0400
+++ ../../../python2.3/site-packages/trac/Browser.py    2004-04-22 09:12:51.000000000 -0400
@@ -144,9 +144,9 @@
         elif order == 'Date':
             info.sort(lambda y, x: cmp(x['date_seconds'], y['date_seconds']))
         elif order == 'Name':
-            info.sort(lambda y, x: cmp(x['name'].rstrip('/'), y['name'].rstrip('/')))
+            info.sort(lambda y, x: cmp(x['name'], y['name']))
         else:
-            info.sort(lambda x, y: cmp(x['name'].rstrip('/'), y['name'].rstrip('/')))
+            info.sort(lambda x, y: cmp(x['name'], y['name']))
             
         # Always put directories before files
         info.sort(lambda x, y: cmp(y['is_dir'], x['is_dir']))

[Jonas Borgström]

Thanks, I'll apply this patch later

[Jonas Borgström]

Fixed in [448]. But only in trunk.

[Christian Boos]

This is not a test system.

[Christian Boos]

Hm… I don't remember having changed the description… hope it's not a bug.