Mercurial > hg > easyhg
diff historywidget.h @ 153:70fe12873106
* Show both parents of uncommitted merge; fixes to right-button menus
author | Chris Cannam |
---|---|
date | Thu, 02 Dec 2010 17:55:21 +0000 |
parents | 2fef6b0dfbe8 |
children | 6bcb4a4d6521 |
line wrap: on
line diff
--- a/historywidget.h Thu Dec 02 11:51:15 2010 +0000 +++ b/historywidget.h Thu Dec 02 17:55:21 2010 +0000 @@ -36,7 +36,7 @@ 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); @@ -47,6 +47,7 @@ void commit(); void revert(); void diffWorkingFolder(); + void showWork(); void updateTo(QString id); void diffToParent(QString id, QString parent); @@ -57,9 +58,9 @@ 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;