annotate historywidget.cpp @ 141:e6c6b88d19b9

* Start hooking up right-button menus on changeset & uncommitted items
author Chris Cannam
date Tue, 30 Nov 2010 17:56:11 +0000
parents e8a481789607
children 644bd31e8301
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@116 8 Copyright (c) 2010 Chris Cannam
Chris@116 9 Copyright (c) 2010 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@116 31 HistoryWidget::HistoryWidget()
Chris@116 32 {
Chris@116 33 m_panned = new Panned;
Chris@116 34 m_panner = new Panner;
Chris@129 35 m_uncommitted = new UncommittedItem();
Chris@129 36 m_uncommitted->setRow(-1);
Chris@134 37 m_uncommittedVisible = false;
Chris@116 38
Chris@116 39 QGridLayout *layout = new QGridLayout;
Chris@116 40 layout->addWidget(m_panned, 0, 0);
Chris@116 41 layout->addWidget(m_panner, 0, 1);
Chris@116 42 m_panner->setMaximumWidth(80);
Chris@116 43 m_panner->connectToPanned(m_panned);
Chris@116 44
Chris@116 45 setLayout(layout);
Chris@116 46 }
Chris@116 47
Chris@116 48 HistoryWidget::~HistoryWidget()
Chris@116 49 {
Chris@116 50 clearChangesets();
Chris@134 51 if (!m_uncommittedVisible) delete m_uncommitted;
Chris@116 52 }
Chris@116 53
Chris@116 54 void HistoryWidget::clearChangesets()
Chris@116 55 {
Chris@116 56 foreach (Changeset *cs, m_changesets) delete cs;
Chris@116 57 m_changesets.clear();
Chris@116 58 }
Chris@128 59
Chris@128 60 void HistoryWidget::setCurrent(QStringList ids)
Chris@128 61 {
Chris@128 62 if (m_currentIds == ids) return;
Chris@128 63 DEBUG << "HistoryWidget::setCurrent: " << ids.size() << " ids" << endl;
Chris@133 64 m_currentIds.clear();
Chris@133 65 foreach (QString id, ids) {
Chris@133 66 m_currentIds.push_back(id);
Chris@133 67 }
Chris@133 68 updateNewAndCurrentItems();
Chris@128 69 }
Chris@128 70
Chris@128 71 void HistoryWidget::showUncommittedChanges(bool show)
Chris@128 72 {
Chris@139 73 if (m_uncommittedVisible == show) return;
Chris@134 74 m_uncommittedVisible = show;
Chris@141 75 ChangesetScene *scene = qobject_cast<ChangesetScene *>(m_panned->scene());
Chris@139 76 if (!scene) return;
Chris@139 77 if (m_uncommittedVisible) {
Chris@141 78 scene->addUncommittedItem(m_uncommitted);
Chris@141 79 m_uncommitted->ensureVisible();
Chris@139 80 } else {
Chris@139 81 scene->removeItem(m_uncommitted);
Chris@139 82 }
Chris@128 83 }
Chris@116 84
Chris@120 85 void HistoryWidget::parseNewLog(QString log)
Chris@120 86 {
Chris@120 87 DEBUG << "HistoryWidget::parseNewLog: log has " << log.length() << " chars" << endl;
Chris@122 88 Changesets csets = Changeset::parseChangesets(log);
Chris@120 89 DEBUG << "HistoryWidget::parseNewLog: log has " << csets.size() << " changesets" << endl;
Chris@133 90 replaceChangesets(csets);
Chris@120 91 layoutAll();
Chris@120 92 }
Chris@120 93
Chris@120 94 void HistoryWidget::parseIncrementalLog(QString log)
Chris@120 95 {
Chris@120 96 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << log.length() << " chars" << endl;
Chris@122 97 Changesets csets = Changeset::parseChangesets(log);
Chris@120 98 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << csets.size() << " changesets" << endl;
Chris@120 99 if (!csets.empty()) {
Chris@133 100 addChangesets(csets);
Chris@120 101 layoutAll();
Chris@120 102 }
Chris@120 103 }
Chris@120 104
Chris@133 105 void HistoryWidget::replaceChangesets(Changesets csets)
Chris@133 106 {
Chris@133 107 QSet<QString> oldIds;
Chris@133 108 foreach (Changeset *cs, m_changesets) {
Chris@133 109 oldIds.insert(cs->id());
Chris@133 110 }
Chris@133 111
Chris@133 112 QSet<QString> newIds;
Chris@133 113 foreach (Changeset *cs, csets) {
Chris@133 114 if (!oldIds.contains(cs->id())) {
Chris@133 115 newIds.insert(cs->id());
Chris@133 116 }
Chris@133 117 }
Chris@133 118
Chris@133 119 if (newIds.size() == csets.size()) {
Chris@133 120 // completely new set, unrelated to the old: don't mark new
Chris@133 121 m_newIds.clear();
Chris@133 122 } else {
Chris@133 123 m_newIds = newIds;
Chris@133 124 }
Chris@133 125
Chris@133 126 clearChangesets();
Chris@133 127 m_changesets = csets;
Chris@133 128 }
Chris@133 129
Chris@133 130 void HistoryWidget::addChangesets(Changesets csets)
Chris@133 131 {
Chris@133 132 m_newIds.clear();
Chris@138 133
Chris@138 134 if (csets.empty()) return;
Chris@138 135
Chris@133 136 foreach (Changeset *cs, csets) {
Chris@133 137 m_newIds.insert(cs->id());
Chris@133 138 }
Chris@133 139
Chris@138 140 DEBUG << "addChangesets: " << csets.size() << " new changesets" << endl;
Chris@138 141
Chris@133 142 csets << m_changesets;
Chris@133 143 m_changesets = csets;
Chris@133 144 }
Chris@133 145
Chris@120 146 void HistoryWidget::layoutAll()
Chris@116 147 {
Chris@122 148 setChangesetParents();
Chris@122 149
Chris@119 150 ChangesetScene *scene = new ChangesetScene();
Chris@116 151 ChangesetItem *tipItem = 0;
Chris@116 152
Chris@138 153 QGraphicsScene *oldScene = m_panned->scene();
Chris@138 154
Chris@138 155 // detach m_uncommitted from old scene so it doesn't get deleted
Chris@138 156 if (oldScene && (m_uncommitted->scene() == oldScene)) {
Chris@138 157 oldScene->removeItem(m_uncommitted);
Chris@138 158 }
Chris@138 159
Chris@138 160 m_panned->setScene(0);
Chris@138 161 m_panner->setScene(0);
Chris@138 162
Chris@138 163 delete oldScene;
Chris@138 164
Chris@120 165 if (!m_changesets.empty()) {
Chris@116 166 Grapher g(scene);
Chris@116 167 try {
Chris@120 168 g.layout(m_changesets);
Chris@116 169 } catch (std::string s) {
Chris@116 170 std::cerr << "Internal error: Layout failed: " << s << std::endl;
Chris@116 171 }
Chris@120 172 tipItem = g.getItemFor(m_changesets[0]);
Chris@120 173 DEBUG << "tipItem is " << tipItem << " for tip changeset "
Chris@120 174 << m_changesets[0]->id() << endl;
Chris@116 175 }
Chris@116 176
Chris@134 177 if (m_uncommittedVisible) {
Chris@141 178 scene->addUncommittedItem(m_uncommitted);
Chris@134 179 }
Chris@134 180
Chris@116 181 m_panned->setScene(scene);
Chris@116 182 m_panner->setScene(scene);
Chris@116 183
Chris@133 184 updateNewAndCurrentItems();
Chris@134 185
Chris@134 186 if (m_uncommittedVisible) {
Chris@141 187 DEBUG << "asking uncommitted item to be visible" << endl;
Chris@134 188 m_uncommitted->ensureVisible();
Chris@134 189 } else if (tipItem) {
Chris@134 190 DEBUG << "asking tip item to be visible" << endl;
Chris@134 191 tipItem->ensureVisible();
Chris@134 192 }
Chris@141 193
Chris@141 194 connectSceneSignals();
Chris@116 195 }
Chris@116 196
Chris@122 197 void HistoryWidget::setChangesetParents()
Chris@116 198 {
Chris@139 199 for (int i = 0; i < m_changesets.size(); ++i) {
Chris@122 200 Changeset *cs = m_changesets[i];
Chris@123 201 // Need to reset this, as Grapher::layout will recalculate it
Chris@123 202 // and we don't want to end up with twice the children for
Chris@123 203 // each parent...
Chris@123 204 cs->setChildren(QStringList());
Chris@139 205 }
Chris@139 206 for (int i = 0; i+1 < m_changesets.size(); ++i) {
Chris@139 207 Changeset *cs = m_changesets[i];
Chris@116 208 if (cs->parents().empty()) {
Chris@116 209 QStringList list;
Chris@122 210 list.push_back(m_changesets[i+1]->id());
Chris@116 211 cs->setParents(list);
Chris@116 212 }
Chris@116 213 }
Chris@116 214 }
Chris@128 215
Chris@133 216 void HistoryWidget::updateNewAndCurrentItems()
Chris@128 217 {
Chris@128 218 QGraphicsScene *scene = m_panned->scene();
Chris@128 219 if (!scene) return;
Chris@133 220
Chris@128 221 QList<QGraphicsItem *> items = scene->items();
Chris@128 222 foreach (QGraphicsItem *it, items) {
Chris@133 223
Chris@128 224 ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it);
Chris@133 225 if (!csit) continue;
Chris@133 226
Chris@133 227 QString id = csit->getChangeset()->id();
Chris@133 228
Chris@133 229 bool current = m_currentIds.contains(id);
Chris@133 230 if (current) {
Chris@133 231 DEBUG << "id " << id << " is current" << endl;
Chris@133 232 }
Chris@133 233 bool newid = m_newIds.contains(id);
Chris@133 234 if (newid) {
Chris@133 235 DEBUG << "id " << id << " is new" << endl;
Chris@133 236 }
Chris@133 237
Chris@133 238 csit->setCurrent(current);
Chris@133 239 csit->setNew(newid);
Chris@133 240
Chris@133 241 if (current) {
Chris@129 242 m_uncommitted->setRow(csit->row() - 1);
Chris@129 243 m_uncommitted->setColumn(csit->column());
Chris@129 244 m_uncommitted->setWide(csit->isWide());
Chris@129 245 m_uncommitted->setBranch(csit->getChangeset()->branch());
Chris@128 246 }
Chris@128 247 }
Chris@128 248 }
Chris@141 249
Chris@141 250 void HistoryWidget::connectSceneSignals()
Chris@141 251 {
Chris@141 252 ChangesetScene *scene = qobject_cast<ChangesetScene *>(m_panned->scene());
Chris@141 253 if (!scene) return;
Chris@141 254
Chris@141 255 connect(scene, SIGNAL(commit()),
Chris@141 256 this, SIGNAL(commit()));
Chris@141 257
Chris@141 258 connect(scene, SIGNAL(revert()),
Chris@141 259 this, SIGNAL(revert()));
Chris@141 260
Chris@141 261 connect(scene, SIGNAL(diffWorkingFolder()),
Chris@141 262 this, SIGNAL(diffWorkingFolder()));
Chris@141 263
Chris@141 264 connect(scene, SIGNAL(updateTo(QString)),
Chris@141 265 this, SIGNAL(updateTo(QString)));
Chris@141 266
Chris@141 267 connect(scene, SIGNAL(diffToCurrent(QString)),
Chris@141 268 this, SIGNAL(diffToCurrent(QString)));
Chris@141 269
Chris@141 270 connect(scene, SIGNAL(diffToPrevious(QString)),
Chris@141 271 this, SIGNAL(diffToPrevious(QString)));
Chris@141 272
Chris@141 273 connect(scene, SIGNAL(mergeFrom(QString)),
Chris@141 274 this, SIGNAL(mergeFrom(QString)));
Chris@141 275
Chris@141 276 connect(scene, SIGNAL(tag(QString)),
Chris@141 277 this, SIGNAL(tag(QString)));
Chris@141 278 }