D321: merge: removed sorting in caseflow detection, for a slight performance win
alex_gaynor (Alex Gaynor)
phabricator at mercurial-scm.org
Thu Aug 10 13:11:25 UTC 2017
alex_gaynor created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
BRANCH
performance-changes (bookmark) on default (branch)
REVISION DETAIL
https://phab.mercurial-scm.org/D321
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -753,7 +753,7 @@
# check case-folding collision in provisional merged manifest
foldmap = {}
- for f in sorted(pmmf):
+ for f in pmmf:
fold = util.normcase(f)
if fold in foldmap:
raise error.Abort(_("case-folding collision between %s and %s")
To: alex_gaynor, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list