Mercurial > hg > easyhg

diff src/grapher.cpp @ 399:b1f0fa991c49 item_appearance_adjustments

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use circle presentation for uncommitted merge as well as merge changeset
author Chris Cannam
date Wed, 25 May 2011 14:58:49 +0100
parents 61bde1f0ff0a
children 69fb864a3972
line wrap: on
line diff
--- a/src/grapher.cpp	Wed May 25 14:48:42 2011 +0100
+++ b/src/grapher.cpp	Wed May 25 14:58:49 2011 +0100
@@ -464,6 +464,9 @@
         // tell it it has a new branch (the "show branch" flag is set
         // elsewhere for this item)
         m_uncommitted->setIsNewBranch(!haveParentOnBranch);
+
+        // Uncommitted is a merge if it has more than one parent
+        m_uncommitted->setIsMerge(m_uncommittedParents.size() > 1);
     }
 
     // Add the branch labels