This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8828

sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:01 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd70c972cec74: sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
Summary

Not able to see much which can be improved in this function by passing in
mergeresult object but for API consistency and no function directly touching
actions dict, it sounds like a good idea.

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.Jul 25 2020, 6:01 AM
indygreg accepted this revision.Aug 2 2020, 1:06 PM
This revision is now accepted and ready to land.Aug 2 2020, 1:06 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)
Mmercurial/sparse.py (10 lines)

Diff 22211

mercurial/merge.py

repo.ui.note(_(b'end of auction\n\n')) repo.ui.note(_(b'end of auction\n\n'))
# TODO: think about commitinfo when bid merge is used # TODO: think about commitinfo when bid merge is used
mresult.updatevalues(diverge, renamedelete, {}) mresult.updatevalues(diverge, renamedelete, {})
if wctx.rev() is None: if wctx.rev() is None:
fractions = _forgetremoved(wctx, mctx, branchmerge) fractions = _forgetremoved(wctx, mctx, branchmerge)
mresult.updateactions(fractions) mresult.updateactions(fractions)
prunedactions = sparse.filterupdatesactions( sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult)
repo, wctx, mctx, branchmerge, mresult.actions
)
mresult.setactions(prunedactions)
_resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
return mresult return mresult
def _getcwd(): def _getcwd():
try: try:
return encoding.getcwd() return encoding.getcwd()

mercurial/sparse.py

tempincludes = readtemporaryincludes(repo) tempincludes = readtemporaryincludes(repo)
result = forceincludematcher(result, tempincludes) result = forceincludematcher(result, tempincludes)
repo._sparsematchercache[key] = result repo._sparsematchercache[key] = result
return result return result
def filterupdatesactions(repo, wctx, mctx, branchmerge, actions): def filterupdatesactions(repo, wctx, mctx, branchmerge, mresult):
"""Filter updates to only lay out files that match the sparse rules.""" """Filter updates to only lay out files that match the sparse rules."""
if not enabled: if not enabled:
return actions return
oldrevs = [pctx.rev() for pctx in wctx.parents()] oldrevs = [pctx.rev() for pctx in wctx.parents()]
oldsparsematch = matcher(repo, oldrevs) oldsparsematch = matcher(repo, oldrevs)
if oldsparsematch.always(): if oldsparsematch.always():
return actions return
files = set() files = set()
prunedactions = {} prunedactions = {}
if branchmerge: if branchmerge:
# If we're merging, use the wctx filter, since we're merging into # If we're merging, use the wctx filter, since we're merging into
# 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(actions): for file, action in pycompat.iteritems(mresult.actions):
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 == b'm': elif type == b'm':
temporaryfiles.append(file) temporaryfiles.append(file)
prunedactions[file] = action prunedactions[file] = action
elif branchmerge: elif branchmerge:
old = oldsparsematch(file) old = oldsparsematch(file)
new = sparsematch(file) new = sparsematch(file)
if not old and new: if not old and new:
flags = mf.flags(file) flags = mf.flags(file)
prunedactions[file] = (b'g', (flags, False), b'') prunedactions[file] = (b'g', (flags, False), b'')
elif old and not new: elif old and not new:
prunedactions[file] = (b'r', [], b'') prunedactions[file] = (b'r', [], b'')
return prunedactions mresult.setactions(prunedactions)
def refreshwdir(repo, origstatus, origsparsematch, force=False): def refreshwdir(repo, origstatus, origsparsematch, force=False):
"""Refreshes working directory by taking sparse config into account. """Refreshes working directory by taking sparse config into account.
The old status and sparse matcher is compared against the current sparse The old status and sparse matcher is compared against the current sparse
matcher. matcher.