This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8084

merge: use manifestdict.walk() instead of manifestdict.matches()
ClosedPublic

Authored by durin42 on Feb 5 2020, 5:34 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGe76d98546bd2: merge: use manifestdict.walk() instead of manifestdict.matches()
rHGca43ca89d9d4: merge: use manifestdict.walk() instead of manifestdict.matches()
rHG0e5f6c70aeb4: merge: use manifestdict.walk() instead of manifestdict.matches()
Summary

As with other patches in this series, this avoids making a
potentially-expensive copy of a 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

durin42 created this revision.Feb 5 2020, 5:34 PM
martinvonz added a subscriber: martinvonz.Feb 5 2020, 7:34 PM
martinvonz added inline comments.
mercurial/merge.py
999–1000

dead assignment?

martinvonz accepted this revision.Feb 7 2020, 4:58 PM
martinvonz added inline comments.
mercurial/merge.py
999–1000

I'll drop this one in flight.

This revision is now accepted and ready to land.Feb 7 2020, 4:58 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (9 lines)

Diff 20006

mercurial/merge.py

actions[f] = ACTION_FORGET, None, b"forget removed" actions[f] = ACTION_FORGET, None, b"forget removed"
return actions return actions
def _checkcollision(repo, wmf, actions): def _checkcollision(repo, wmf, actions):
""" """
Check for case-folding collisions. Check for case-folding collisions.
""" """
# If the repo is narrowed, filter out files outside the narrowspec. # If the repo is narrowed, filter out files outside the narrowspec.
martinvonzUnsubmitted
Not Done

dead assignment?

martinvonz: dead assignment?
martinvonzUnsubmitted
Not Done

I'll drop this one in flight.

martinvonz: I'll drop this one in flight.
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
if not narrowmatch.always(): if not narrowmatch.always():
wmf = wmf.matches(narrowmatch) pmmf = set(wmf.walk(narrowmatch))
if actions: if actions:
narrowactions = {} narrowactions = {}
for m, actionsfortype in pycompat.iteritems(actions): for m, actionsfortype in pycompat.iteritems(actions):
narrowactions[m] = [] narrowactions[m] = []
for (f, args, msg) in actionsfortype: for (f, args, msg) in actionsfortype:
if narrowmatch(f): if narrowmatch(f):
narrowactions[m].append((f, args, msg)) narrowactions[m].append((f, args, msg))
actions = narrowactions actions = narrowactions
else:
# build provisional merged manifest up # build provisional merged manifest up
pmmf = set(wmf) pmmf = set(wmf)
if actions: if actions:
# KEEP and EXEC are no-op # KEEP and EXEC are no-op
for m in ( for m in (
ACTION_ADD, ACTION_ADD,
ACTION_ADD_MODIFIED, ACTION_ADD_MODIFIED,
ACTION_FORGET, ACTION_FORGET,
ACTION_GET, ACTION_GET,