This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11324

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

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

Details

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

This case is quite simple too

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:56 AM
baymax updated this revision to Diff 30050.Aug 26 2021, 9:01 AM

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

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

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (3 lines)

Diff 30092

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 and p2_tracked and wc_tracked: elif not p1_tracked and p2_tracked and wc_tracked:
self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
return return
elif possibly_dirty: elif possibly_dirty:
self.addfile(filename, possibly_dirty=possibly_dirty) pass
return
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'
msg %= filename msg %= filename
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
else: else:
assert False, 'unreachable' assert False, 'unreachable'