Mercurial > public > mercurial-scm > hg

diff mercurial/dirstatemap.py @ 47513:10e740292dff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-entry: add a `merged` property Lets start to define and use more semantic property. Differential Revision: https://phab.mercurial-scm.org/D10955
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 03 Jul 2021 04:07:21 +0200
parents eaae39894312
children 559aee84b889
line wrap: on
line diff
--- a/mercurial/dirstatemap.py	Sun Jul 04 03:29:20 2021 +0200
+++ b/mercurial/dirstatemap.py	Sat Jul 03 04:07:21 2021 +0200
@@ -171,7 +171,7 @@
             # would be nice.
             if entry is not None:
                 # backup the previous state
-                if entry[0] == b'm':  # merge
+                if entry.merged:  # merge
                     size = NONNORMAL
                 elif entry[0] == b'n' and entry[2] == FROM_P2:  # other parent
                     size = FROM_P2