Patchwork D321: merge: removed sorting in caseflow detection, for a slight performance win

login
register
mail settings
Submitter phabricator
Date Aug. 10, 2017, 1:11 p.m.
Message ID <differential-rev-PHID-DREV-d46jpezsit3elv5ykfxx-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/22831/
State Superseded
Headers show

Comments

phabricator - Aug. 10, 2017, 1:11 p.m.
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




To: alex_gaynor, #hg-reviewers
Cc: mercurial-devel
phabricator - Aug. 10, 2017, 1:11 p.m.
alex_gaynor abandoned this revision.
alex_gaynor added a comment.


  This was created by accident, https://phab.mercurial-scm.org/D30 should have been updated.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D321

To: alex_gaynor, #hg-reviewers
Cc: mercurial-devel

Patch

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")