This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1222

merge: add a config option to disable path conflict checking
ClosedPublic

Authored by sid0 on Oct 23 2017, 7:45 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG37450a122128: merge: add a config option to disable path conflict checking
Summary

We've found a severe perf regression in hg update caused by the path conflict
checking code. The next patch will disable this by default.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

sid0 created this revision.Oct 23 2017, 7:45 PM
lothiraldan added a subscriber: lothiraldan.Oct 24 2017, 8:40 AM

The debug section doesn't seem to exists, could we use 'experimental' instead while we fix the performance regression?

sid0 updated this revision to Diff 3081.Oct 24 2017, 3:08 PM
sid0 added a comment.Oct 24 2017, 3:08 PM

The debug section doesn't seem to exists, could we use 'experimental' instead while we fix the performance regression?

Good idea! Done, thanks!

durin42 accepted this revision.Oct 30 2017, 5:09 PM
This revision is now accepted and ready to land.Oct 30 2017, 5:09 PM
Closed by commit rHG37450a122128: merge: add a config option to disable path conflict checking (authored by sid0). · Explain WhyOct 30 2017, 5:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (3 lines)
Mmercurial/merge.py (8 lines)

Diff 3160

mercurial/configitems.py

default=None, default=None,
) )
coreconfigitem('merge', 'checkunknown', coreconfigitem('merge', 'checkunknown',
default='abort', default='abort',
) )
coreconfigitem('merge', 'checkignored', coreconfigitem('merge', 'checkignored',
default='abort', default='abort',
) )
coreconfigitem('experimental', 'merge.checkpathconflicts',
default=True,
)
coreconfigitem('merge', 'followcopies', coreconfigitem('merge', 'followcopies',
default=True, default=True,
) )
coreconfigitem('merge', 'on-failure', coreconfigitem('merge', 'on-failure',
default='continue', default='continue',
) )
coreconfigitem('merge', 'preferancestor', coreconfigitem('merge', 'preferancestor',
default=lambda: ['*'], default=lambda: ['*'],

mercurial/merge.py

choose a different action. choose a different action.
""" """
fileconflicts = set() fileconflicts = set()
pathconflicts = set() pathconflicts = set()
warnconflicts = set() warnconflicts = set()
abortconflicts = set() abortconflicts = set()
unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown') unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown')
ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored') ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored')
pathconfig = repo.ui.configbool('experimental', 'merge.checkpathconflicts')
if not force: if not force:
def collectconflicts(conflicts, config): def collectconflicts(conflicts, config):
if config == 'abort': if config == 'abort':
abortconflicts.update(conflicts) abortconflicts.update(conflicts)
elif config == 'warn': elif config == 'warn':
warnconflicts.update(conflicts) warnconflicts.update(conflicts)
for f, (m, args, msg) in actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m in ('c', 'dc'): if m in ('c', 'dc'):
if _checkunknownfile(repo, wctx, mctx, f): if _checkunknownfile(repo, wctx, mctx, f):
fileconflicts.add(f) fileconflicts.add(f)
elif f not in wctx: elif pathconfig and f not in wctx:
path = _checkunknowndirs(repo, f) path = _checkunknowndirs(repo, f)
if path is not None: if path is not None:
pathconflicts.add(path) pathconflicts.add(path)
elif m == 'dg': elif m == 'dg':
if _checkunknownfile(repo, wctx, mctx, f, args[0]): if _checkunknownfile(repo, wctx, mctx, f, args[0]):
fileconflicts.add(f) fileconflicts.add(f)
allconflicts = fileconflicts | pathconflicts allconflicts = fileconflicts | pathconflicts
actions[df] = ('m', (df, f, f, False, pa.node()), actions[df] = ('m', (df, f, f, False, pa.node()),
"local directory rename - respect move from " + f) "local directory rename - respect move from " + f)
elif acceptremote: elif acceptremote:
actions[f] = ('c', (fl2,), "remote recreating") actions[f] = ('c', (fl2,), "remote recreating")
else: else:
actions[f] = ('dc', (None, f, f, False, pa.node()), actions[f] = ('dc', (None, f, f, False, pa.node()),
"prompt deleted/changed") "prompt deleted/changed")
if repo.ui.configbool('experimental', 'merge.checkpathconflicts'):
# If we are merging, look for path conflicts. # If we are merging, look for path conflicts.
checkpathconflicts(repo, wctx, p2, actions) checkpathconflicts(repo, wctx, p2, actions)
return actions, diverge, renamedelete return actions, diverge, renamedelete
def _resolvetrivial(repo, wctx, mctx, ancestor, actions): def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
"""Resolves false conflicts where the nodeid changed but the content """Resolves false conflicts where the nodeid changed but the content
remained the same.""" remained the same."""
for f, (m, args, msg) in actions.items(): for f, (m, args, msg) in actions.items():