[PATCH 4 of 7] largefiles: don't unnecessarily sort merge action lists
Martin von Zweigbergk
martinvonz at google.com
Wed Dec 10 15:09:02 CST 2014
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1418080842 28800
# Mon Dec 08 15:20:42 2014 -0800
# Node ID d1e6b639fb6c687ac4614946de96eb3eb4c7c13f
# Parent 0dd375bce97ee24ed24d13713beadc52a04c8116
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().
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -476,10 +476,8 @@
else:
newglist.append(action)
- newglist.sort()
actions['g'] = newglist
if lfmr:
- lfmr.sort()
actions['lfmr'] = lfmr
return actions, diverge, renamedelete
More information about the Mercurial-devel
mailing list