annotate 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
rev   line source
Chris@116 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@116 2
Chris@116 3 /*
Chris@116 4 EasyMercurial
Chris@116 5
Chris@116 6 Based on HgExplorer by Jari Korhonen
Chris@116 7 Copyright (c) 2010 Jari Korhonen
Chris@244 8 Copyright (c) 2011 Chris Cannam
Chris@244 9 Copyright (c) 2011 Queen Mary, University of London
Chris@116 10
Chris@116 11 This program is free software; you can redistribute it and/or
Chris@116 12 modify it under the terms of the GNU General Public License as
Chris@116 13 published by the Free Software Foundation; either version 2 of the
Chris@116 14 License, or (at your option) any later version. See the file
Chris@116 15 COPYING included with this distribution for more information.
Chris@116 16 */
Chris@116 17
Chris@116 18 #ifndef HISTORYWIDGET_H
Chris@116 19 #define HISTORYWIDGET_H
Chris@116 20
Chris@116 21 #include "changeset.h"
Chris@116 22
Chris@116 23 #include <QWidget>
Chris@133 24 #include <QSet>
Chris@116 25
Chris@116 26 class Panned;
Chris@116 27 class Panner;
Chris@129 28 class UncommittedItem;
Chris@145 29 class QGraphicsScene;
Chris@116 30
Chris@116 31 class HistoryWidget : public QWidget
Chris@116 32 {
Chris@116 33 Q_OBJECT
Chris@116 34
Chris@116 35 public:
Chris@116 36 HistoryWidget();
Chris@116 37 virtual ~HistoryWidget();
Chris@116 38
Chris@153 39 void setCurrent(QStringList ids, QString branch, bool showUncommitted);
Chris@505 40 void setShowUncommitted(bool showUncommitted);
Chris@128 41
Chris@120 42 void parseNewLog(QString log);
Chris@120 43 void parseIncrementalLog(QString log);
Chris@134 44
Chris@134 45 bool haveNewItems() const { return !m_newIds.empty(); }
Chris@141 46
Chris@154 47 void update();
Chris@154 48
Chris@141 49 signals:
Chris@141 50 void commit();
Chris@141 51 void revert();
Chris@141 52 void diffWorkingFolder();
Chris@168 53 void showSummary();
Chris@153 54 void showWork();
Chris@311 55 void newBranch();
Chris@311 56 void noBranch();
Chris@141 57
Chris@141 58 void updateTo(QString id);
Chris@148 59 void diffToParent(QString id, QString parent);
Chris@289 60 void showSummary(Changeset *);
Chris@141 61 void diffToCurrent(QString id);
Chris@141 62 void mergeFrom(QString id);
Chris@278 63 void newBranch(QString id);
Chris@141 64 void tag(QString id);
Chris@116 65
Chris@116 66 private:
Chris@116 67 Changesets m_changesets;
Chris@128 68 QStringList m_currentIds;
Chris@153 69 QString m_currentBranch;
Chris@133 70 QSet<QString> m_newIds;
Chris@145 71 bool m_showUncommitted;
Chris@154 72 bool m_refreshNeeded;
Chris@116 73
Chris@116 74 Panned *m_panned;
Chris@116 75 Panner *m_panner;
Chris@116 76
Chris@145 77 QGraphicsScene *scene();
Chris@116 78 void clearChangesets();
Chris@133 79 void replaceChangesets(Changesets);
Chris@133 80 void addChangesets(Changesets);
Chris@120 81 void layoutAll();
Chris@122 82 void setChangesetParents();
Chris@133 83 void updateNewAndCurrentItems();
Chris@141 84 void connectSceneSignals();
Chris@116 85 };
Chris@116 86
Chris@116 87 #endif