( )⚙ D11596 dirstate-item: replace another usage of `merged`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11596

dirstate-item: replace another usage of `merged`
ClosedPublic

Authored by marmoute on Oct 2 2021, 8:40 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8f88307f8e07: dirstate-item: replace another usage of `merged`
Summary

We simply spell out the logic here. This was the last usage of merged.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Oct 2 2021, 8:40 PM
baymax updated this revision to Diff 30601.Oct 3 2021, 6:51 AM

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

Alphare accepted this revision.Oct 3 2021, 5:16 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:16 PM
marmoute added a commit: rHG8f88307f8e07: dirstate-item: replace another usage of `merged`.Oct 3 2021, 5:36 PM
Closed by commit rHG8f88307f8e07: dirstate-item: replace another usage of `merged` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (2 lines)

Diff 30588

mercurial/pure/parsers.py

def v1_state(self): def v1_state(self):
"""return a "state" suitable for v1 serialization""" """return a "state" suitable for v1 serialization"""
if not self.any_tracked: if not self.any_tracked:
# the object has no state to record, this is -currently- # the object has no state to record, this is -currently-
# unsupported # unsupported
raise RuntimeError('untracked item') raise RuntimeError('untracked item')
elif self.removed: elif self.removed:
return b'r' return b'r'
elif self.merged: elif self._p1_tracked and self._p2_info:
return b'm' return b'm'
elif self.added: elif self.added:
return b'a' return b'a'
else: else:
return b'n' return b'n'
def v1_mode(self): def v1_mode(self):
"""return a "mode" suitable for v1 serialization""" """return a "mode" suitable for v1 serialization"""