# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1632920183 -7200
# Node ID 0dc9ced02a3beee58ca61fbf322c0d9e06f23f17
# Parent  bac753df80213d3b740005bb69299e5f0aa6ea51
dirstate-item: use item's property to deal with hgsubstate in mq

This is clearer than processing the `state`.

Differential Revision: https://phab.mercurial-scm.org/D11529

diff -r bac753df8021 -r 0dc9ced02a3b hgext/mq.py
--- a/hgext/mq.py	Wed Sep 29 14:56:05 2021 +0200
+++ b/hgext/mq.py	Wed Sep 29 14:56:23 2021 +0200
@@ -1267,9 +1267,9 @@
         if any((b'.hgsubstate' in files for files in mar)):
             return  # already listed up
         # not yet listed up
-        if substatestate in b'a?':
+        if substatestate.added or not substatestate.any_tracked:
             mar[1].append(b'.hgsubstate')
-        elif substatestate in b'r':
+        elif substatestate.removed:
             mar[2].append(b'.hgsubstate')
         else:  # modified
             mar[0].append(b'.hgsubstate')
@@ -1377,7 +1377,7 @@
             self.checkpatchname(patchfn)
         inclsubs = checksubstate(repo)
         if inclsubs:
-            substatestate = repo.dirstate[b'.hgsubstate']
+            substatestate = repo.dirstate.get_entry(b'.hgsubstate')
         if opts.get(b'include') or opts.get(b'exclude') or pats:
             # detect missing files in pats
             def badfn(f, msg):
@@ -1908,7 +1908,7 @@
 
             inclsubs = checksubstate(repo, patchparent)
             if inclsubs:
-                substatestate = repo.dirstate[b'.hgsubstate']
+                substatestate = repo.dirstate.get_entry(b'.hgsubstate')
 
             ph = patchheader(self.join(patchfn), self.plainmode)
             diffopts = self.diffopts(