[Commented On] D11373: dirstate-item: implement v1_state with higher level block

[baymax (Baymax, Your Personal Patch-care Companion)]

baymax added a comment.
baymax updated this revision to Diff 30150.


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

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11373?vs=30129&id=30150

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11373/new/

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

AFFECTED FILES
  mercurial/pure/parsers.py

CHANGE DETAILS

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"""



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210830/b251073d/attachment-0002.html>