Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: implement `merged` in a simpler way
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 27 Aug 2021 17:09:06 +0200
changeset 47930 7c37d153c22d
parent 47929 03f57915e0ce
child 47931 7033d1d5bd18
dirstate-item: implement `merged` in a simpler way We can simply use the underlying attribute. Differential Revision: https://phab.mercurial-scm.org/D11367
mercurial/pure/parsers.py file | annotate | diff | comparison | revisions 
--- a/mercurial/pure/parsers.py	Fri Aug 27 17:07:56 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Aug 27 17:09:06 2021 +0200
@@ -276,7 +276,7 @@
 
         Should only be set if a merge is in progress in the dirstate
         """
-        return self.v1_state() == b'm'
+        return self._wc_tracked and self._merged
 
     @property
     def from_p2(self):
Mercurial