( )⚙ D10148 mergestate: don't pop stateextras when there are no conflicts on filemerge

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10148

mergestate: don't pop stateextras when there are no conflicts on filemerge
ClosedPublic

Authored by pulkit on Mar 10 2021, 4:04 AM.

Details

Reviewers
Alphare
marmoute
Group Reviewers
hg-reviewers
Commits
rHG1099ca176ba1: mergestate: don't pop stateextras when there are no conflicts on filemerge
Summary

Even if filemerge.filemerge() didn't result in conflicts, we should not remove
stateextras for a file since we now use that for more things than just merge
time information. We use stateextras to store information which is required to
be used by commit.

I tracked this down while finding why a patch of mine which adds more commit
related information does not work as expected and looses the extras in
mergestate.

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.Mar 10 2021, 4:04 AM
Alphare accepted this revision.Mar 10 2021, 6:42 AM
marmoute accepted this revision.Mar 17 2021, 10:27 AM
pulkit added a commit: rHG1099ca176ba1: mergestate: don't pop stateextras when there are no conflicts on filemerge.Mar 17 2021, 1:51 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1099ca176ba1: mergestate: don't pop stateextras when there are no conflicts on filemerge (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (1 line)

Diff 26490

mercurial/mergestate.py

fcd, fcd,
fco, fco,
fca, fca,
labels=self._labels, labels=self._labels,
) )
if merge_ret is None: if merge_ret is None:
# If return value of merge is None, then there are no real conflict # If return value of merge is None, then there are no real conflict
del self._state[dfile] del self._state[dfile]
self._stateextras.pop(dfile, None)
self._dirty = True self._dirty = True
elif not merge_ret: elif not merge_ret:
self.mark(dfile, MERGE_RECORD_RESOLVED) self.mark(dfile, MERGE_RECORD_RESOLVED)
if complete: if complete:
action = None action = None
if deleted: if deleted:
if fcd.isabsent(): if fcd.isabsent():