Page MenuHomePhabricator

merge: make applyupdates() not mutate mresult argument

Authored by martinvonz on Tue, Jun 1, 6:46 PM.



We have an extension at work that overrides merge.applyupdates() to
make it skip some writes and instead instruct the virtual filesystem
we use to get a different version. That override doesn't work
correctly when doing hg co -m and there's a modified file in the
dirstate that's deleted in the destination. That's because
applyupdates() mutates its mresult argument and our extension had
passed in a modified copied of mresult to the overridden function,
which resulted in the mutation not having any effect. This patch fixes
that by letting the caller (i.e. merge._update()) update mresult
with the extra actions instead. Besides fixing our internal extension,
that seems cleaner to me anyway (better to not mutate mresult only
in some cases and we can skip some of the logic if we're not going to
update the dirstate anyway).

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Tue, Jun 1, 6:46 PM
pulkit accepted this revision.Fri, Jun 4, 5:58 AM
This revision is now accepted and ready to land.Fri, Jun 4, 5:58 AM
This revision was automatically updated to reflect the committed changes.