This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8884

merge: rework iteration over mergeresult object in checkpathconflicts()
ClosedPublic

Authored by pulkit on Aug 5 2020, 4:53 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG150900a17ec2: merge: rework iteration over mergeresult object in checkpathconflicts()
Summary

Instead of following pattern:

for f, (m, args, msg) in mresult.actions.items():

    if m == mergestatemod.ACTION_*:
        ...
    elif m == mergestatemod.ACTION_*:
        ...
    ....

We do:

for (f, args, msg) in mresult.getaction((mergestatemod.ACTION_*,)):
    ...

for (f, args, msg) in mresult.getaction((mergestatemod.ACTION_*,)):
    ...
....

This makes code bit easier to understand and prevent iterating over actions
which we don't need.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (43 lines)

Diff 22305

mercurial/merge.py

invalidconflicts = set() invalidconflicts = set()
# The set of directories that contain files that are being created. # The set of directories that contain files that are being created.
createdfiledirs = set() 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 mresult.actions.items(): for (f, args, msg) in mresult.getactions(
if m in ( (
mergestatemod.ACTION_CREATED, mergestatemod.ACTION_CREATED,
mergestatemod.ACTION_DELETED_CHANGED, mergestatemod.ACTION_DELETED_CHANGED,
mergestatemod.ACTION_MERGE, mergestatemod.ACTION_MERGE,
mergestatemod.ACTION_CREATED_MERGE, mergestatemod.ACTION_CREATED_MERGE,
)
): ):
# This action may create a new local file. # This action may create a new local file.
createdfiledirs.update(pathutil.finddirs(f)) createdfiledirs.update(pathutil.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)
# Track the names of all deleted files. # Track the names of all deleted files.
if m == mergestatemod.ACTION_REMOVE: for (f, args, msg) in mresult.getactions((mergestatemod.ACTION_REMOVE,)):
deletedfiles.add(f) deletedfiles.add(f)
if m == mergestatemod.ACTION_MERGE: for (f, args, msg) in mresult.getactions((mergestatemod.ACTION_MERGE,)):
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if move: if move:
deletedfiles.add(f1) deletedfiles.add(f1)
if m == mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL: for (f, args, msg) in mresult.getactions(
(mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,)
):
f2, flags = args f2, flags = args
deletedfiles.add(f2) deletedfiles.add(f2)
# Check all directories that contain created files for path conflicts. # Check all directories that contain created files for path conflicts.
for p in createdfiledirs: for p in createdfiledirs:
if p in mf: if p in mf:
if p in mctx: if p in mctx:
# A 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.