This is an archive of the discontinued Mercurial Phabricator instance.

Differential D321

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

Authored by alex_gaynor on Aug 10 2017, 9:11 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
performance-changes (bookmark) on default (branch)
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

alex_gaynor created this revision.Aug 10 2017, 9:11 AM
alex_gaynor abandoned this revision.Aug 10 2017, 9:11 AM

This was created by accident, D30 should have been updated.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)

Diff 736

mercurial/merge.py

for f, args, msg in actions['m']: for f, args, msg in actions['m']:
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if move: if move:
pmmf.discard(f1) pmmf.discard(f1)
pmmf.add(f) pmmf.add(f)
# check case-folding collision in provisional merged manifest # check case-folding collision in provisional merged manifest
foldmap = {} foldmap = {}
for f in sorted(pmmf): for f in pmmf:
fold = util.normcase(f) fold = util.normcase(f)
if fold in foldmap: if fold in foldmap:
raise error.Abort(_("case-folding collision between %s and %s") raise error.Abort(_("case-folding collision between %s and %s")
% (f, foldmap[fold])) % (f, foldmap[fold]))
foldmap[fold] = f foldmap[fold] = f
# check case-folding of directories # check case-folding of directories
foldprefix = unfoldprefix = lastfull = '' foldprefix = unfoldprefix = lastfull = ''