Mercurial > hg > easyhg
comparison src/historywidget.h @ 505:1c05e7576ea5
Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author | Chris Cannam |
---|---|
date | Mon, 17 Oct 2011 16:25:02 +0100 |
parents | b9c153e00e84 |
children | 470829a21f98 |
comparison
equal
deleted
inserted
replaced
504:d972f0cd61b3 | 505:1c05e7576ea5 |
---|---|
35 public: | 35 public: |
36 HistoryWidget(); | 36 HistoryWidget(); |
37 virtual ~HistoryWidget(); | 37 virtual ~HistoryWidget(); |
38 | 38 |
39 void setCurrent(QStringList ids, QString branch, bool showUncommitted); | 39 void setCurrent(QStringList ids, QString branch, bool showUncommitted); |
40 void setShowUncommitted(bool showUncommitted); | |
40 | 41 |
41 void parseNewLog(QString log); | 42 void parseNewLog(QString log); |
42 void parseIncrementalLog(QString log); | 43 void parseIncrementalLog(QString log); |
43 | 44 |
44 bool haveNewItems() const { return !m_newIds.empty(); } | 45 bool haveNewItems() const { return !m_newIds.empty(); } |