This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1226

merge: check created file dirs for path conflicts only once (issue5716)
ClosedPublic

Authored by mbthomas on Oct 24 2017, 1:57 PM.

Details

Reviewers
krbullock
Group Reviewers
hg-reviewers
Commits
rHGa92b9f8e11ba: merge: check created file dirs for path conflicts only once (issue5716)
Summary

In large repositories, updates involving the creation of many files check the
same directories repeatedly in the wctx manifest. Move these checks out to a
separate loop to avoid repeated checks hitting the manifest.

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

mbthomas created this revision.Oct 24 2017, 1:57 PM
mbthomas retitled this revision from merge: check created file dirs for path conflicts only once to merge: check created file dirs for path conflicts only once (issue5716).Oct 24 2017, 1:59 PM
mbthomas edited the summary of this revision. (Show Details)Oct 24 2017, 2:01 PM
mbthomas updated this revision to Diff 3474.Nov 14 2017, 11:37 AM
krbullock accepted this revision.Dec 1 2017, 12:57 PM
This revision is now accepted and ready to land.Dec 1 2017, 12:57 PM
Closed by commit rHGa92b9f8e11ba: merge: check created file dirs for path conflicts only once (issue5716) (authored by mbthomas). · Explain WhyDec 1 2017, 12:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (39 lines)

Diff 4057

mercurial/merge.py

# conflicts if they still contain any files after the merge. # conflicts if they still contain any files after the merge.
remoteconflicts = set() remoteconflicts = set()
# The set of directories that appear as both a file and a directory in the # The set of directories that appear as both a file and a directory in the
# remote manifest. These indicate an invalid remote manifest, which # remote manifest. These indicate an invalid remote manifest, which
# can't be updated to cleanly. # can't be updated to cleanly.
invalidconflicts = set() invalidconflicts = set()
# The set of directories that contain files that are being created.
createdfiledirs = set()
# The set of files deleted by all the actions. # The set of files deleted by all the actions.
deletedfiles = set() deletedfiles = set()
for f, (m, args, msg) in actions.items(): for f, (m, args, msg) in actions.items():
if m in ('c', 'dc', 'm', 'cm'): if m in ('c', 'dc', 'm', 'cm'):
# This action may create a new local file. # This action may create a new local file.
createdfiledirs.update(util.finddirs(f))
if mf.hasdir(f): if mf.hasdir(f):
# The file aliases a local directory. This might be ok if all # The file aliases a local directory. This might be ok if all
# the files in the local directory are being deleted. This # the files in the local directory are being deleted. This
# will be checked once we know what all the deleted files are. # will be checked once we know what all the deleted files are.
remoteconflicts.add(f) remoteconflicts.add(f)
for p in util.finddirs(f): # Track the names of all deleted files.
if m == 'r':
deletedfiles.add(f)
if m == 'm':
f1, f2, fa, move, anc = args
if move:
deletedfiles.add(f1)
if m == 'dm':
f2, flags = args
deletedfiles.add(f2)
# Check all directories that contain created files for path conflicts.
for p in createdfiledirs:
if p in mf: if p in mf:
if p in mctx: if p in mctx:
# The file is in a directory which aliases both a local # A file is in a directory which aliases both a local
# and a remote file. This is an internal inconsistency # and a remote file. This is an internal inconsistency
# within the remote manifest. # within the remote manifest.
invalidconflicts.add(p) invalidconflicts.add(p)
else: else:
# The file is in a directory which aliases a local file. # A file is in a directory which aliases a local file.
# We will need to rename the local file. # We will need to rename the local file.
localconflicts.add(p) localconflicts.add(p)
if p in actions and actions[p][0] in ('c', 'dc', 'm', 'cm'): if p in actions and actions[p][0] in ('c', 'dc', 'm', 'cm'):
# The file is in a directory which aliases a remote file. # The file is in a directory which aliases a remote file.
# This is an internal inconsistency within the remote # This is an internal inconsistency within the remote
# manifest. # manifest.
invalidconflicts.add(p) invalidconflicts.add(p)
# Track the names of all deleted files.
if m == 'r':
deletedfiles.add(f)
if m == 'm':
f1, f2, fa, move, anc = args
if move:
deletedfiles.add(f1)
if m == 'dm':
f2, flags = args
deletedfiles.add(f2)
# Rename all local conflicting files that have not been deleted. # Rename all local conflicting files that have not been deleted.
for p in localconflicts: for p in localconflicts:
if p not in deletedfiles: if p not in deletedfiles:
ctxname = str(wctx).rstrip('+') ctxname = str(wctx).rstrip('+')
pnew = util.safename(p, ctxname, wctx, set(actions.keys())) pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
actions[pnew] = ('pr', (p,), "local path conflict") actions[pnew] = ('pr', (p,), "local path conflict")
actions[p] = ('p', (pnew, 'l'), "path conflict") actions[p] = ('p', (pnew, 'l'), "path conflict")