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@305
|
144 DEBUG << "addChangesets: " << csets.size() << " new changesets have ("
|
Chris@305
|
145 << m_changesets.size() << " already)" << endl;
|
Chris@138
|
146
|
Chris@133
|
147 csets << m_changesets;
|
Chris@133
|
148 m_changesets = csets;
|
Chris@133
|
149 }
|
Chris@133
|
150
|
Chris@154
|
151 void HistoryWidget::update()
|
Chris@154
|
152 {
|
Chris@154
|
153 if (m_refreshNeeded) {
|
Chris@154
|
154 layoutAll();
|
Chris@154
|
155 }
|
Chris@154
|
156 }
|
Chris@154
|
157
|
Chris@120
|
158 void HistoryWidget::layoutAll()
|
Chris@116
|
159 {
|
Chris@154
|
160 m_refreshNeeded = false;
|
Chris@154
|
161
|
Chris@122
|
162 setChangesetParents();
|
Chris@122
|
163
|
Chris@119
|
164 ChangesetScene *scene = new ChangesetScene();
|
Chris@116
|
165 ChangesetItem *tipItem = 0;
|
Chris@116
|
166
|
Chris@138
|
167 QGraphicsScene *oldScene = m_panned->scene();
|
Chris@138
|
168
|
Chris@138
|
169 m_panned->setScene(0);
|
Chris@138
|
170 m_panner->setScene(0);
|
Chris@138
|
171
|
Chris@138
|
172 delete oldScene;
|
Chris@138
|
173
|
Chris@145
|
174 QGraphicsItem *toFocus = 0;
|
Chris@145
|
175
|
Chris@120
|
176 if (!m_changesets.empty()) {
|
Chris@116
|
177 Grapher g(scene);
|
Chris@116
|
178 try {
|
Chris@153
|
179 g.layout(m_changesets,
|
Chris@153
|
180 m_showUncommitted ? m_currentIds : QStringList(),
|
Chris@153
|
181 m_currentBranch);
|
Chris@116
|
182 } catch (std::string s) {
|
Chris@116
|
183 std::cerr << "Internal error: Layout failed: " << s << std::endl;
|
Chris@116
|
184 }
|
Chris@145
|
185 toFocus = g.getUncommittedItem();
|
Chris@145
|
186 if (!toFocus) {
|
Chris@371
|
187 if (!m_currentIds.empty()) {
|
Chris@371
|
188 toFocus = g.getItemFor(m_currentIds[0]);
|
Chris@371
|
189 } else {
|
Chris@371
|
190 toFocus = g.getItemFor(m_changesets[0]);
|
Chris@371
|
191 }
|
Chris@145
|
192 }
|
Chris@134
|
193 }
|
Chris@134
|
194
|
Chris@116
|
195 m_panned->setScene(scene);
|
Chris@116
|
196 m_panner->setScene(scene);
|
Chris@116
|
197
|
Chris@133
|
198 updateNewAndCurrentItems();
|
Chris@134
|
199
|
Chris@145
|
200 if (toFocus) {
|
Chris@145
|
201 toFocus->ensureVisible();
|
Chris@134
|
202 }
|
Chris@141
|
203
|
Chris@141
|
204 connectSceneSignals();
|
Chris@116
|
205 }
|
Chris@116
|
206
|
Chris@122
|
207 void HistoryWidget::setChangesetParents()
|
Chris@116
|
208 {
|
Chris@139
|
209 for (int i = 0; i < m_changesets.size(); ++i) {
|
Chris@122
|
210 Changeset *cs = m_changesets[i];
|
Chris@123
|
211 // Need to reset this, as Grapher::layout will recalculate it
|
Chris@123
|
212 // and we don't want to end up with twice the children for
|
Chris@123
|
213 // each parent...
|
Chris@123
|
214 cs->setChildren(QStringList());
|
Chris@139
|
215 }
|
Chris@139
|
216 for (int i = 0; i+1 < m_changesets.size(); ++i) {
|
Chris@139
|
217 Changeset *cs = m_changesets[i];
|
Chris@116
|
218 if (cs->parents().empty()) {
|
Chris@116
|
219 QStringList list;
|
Chris@122
|
220 list.push_back(m_changesets[i+1]->id());
|
Chris@116
|
221 cs->setParents(list);
|
Chris@116
|
222 }
|
Chris@116
|
223 }
|
Chris@116
|
224 }
|
Chris@128
|
225
|
Chris@133
|
226 void HistoryWidget::updateNewAndCurrentItems()
|
Chris@128
|
227 {
|
Chris@128
|
228 QGraphicsScene *scene = m_panned->scene();
|
Chris@128
|
229 if (!scene) return;
|
Chris@133
|
230
|
Chris@128
|
231 QList<QGraphicsItem *> items = scene->items();
|
Chris@128
|
232 foreach (QGraphicsItem *it, items) {
|
Chris@133
|
233
|
Chris@128
|
234 ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it);
|
Chris@133
|
235 if (!csit) continue;
|
Chris@133
|
236
|
Chris@133
|
237 QString id = csit->getChangeset()->id();
|
Chris@133
|
238
|
Chris@133
|
239 bool current = m_currentIds.contains(id);
|
Chris@133
|
240 if (current) {
|
Chris@133
|
241 DEBUG << "id " << id << " is current" << endl;
|
Chris@133
|
242 }
|
Chris@133
|
243 bool newid = m_newIds.contains(id);
|
Chris@133
|
244 if (newid) {
|
Chris@133
|
245 DEBUG << "id " << id << " is new" << endl;
|
Chris@133
|
246 }
|
Chris@147
|
247
|
Chris@147
|
248 if (csit->isCurrent() != current || csit->isNew() != newid) {
|
Chris@147
|
249 csit->setCurrent(current);
|
Chris@147
|
250 csit->setNew(newid);
|
Chris@147
|
251 csit->update();
|
Chris@147
|
252 }
|
Chris@128
|
253 }
|
Chris@128
|
254 }
|
Chris@141
|
255
|
Chris@141
|
256 void HistoryWidget::connectSceneSignals()
|
Chris@141
|
257 {
|
Chris@141
|
258 ChangesetScene *scene = qobject_cast<ChangesetScene *>(m_panned->scene());
|
Chris@141
|
259 if (!scene) return;
|
Chris@141
|
260
|
Chris@141
|
261 connect(scene, SIGNAL(commit()),
|
Chris@141
|
262 this, SIGNAL(commit()));
|
Chris@141
|
263
|
Chris@141
|
264 connect(scene, SIGNAL(revert()),
|
Chris@141
|
265 this, SIGNAL(revert()));
|
Chris@141
|
266
|
Chris@141
|
267 connect(scene, SIGNAL(diffWorkingFolder()),
|
Chris@141
|
268 this, SIGNAL(diffWorkingFolder()));
|
Chris@141
|
269
|
Chris@168
|
270 connect(scene, SIGNAL(showSummary()),
|
Chris@168
|
271 this, SIGNAL(showSummary()));
|
Chris@168
|
272
|
Chris@153
|
273 connect(scene, SIGNAL(showWork()),
|
Chris@153
|
274 this, SIGNAL(showWork()));
|
Chris@311
|
275
|
Chris@311
|
276 connect(scene, SIGNAL(newBranch()),
|
Chris@311
|
277 this, SIGNAL(newBranch()));
|
Chris@311
|
278
|
Chris@311
|
279 connect(scene, SIGNAL(noBranch()),
|
Chris@311
|
280 this, SIGNAL(noBranch()));
|
Chris@153
|
281
|
Chris@141
|
282 connect(scene, SIGNAL(updateTo(QString)),
|
Chris@141
|
283 this, SIGNAL(updateTo(QString)));
|
Chris@141
|
284
|
Chris@141
|
285 connect(scene, SIGNAL(diffToCurrent(QString)),
|
Chris@141
|
286 this, SIGNAL(diffToCurrent(QString)));
|
Chris@141
|
287
|
Chris@148
|
288 connect(scene, SIGNAL(diffToParent(QString, QString)),
|
Chris@148
|
289 this, SIGNAL(diffToParent(QString, QString)));
|
Chris@141
|
290
|
Chris@289
|
291 connect(scene, SIGNAL(showSummary(Changeset *)),
|
Chris@289
|
292 this, SIGNAL(showSummary(Changeset *)));
|
Chris@288
|
293
|
Chris@141
|
294 connect(scene, SIGNAL(mergeFrom(QString)),
|
Chris@141
|
295 this, SIGNAL(mergeFrom(QString)));
|
Chris@141
|
296
|
Chris@278
|
297 connect(scene, SIGNAL(newBranch(QString)),
|
Chris@278
|
298 this, SIGNAL(newBranch(QString)));
|
Chris@278
|
299
|
Chris@141
|
300 connect(scene, SIGNAL(tag(QString)),
|
Chris@141
|
301 this, SIGNAL(tag(QString)));
|
Chris@141
|
302 }
|