( )⚙ D11326 dirstatemap: use the default code to handle "clean-p2" case

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11326

dirstatemap: use the default code to handle "clean-p2" case
ClosedPublic

Authored by marmoute on Aug 21 2021, 5:57 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3429f48d486d: dirstatemap: use the default code to handle "clean-p2" case
Summary

This simplify the conditionnal a bit since most of it is handled by the common
code.

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

marmoute created this revision.Aug 21 2021, 5:57 AM
baymax updated this revision to Diff 30052.Aug 26 2021, 9:01 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Aug 26 2021, 9:12 AM
This revision is now accepted and ready to land.Aug 26 2021, 9:12 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (7 lines)

Diff 30094

mercurial/dirstatemap.py

if p1_tracked or self.get(filename) is not None: if p1_tracked or self.get(filename) is not None:
# XXX the `self.get` call is catching some case in # XXX the `self.get` call is catching some case in
# `test-merge-remove.t` where the file is tracked in p1, the # `test-merge-remove.t` where the file is tracked in p1, the
# p1_tracked argument is False. # p1_tracked argument is False.
# #
# In addition, this seems to be a case where the file is marked # In addition, this seems to be a case where the file is marked
# as merged without actually being the result of a merge # as merged without actually being the result of a merge
# action. So thing are not ideal here. # action. So thing are not ideal here.
self.addfile(filename, merged=True) merged = True
return clean_p2 = False
else:
self.addfile(filename, from_p2=True)
return
elif not p1_tracked and p2_tracked and wc_tracked: elif not p1_tracked and p2_tracked and wc_tracked:
clean_p2 = True clean_p2 = True
elif possibly_dirty: elif possibly_dirty:
pass pass
elif wc_tracked: elif wc_tracked:
# this is a "normal" file # this is a "normal" file
if parentfiledata is None: if parentfiledata is None:
msg = b'failed to pass parentfiledata for a normal file: %s' msg = b'failed to pass parentfiledata for a normal file: %s'