This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11327

dirstatemap: use the default code to handle "removed" case
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG4cade5e944c2: dirstatemap: use the default code to handle "removed" case
Summary

This one is very easy.

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 30053.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 30095

mercurial/dirstatemap.py

return return
else: else:
self.addfile(filename, from_p2=True) self.addfile(filename, from_p2=True)
return return
elif not (p1_tracked or p2_tracked) and wc_tracked: elif not (p1_tracked or p2_tracked) and wc_tracked:
self.addfile(filename, added=True, possibly_dirty=possibly_dirty) self.addfile(filename, added=True, possibly_dirty=possibly_dirty)
return return
elif (p1_tracked or p2_tracked) and not wc_tracked: elif (p1_tracked or p2_tracked) and not wc_tracked:
# XXX might be merged and removed ? pass
old_entry = self._map.get(filename)
self._dirs_decr(filename, old_entry=old_entry, remove_variant=True)
self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
self.nonnormalset.add(filename)
return
elif clean_p2 and wc_tracked: elif clean_p2 and wc_tracked:
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