Mercurial > hg > easyhg

diff grapher.h @ 153:70fe12873106

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Show both parents of uncommitted merge; fixes to right-button menus
author Chris Cannam
date Thu, 02 Dec 2010 17:55:21 +0000
parents 644bd31e8301
children ec2baee80833
line wrap: on
line diff
--- a/grapher.h	Thu Dec 02 11:51:15 2010 +0000
+++ b/grapher.h	Thu Dec 02 17:55:21 2010 +0000
@@ -34,7 +34,9 @@
 public:
     Grapher(ChangesetScene *scene) { m_scene = scene; }
 
-    void layout(Changesets csets, QString uncommittedSproutsFrom = "");
+    void layout(Changesets csets,
+                QStringList uncommittedParents,
+                QString uncommittedBranch);
 
     ChangesetItem *getItemFor(Changeset *cs);
 
@@ -77,7 +79,7 @@
     typedef QMap<int, QString> RowDateMap;
     RowDateMap m_rowDates;
 
-    QString m_uncommittedParentId;
+    QStringList m_uncommittedParents;
     int m_uncommittedParentRow;
     UncommittedItem *m_uncommitted;
     bool m_haveAllocatedUncommittedColumn;