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