Patchwork D11373: dirstate-item: implement v1_state with higher level block

login
register
mail settings
Submitter phabricator
Date Aug. 27, 2021, 5:11 p.m.
Message ID <differential-rev-PHID-DREV-kadh4nc3htvkxhmf4wm2-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49688/
State Superseded
Headers show

Comments

phabricator - Aug. 27, 2021, 5:11 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is much easier to read and maintain.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11373

AFFECTED FILES
  mercurial/pure/parsers.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -335,22 +335,14 @@ 
             # the object has no state to record, this is -currently-
             # unsupported
             raise RuntimeError('untracked item')
-        elif not self._wc_tracked:
+        elif self.removed:
             return b'r'
-        elif self._merged:
+        elif self.merged:
             return b'm'
-        elif not (self._p1_tracked or self._p2_tracked) and self._wc_tracked:
+        elif self.added:
             return b'a'
-        elif self._clean_p2 and self._wc_tracked:
+        else:
             return b'n'
-        elif not self._p1_tracked and self._p2_tracked and self._wc_tracked:
-            return b'n'
-        elif self._possibly_dirty:
-            return b'n'
-        elif self._wc_tracked:
-            return b'n'
-        else:
-            raise RuntimeError('unreachable')
 
     def v1_mode(self):
         """return a "mode" suitable for v1 serialization"""