annotate historywidget.cpp @ 278:f7cdd5b31aed new-branches

Add "Start new branch" function. I'm not quite satisfied with the location of this one
author Chris Cannam
date Wed, 09 Feb 2011 12:03:15 +0000
parents be483734bde5
children 5b4aa1c24407
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 #include "historywidget.h"
Chris@116 19
Chris@119 20 #include "changesetscene.h"
Chris@116 21 #include "panned.h"
Chris@116 22 #include "panner.h"
Chris@116 23 #include "grapher.h"
Chris@116 24 #include "debug.h"
Chris@129 25 #include "uncommitteditem.h"
Chris@116 26
Chris@116 27 #include <iostream>
Chris@116 28
Chris@116 29 #include <QGridLayout>
Chris@116 30
Chris@154 31 HistoryWidget::HistoryWidget() :
Chris@154 32 m_showUncommitted(false),
Chris@154 33 m_refreshNeeded(false)
Chris@116 34 {
Chris@116 35 m_panned = new Panned;
Chris@116 36 m_panner = new Panner;
Chris@116 37
Chris@168 38 m_panned->setDragMode(QGraphicsView::ScrollHandDrag);
Chris@250 39 m_panned->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
Chris@168 40
Chris@116 41 QGridLayout *layout = new QGridLayout;
Chris@116 42 layout->addWidget(m_panned, 0, 0);
Chris@116 43 layout->addWidget(m_panner, 0, 1);
Chris@116 44 m_panner->setMaximumWidth(80);
Chris@116 45 m_panner->connectToPanned(m_panned);
Chris@116 46
Chris@116 47 setLayout(layout);
Chris@116 48 }
Chris@116 49
Chris@116 50 HistoryWidget::~HistoryWidget()
Chris@116 51 {
Chris@116 52 clearChangesets();
Chris@145 53 }
Chris@145 54
Chris@145 55 QGraphicsScene *HistoryWidget::scene()
Chris@145 56 {
Chris@145 57 return m_panned->scene();
Chris@116 58 }
Chris@116 59
Chris@116 60 void HistoryWidget::clearChangesets()
Chris@116 61 {
Chris@116 62 foreach (Changeset *cs, m_changesets) delete cs;
Chris@116 63 m_changesets.clear();
Chris@116 64 }
Chris@128 65
Chris@153 66 void HistoryWidget::setCurrent(QStringList ids, QString branch,
Chris@153 67 bool showUncommitted)
Chris@128 68 {
Chris@153 69 if (m_currentIds == ids &&
Chris@153 70 m_currentBranch == branch &&
Chris@153 71 m_showUncommitted == showUncommitted) return;
Chris@145 72
Chris@145 73 DEBUG << "HistoryWidget::setCurrent: " << ids.size() << " ids, "
Chris@145 74 << "showUncommitted: " << showUncommitted << endl;
Chris@145 75
Chris@133 76 m_currentIds.clear();
Chris@153 77 m_currentBranch = branch;
Chris@145 78 m_showUncommitted = showUncommitted;
Chris@145 79
Chris@145 80 if (ids.empty()) return;
Chris@145 81
Chris@133 82 foreach (QString id, ids) {
Chris@133 83 m_currentIds.push_back(id);
Chris@133 84 }
Chris@128 85
Chris@154 86 m_refreshNeeded = true;
Chris@128 87 }
Chris@116 88
Chris@120 89 void HistoryWidget::parseNewLog(QString log)
Chris@120 90 {
Chris@120 91 DEBUG << "HistoryWidget::parseNewLog: log has " << log.length() << " chars" << endl;
Chris@122 92 Changesets csets = Changeset::parseChangesets(log);
Chris@120 93 DEBUG << "HistoryWidget::parseNewLog: log has " << csets.size() << " changesets" << endl;
Chris@133 94 replaceChangesets(csets);
Chris@154 95 m_refreshNeeded = true;
Chris@120 96 }
Chris@120 97
Chris@120 98 void HistoryWidget::parseIncrementalLog(QString log)
Chris@120 99 {
Chris@120 100 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << log.length() << " chars" << endl;
Chris@122 101 Changesets csets = Changeset::parseChangesets(log);
Chris@120 102 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << csets.size() << " changesets" << endl;
Chris@120 103 if (!csets.empty()) {
Chris@133 104 addChangesets(csets);
Chris@120 105 }
Chris@154 106 m_refreshNeeded = true;
Chris@120 107 }
Chris@120 108
Chris@133 109 void HistoryWidget::replaceChangesets(Changesets csets)
Chris@133 110 {
Chris@133 111 QSet<QString> oldIds;
Chris@133 112 foreach (Changeset *cs, m_changesets) {
Chris@133 113 oldIds.insert(cs->id());
Chris@133 114 }
Chris@133 115
Chris@133 116 QSet<QString> newIds;
Chris@133 117 foreach (Changeset *cs, csets) {
Chris@133 118 if (!oldIds.contains(cs->id())) {
Chris@133 119 newIds.insert(cs->id());
Chris@133 120 }
Chris@133 121 }
Chris@133 122
Chris@133 123 if (newIds.size() == csets.size()) {
Chris@133 124 // completely new set, unrelated to the old: don't mark new
Chris@133 125 m_newIds.clear();
Chris@133 126 } else {
Chris@133 127 m_newIds = newIds;
Chris@133 128 }
Chris@133 129
Chris@133 130 clearChangesets();
Chris@133 131 m_changesets = csets;
Chris@133 132 }
Chris@133 133
Chris@133 134 void HistoryWidget::addChangesets(Changesets csets)
Chris@133 135 {
Chris@133 136 m_newIds.clear();
Chris@138 137
Chris@138 138 if (csets.empty()) return;
Chris@138 139
Chris@133 140 foreach (Changeset *cs, csets) {
Chris@133 141 m_newIds.insert(cs->id());
Chris@133 142 }
Chris@133 143
Chris@138 144 DEBUG << "addChangesets: " << csets.size() << " new changesets" << endl;
Chris@138 145
Chris@133 146 csets << m_changesets;
Chris@133 147 m_changesets = csets;
Chris@133 148 }
Chris@133 149
Chris@154 150 void HistoryWidget::update()
Chris@154 151 {
Chris@154 152 if (m_refreshNeeded) {
Chris@154 153 layoutAll();
Chris@154 154 }
Chris@154 155 }
Chris@154 156
Chris@120 157 void HistoryWidget::layoutAll()
Chris@116 158 {
Chris@154 159 m_refreshNeeded = false;
Chris@154 160
Chris@122 161 setChangesetParents();
Chris@122 162
Chris@119 163 ChangesetScene *scene = new ChangesetScene();
Chris@116 164 ChangesetItem *tipItem = 0;
Chris@116 165
Chris@138 166 QGraphicsScene *oldScene = m_panned->scene();
Chris@138 167
Chris@138 168 m_panned->setScene(0);
Chris@138 169 m_panner->setScene(0);
Chris@138 170
Chris@138 171 delete oldScene;
Chris@138 172
Chris@145 173 QGraphicsItem *toFocus = 0;
Chris@145 174
Chris@120 175 if (!m_changesets.empty()) {
Chris@116 176 Grapher g(scene);
Chris@116 177 try {
Chris@153 178 g.layout(m_changesets,
Chris@153 179 m_showUncommitted ? m_currentIds : QStringList(),
Chris@153 180 m_currentBranch);
Chris@116 181 } catch (std::string s) {
Chris@116 182 std::cerr << "Internal error: Layout failed: " << s << std::endl;
Chris@116 183 }
Chris@145 184 toFocus = g.getUncommittedItem();
Chris@145 185 if (!toFocus) {
Chris@145 186 toFocus = g.getItemFor(m_changesets[0]);
Chris@145 187 }
Chris@134 188 }
Chris@134 189
Chris@116 190 m_panned->setScene(scene);
Chris@116 191 m_panner->setScene(scene);
Chris@116 192
Chris@133 193 updateNewAndCurrentItems();
Chris@134 194
Chris@145 195 if (toFocus) {
Chris@145 196 toFocus->ensureVisible();
Chris@134 197 }
Chris@141 198
Chris@141 199 connectSceneSignals();
Chris@116 200 }
Chris@116 201
Chris@122 202 void HistoryWidget::setChangesetParents()
Chris@116 203 {
Chris@139 204 for (int i = 0; i < m_changesets.size(); ++i) {
Chris@122 205 Changeset *cs = m_changesets[i];
Chris@123 206 // Need to reset this, as Grapher::layout will recalculate it
Chris@123 207 // and we don't want to end up with twice the children for
Chris@123 208 // each parent...
Chris@123 209 cs->setChildren(QStringList());
Chris@139 210 }
Chris@139 211 for (int i = 0; i+1 < m_changesets.size(); ++i) {
Chris@139 212 Changeset *cs = m_changesets[i];
Chris@116 213 if (cs->parents().empty()) {
Chris@116 214 QStringList list;
Chris@122 215 list.push_back(m_changesets[i+1]->id());
Chris@116 216 cs->setParents(list);
Chris@116 217 }
Chris@116 218 }
Chris@116 219 }
Chris@128 220
Chris@133 221 void HistoryWidget::updateNewAndCurrentItems()
Chris@128 222 {
Chris@128 223 QGraphicsScene *scene = m_panned->scene();
Chris@128 224 if (!scene) return;
Chris@133 225
Chris@128 226 QList<QGraphicsItem *> items = scene->items();
Chris@128 227 foreach (QGraphicsItem *it, items) {
Chris@133 228
Chris@128 229 ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it);
Chris@133 230 if (!csit) continue;
Chris@133 231
Chris@133 232 QString id = csit->getChangeset()->id();
Chris@133 233
Chris@133 234 bool current = m_currentIds.contains(id);
Chris@133 235 if (current) {
Chris@133 236 DEBUG << "id " << id << " is current" << endl;
Chris@133 237 }
Chris@133 238 bool newid = m_newIds.contains(id);
Chris@133 239 if (newid) {
Chris@133 240 DEBUG << "id " << id << " is new" << endl;
Chris@133 241 }
Chris@147 242
Chris@147 243 if (csit->isCurrent() != current || csit->isNew() != newid) {
Chris@147 244 csit->setCurrent(current);
Chris@147 245 csit->setNew(newid);
Chris@147 246 csit->update();
Chris@147 247 }
Chris@128 248 }
Chris@128 249 }
Chris@141 250
Chris@141 251 void HistoryWidget::connectSceneSignals()
Chris@141 252 {
Chris@141 253 ChangesetScene *scene = qobject_cast<ChangesetScene *>(m_panned->scene());
Chris@141 254 if (!scene) return;
Chris@141 255
Chris@141 256 connect(scene, SIGNAL(commit()),
Chris@141 257 this, SIGNAL(commit()));
Chris@141 258
Chris@141 259 connect(scene, SIGNAL(revert()),
Chris@141 260 this, SIGNAL(revert()));
Chris@141 261
Chris@141 262 connect(scene, SIGNAL(diffWorkingFolder()),
Chris@141 263 this, SIGNAL(diffWorkingFolder()));
Chris@141 264
Chris@168 265 connect(scene, SIGNAL(showSummary()),
Chris@168 266 this, SIGNAL(showSummary()));
Chris@168 267
Chris@153 268 connect(scene, SIGNAL(showWork()),
Chris@153 269 this, SIGNAL(showWork()));
Chris@153 270
Chris@141 271 connect(scene, SIGNAL(updateTo(QString)),
Chris@141 272 this, SIGNAL(updateTo(QString)));
Chris@141 273
Chris@141 274 connect(scene, SIGNAL(diffToCurrent(QString)),
Chris@141 275 this, SIGNAL(diffToCurrent(QString)));
Chris@141 276
Chris@148 277 connect(scene, SIGNAL(diffToParent(QString, QString)),
Chris@148 278 this, SIGNAL(diffToParent(QString, QString)));
Chris@141 279
Chris@141 280 connect(scene, SIGNAL(mergeFrom(QString)),
Chris@141 281 this, SIGNAL(mergeFrom(QString)));
Chris@141 282
Chris@278 283 connect(scene, SIGNAL(newBranch(QString)),
Chris@278 284 this, SIGNAL(newBranch(QString)));
Chris@278 285
Chris@141 286 connect(scene, SIGNAL(tag(QString)),
Chris@141 287 this, SIGNAL(tag(QString)));
Chris@141 288 }