Mercurial > hg > easyhg
comparison 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 |
comparison
equal
deleted
inserted
replaced
152:2b997861174b | 153:70fe12873106 |
---|---|
34 | 34 |
35 public: | 35 public: |
36 HistoryWidget(); | 36 HistoryWidget(); |
37 virtual ~HistoryWidget(); | 37 virtual ~HistoryWidget(); |
38 | 38 |
39 void setCurrent(QStringList ids, bool showUncommitted); | 39 void setCurrent(QStringList ids, QString branch, bool showUncommitted); |
40 | 40 |
41 void parseNewLog(QString log); | 41 void parseNewLog(QString log); |
42 void parseIncrementalLog(QString log); | 42 void parseIncrementalLog(QString log); |
43 | 43 |
44 bool haveNewItems() const { return !m_newIds.empty(); } | 44 bool haveNewItems() const { return !m_newIds.empty(); } |
45 | 45 |
46 signals: | 46 signals: |
47 void commit(); | 47 void commit(); |
48 void revert(); | 48 void revert(); |
49 void diffWorkingFolder(); | 49 void diffWorkingFolder(); |
50 void showWork(); | |
50 | 51 |
51 void updateTo(QString id); | 52 void updateTo(QString id); |
52 void diffToParent(QString id, QString parent); | 53 void diffToParent(QString id, QString parent); |
53 void diffToCurrent(QString id); | 54 void diffToCurrent(QString id); |
54 void mergeFrom(QString id); | 55 void mergeFrom(QString id); |
55 void tag(QString id); | 56 void tag(QString id); |
56 | 57 |
57 private: | 58 private: |
58 Changesets m_changesets; | 59 Changesets m_changesets; |
59 QStringList m_currentIds; | 60 QStringList m_currentIds; |
61 QString m_currentBranch; | |
60 QSet<QString> m_newIds; | 62 QSet<QString> m_newIds; |
61 bool m_showUncommitted; | 63 bool m_showUncommitted; |
62 QString m_uncommittedParentId; | |
63 | 64 |
64 Panned *m_panned; | 65 Panned *m_panned; |
65 Panner *m_panner; | 66 Panner *m_panner; |
66 | 67 |
67 QGraphicsScene *scene(); | 68 QGraphicsScene *scene(); |