This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11329

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

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG822c67420c77: dirstatemap: use the default code to handle "merged" 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
Alphare requested changes to this revision.Aug 25 2021, 10:30 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/dirstatemap.py
265–266

This comment is not up-to-date anymore

This revision now requires changes to proceed.Aug 25 2021, 10:30 AM
marmoute added inline comments.Aug 26 2021, 3:41 AM
mercurial/dirstatemap.py
265–266

Good spot, thanks !

Updating.

baymax updated this revision to Diff 30055.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 (13 lines)

Diff 30097

mercurial/dirstatemap.py

self.copymap.pop(filename, None) self.copymap.pop(filename, None)
if not (p1_tracked or p2_tracked or wc_tracked): if not (p1_tracked or p2_tracked or wc_tracked):
self.dropfile(filename) self.dropfile(filename)
return return
elif merged: elif merged:
# XXX might be merged and removed ? # XXX might be merged and removed ?
entry = self.get(filename) entry = self.get(filename)
if entry is not None and entry.tracked: if entry is None or not entry.tracked:
# XXX mostly replicate dirstate.other parent. We should get # XXX mostly replicate dirstate.other parent. We should get
# the higher layer to pass us more reliable data where `merged` # the higher layer to pass us more reliable data where `merged`
# actually mean merged. Dropping the else clause will show # actually mean merged. Dropping this clause will show failure
AlphareUnsubmitted
Not Done

This comment is not up-to-date anymore

Alphare: This comment is not up-to-date anymore
marmouteAuthorUnsubmitted
Done

Good spot, thanks !

Updating.

marmoute: Good spot, thanks ! Updating.
# failure in `test-graft.t` # in `test-graft.t`
self.addfile(filename, merged=True) merged = False
return clean_p2 = True
else:
self.addfile(filename, from_p2=True)
return
elif not (p1_tracked or p2_tracked) and wc_tracked: elif not (p1_tracked or p2_tracked) and wc_tracked:
pass # file is added, nothing special to adjust pass # file is added, nothing special to adjust
elif (p1_tracked or p2_tracked) and not wc_tracked: elif (p1_tracked or p2_tracked) and not wc_tracked:
pass pass
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