This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8888

mergeresult: introduce filemap() which yields filename based mapping
ClosedPublic

Authored by pulkit on Aug 5 2020, 8:11 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3c783ff08d40: mergeresult: introduce filemap() which yields filename based mapping
Summary

We wanted to remove actions as this was leaking how we store things internally
and was direct access to one of the member. This introduces filemap() which
yields a map of filename -> action, args, msg.

mergeresult.actions has been deleted as it's no longer required.

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

pulkit created this revision.Aug 5 2020, 8:11 AM
pulkit updated this revision to Diff 22309.Aug 6 2020, 7:16 AM
indygreg accepted this revision.Aug 8 2020, 12:34 PM
This revision is now accepted and ready to land.Aug 8 2020, 12:34 PM

Revision Contents
Changeset List

Diff 22346

hgext/convert/hg.py

p2ctx, p2ctx,
anc, anc,
branchmerge=True, branchmerge=True,
force=True, force=True,
acceptremote=False, acceptremote=False,
followcopies=False, followcopies=False,
) )
for file, (action, info, msg) in pycompat.iteritems(mresult.actions): for file, (action, info, msg) in mresult.filemap():
if source.targetfilebelongstosource(file): if source.targetfilebelongstosource(file):
# If the file belongs to the source repo, ignore the p2 # If the file belongs to the source repo, ignore the p2
# since it will be covered by the existing fileset. # since it will be covered by the existing fileset.
continue continue
# If the file requires actual merging, abort. We don't have enough # If the file requires actual merging, abort. We don't have enough
# context to resolve merges correctly. # context to resolve merges correctly.
if action in [b'm', b'dm', b'cd', b'dc']: if action in [b'm', b'dm', b'cd', b'dc']:

hgext/remotefilelog/__init__.py

return orig(repo, mresult, wctx, mctx, overwrite, wantfiledata, **opts) return orig(repo, mresult, wctx, mctx, overwrite, wantfiledata, **opts)
# Prefetch merge checkunknownfiles # Prefetch merge checkunknownfiles
def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs): def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs):
if isenabled(repo): if isenabled(repo):
files = [] files = []
sparsematch = repo.maybesparsematch(mctx.rev()) sparsematch = repo.maybesparsematch(mctx.rev())
for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions): for f, (m, actionargs, msg) in mresult.filemap():
if sparsematch and not sparsematch(f): if sparsematch and not sparsematch(f):
continue continue
if m in ( if m in (
mergestatemod.ACTION_CREATED, mergestatemod.ACTION_CREATED,
mergestatemod.ACTION_DELETED_CHANGED, mergestatemod.ACTION_DELETED_CHANGED,
mergestatemod.ACTION_CREATED_MERGE, mergestatemod.ACTION_CREATED_MERGE,
): ):
files.append((f, hex(mctx.filenode(f)))) files.append((f, hex(mctx.filenode(f))))

mercurial/merge.py

mergestatemod.ACTION_CREATED_MERGE, mergestatemod.ACTION_CREATED_MERGE,
mergestatemod.ACTION_FORGET, mergestatemod.ACTION_FORGET,
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
mergestatemod.ACTION_REMOVE, mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_EXEC, mergestatemod.ACTION_EXEC,
} }
# We mutate the items in the dict during iteration, so iterate # We mutate the items in the dict during iteration, so iterate
# over a copy. # over a copy.
for f, action in list(mresult.actions.items()): for f, action in mresult.filemap():
if narrowmatch(f): if narrowmatch(f):
pass pass
elif not branchmerge: elif not branchmerge:
mresult.removefile(f) # just updating, ignore changes outside clone mresult.removefile(f) # just updating, ignore changes outside clone
elif action[0] in nooptypes: elif action[0] in nooptypes:
mresult.removefile(f) # merge does not affect file mresult.removefile(f) # merge does not affect file
elif action[0] in nonconflicttypes: elif action[0] in nonconflicttypes:
raise error.Abort( raise error.Abort(
if actions is passed, total of number of files in that action if actions is passed, total of number of files in that action
only is returned """ only is returned """
if actions is None: if actions is None:
return len(self._filemapping) return len(self._filemapping)
return sum(len(self._actionmapping[a]) for a in actions) return sum(len(self._actionmapping[a]) for a in actions)
@property def filemap(self, sort=False):
def actions(self): if sorted:
return self._filemapping for key, val in sorted(pycompat.iteritems(self._filemapping)):
yield key, val
else:
for key, val in pycompat.iteritems(self._filemapping):
yield key, val
@property @property
def diverge(self): def diverge(self):
return self._diverge return self._diverge
@property @property
def renamedelete(self): def renamedelete(self):
return self._renamedelete return self._renamedelete
# merge will correctly incorporate more information # merge will correctly incorporate more information
if diverge is None or len(mresult1.diverge) < len(diverge): if diverge is None or len(mresult1.diverge) < len(diverge):
diverge = mresult1.diverge diverge = mresult1.diverge
if renamedelete is None or len(renamedelete) < len( if renamedelete is None or len(renamedelete) < len(
mresult1.renamedelete mresult1.renamedelete
): ):
renamedelete = mresult1.renamedelete renamedelete = mresult1.renamedelete
for f, a in sorted(pycompat.iteritems(mresult1.actions)): for f, a in mresult1.filemap(sort=True):
m, args, msg = a m, args, msg = a
repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m)) repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
if f in fbids: if f in fbids:
d = fbids[f] d = fbids[f]
if m in d: if m in d:
d[m].append(a) d[m].append(a)
else: else:
d[m] = [a] d[m] = [a]

mercurial/sparse.py

# the wctx. # the wctx.
sparsematch = matcher(repo, [wctx.p1().rev()]) sparsematch = matcher(repo, [wctx.p1().rev()])
else: else:
# If we're updating, use the target context's filter, since we're # If we're updating, use the target context's filter, since we're
# moving to the target context. # moving to the target context.
sparsematch = matcher(repo, [mctx.rev()]) sparsematch = matcher(repo, [mctx.rev()])
temporaryfiles = [] temporaryfiles = []
for file, action in pycompat.iteritems(mresult.actions): for file, action in mresult.filemap():
type, args, msg = action type, args, msg = action
files.add(file) files.add(file)
if sparsematch(file): if sparsematch(file):
prunedactions[file] = action prunedactions[file] = action
elif type == mergestatemod.ACTION_MERGE: elif type == mergestatemod.ACTION_MERGE:
temporaryfiles.append(file) temporaryfiles.append(file)
prunedactions[file] = action prunedactions[file] = action
elif branchmerge: elif branchmerge: