This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8827

merge: filter actions before calling _resolvetrivial()
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG1d1f112da75c: merge: filter actions before calling _resolvetrivial()
Summary

In d49e490a9e85252886fd43258803bcad4fc88edb I made _resolvetrivial() to be
called after upadting the sparse checkout.

Looking at the code now, it seems to that me there is no need to even run
_resolvetrivial() on actions which are filtered away.

So let's update the actions before passing them into _resolvetrivial().

Diff Detail

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

Event Timeline

pulkit created this revision.Jul 25 2020, 6:01 AM
indygreg accepted this revision.Aug 2 2020, 1:05 PM
This revision is now accepted and ready to land.Aug 2 2020, 1:05 PM
pulkit added a commit: rHG1d1f112da75c: merge: filter actions before calling _resolvetrivial().Aug 2 2020, 1:45 PM
Closed by commit rHG1d1f112da75c: merge: filter actions before calling _resolvetrivial() (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)

Diff 22111

mercurial/merge.py

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( prunedactions = sparse.filterupdatesactions(
repo, wctx, mctx, branchmerge, mresult.actions repo, wctx, mctx, branchmerge, mresult.actions
) )
mresult.setactions(prunedactions)
_resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
mresult.setactions(prunedactions)
return mresult return mresult
def _getcwd(): def _getcwd():
try: try:
return encoding.getcwd() return encoding.getcwd()
except OSError as err: except OSError as err:
if err.errno == errno.ENOENT: if err.errno == errno.ENOENT: