Mercurial > hg-stable

changeset 23527:e61de5556b73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: don't unnecessarily sort merge action lists The action lists returned from calculateupdates() (in merge.py) are not required to be sorted. In fact, since they result from iteration over the unordered manifest, they are unlikely to be sorted. Moreover, some of the lists are appended to after they are returned from manifestmerge(). The lists are instead sorted in applyupdates(). Therefore, let's not sort the lists generated in largefiles' overridecalculateupdates().
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 08 Dec 2014 15:20:42 -0800
parents a5887f2da5e6
children 5a6d85bae97f
files hgext/largefiles/overrides.py
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Tue Dec 09 16:49:55 2014 -0800
+++ b/hgext/largefiles/overrides.py	Mon Dec 08 15:20:42 2014 -0800
@@ -476,10 +476,8 @@
         else:
             newglist.append(action)
 
-    newglist.sort()
     actions['g'] = newglist
     if lfmr:
-        lfmr.sort()
         actions['lfmr'] = lfmr
 
     return actions, diverge, renamedelete