comparison historywidget.h @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus

 
 public:
     HistoryWidget();
     virtual ~HistoryWidget();
 
-    void setCurrent(QStringList ids, bool showUncommitted);
+    void setCurrent(QStringList ids, QString branch, bool showUncommitted);
 
     void parseNewLog(QString log);
     void parseIncrementalLog(QString log);
 
     bool haveNewItems() const { return !m_newIds.empty(); }
 
 signals:
     void commit();
     void revert();
     void diffWorkingFolder();
+    void showWork();
 
     void updateTo(QString id);
     void diffToParent(QString id, QString parent);
     void diffToCurrent(QString id);
     void mergeFrom(QString id);
     void tag(QString id);
     
 private:
     Changesets m_changesets;
     QStringList m_currentIds;
+    QString m_currentBranch;
     QSet<QString> m_newIds;
     bool m_showUncommitted;
-    QString m_uncommittedParentId;
 
     Panned *m_panned;
     Panner *m_panner;
 
     QGraphicsScene *scene();