From patchwork Fri Oct 1 09:42:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D11529: dirstate-item: use item's property to deal with hgsubstate in mq From: phabricator X-Patchwork-Id: 49854 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Fri, 1 Oct 2021 09:42:06 +0000 marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is clearer than processing the `state`. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11529 AFFECTED FILES hgext/mq.py CHANGE DETAILS To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -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(