Chris@57
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
jtkorhonen@0
|
2
|
Chris@57
|
3 /*
|
Chris@57
|
4 EasyMercurial
|
Chris@57
|
5
|
Chris@98
|
6 Based on hgExplorer by Jari Korhonen
|
Chris@57
|
7 Copyright (c) 2010 Jari Korhonen
|
Chris@57
|
8 Copyright (c) 2010 Chris Cannam
|
Chris@57
|
9 Copyright (c) 2010 Queen Mary, University of London
|
Chris@57
|
10
|
Chris@57
|
11 This program is free software; you can redistribute it and/or
|
Chris@57
|
12 modify it under the terms of the GNU General Public License as
|
Chris@57
|
13 published by the Free Software Foundation; either version 2 of the
|
Chris@57
|
14 License, or (at your option) any later version. See the file
|
Chris@57
|
15 COPYING included with this distribution for more information.
|
Chris@57
|
16 */
|
Chris@50
|
17
|
jtkorhonen@0
|
18 #include <QStringList>
|
jtkorhonen@0
|
19 #include <QDir>
|
jtkorhonen@24
|
20 #include <QNetworkInterface>
|
jtkorhonen@17
|
21 #include <QHostAddress>
|
jtkorhonen@17
|
22 #include <QHostInfo>
|
jtkorhonen@34
|
23 #include <QDesktopServices>
|
Chris@50
|
24 #include <QStatusBar>
|
Chris@50
|
25 #include <QMessageBox>
|
Chris@50
|
26 #include <QMenuBar>
|
Chris@50
|
27 #include <QApplication>
|
Chris@50
|
28 #include <QToolBar>
|
Chris@61
|
29 #include <QToolButton>
|
Chris@50
|
30 #include <QSettings>
|
Chris@90
|
31 #include <QInputDialog>
|
Chris@125
|
32 #include <QRegExp>
|
jtkorhonen@0
|
33
|
Chris@53
|
34 #include "mainwindow.h"
|
Chris@69
|
35 #include "multichoicedialog.h"
|
Chris@64
|
36 #include "startupdialog.h"
|
Chris@53
|
37 #include "colourset.h"
|
Chris@62
|
38 #include "debug.h"
|
Chris@74
|
39 #include "logparser.h"
|
Chris@103
|
40 #include "confirmcommentdialog.h"
|
Chris@125
|
41 #include "incomingdialog.h"
|
Chris@175
|
42 #include "settingsdialog.h"
|
Chris@53
|
43
|
jtkorhonen@0
|
44
|
Chris@172
|
45 MainWindow::MainWindow(QString myDirPath) :
|
Chris@172
|
46 m_myDirPath(myDirPath)
|
jtkorhonen@0
|
47 {
|
jtkorhonen@0
|
48 QString wndTitle;
|
jtkorhonen@0
|
49
|
Chris@90
|
50 fsWatcher = 0;
|
Chris@133
|
51 commitsSincePush = 0;
|
Chris@163
|
52 shouldHgStat = true;
|
Chris@90
|
53
|
jtkorhonen@0
|
54 createActions();
|
jtkorhonen@0
|
55 createMenus();
|
jtkorhonen@0
|
56 createToolBars();
|
jtkorhonen@0
|
57 createStatusBar();
|
jtkorhonen@0
|
58
|
Chris@172
|
59 runner = new HgRunner(myDirPath, this);
|
Chris@109
|
60 connect(runner, SIGNAL(commandCompleted(HgAction, QString)),
|
Chris@109
|
61 this, SLOT(commandCompleted(HgAction, QString)));
|
Chris@109
|
62 connect(runner, SIGNAL(commandFailed(HgAction, QString)),
|
Chris@109
|
63 this, SLOT(commandFailed(HgAction, QString)));
|
jtkorhonen@0
|
64 statusBar()->addPermanentWidget(runner);
|
jtkorhonen@0
|
65
|
Chris@61
|
66 setWindowTitle(tr("EasyMercurial"));
|
jtkorhonen@0
|
67
|
jtkorhonen@0
|
68 remoteRepoPath = "";
|
jtkorhonen@0
|
69 workFolderPath = "";
|
jtkorhonen@0
|
70
|
jtkorhonen@0
|
71 readSettings();
|
jtkorhonen@0
|
72
|
jtkorhonen@33
|
73 justMerged = false;
|
Chris@98
|
74 hgTabs = new HgTabWidget((QWidget *) this, remoteRepoPath, workFolderPath);
|
Chris@141
|
75 connectTabsSignals();
|
Chris@98
|
76 setCentralWidget(hgTabs);
|
jtkorhonen@0
|
77
|
Chris@98
|
78 connect(hgTabs, SIGNAL(selectionChanged()),
|
Chris@95
|
79 this, SLOT(enableDisableActions()));
|
Chris@95
|
80
|
jtkorhonen@0
|
81 setUnifiedTitleAndToolBarOnMac(true);
|
jtkorhonen@0
|
82 connectActions();
|
Chris@120
|
83 clearState();
|
jtkorhonen@0
|
84 enableDisableActions();
|
jtkorhonen@0
|
85
|
Chris@64
|
86 if (firstStart) {
|
Chris@64
|
87 startupDialog();
|
jtkorhonen@0
|
88 }
|
jtkorhonen@0
|
89
|
Chris@179
|
90 (void)findDiffBinaryName();
|
Chris@179
|
91 (void)findMergeBinaryName();
|
Chris@179
|
92 (void)findEditorBinaryName();
|
Chris@112
|
93
|
Chris@64
|
94 ColourSet *cs = ColourSet::instance();
|
Chris@64
|
95 cs->clearDefaultNames();
|
Chris@64
|
96 cs->addDefaultName("");
|
Chris@153
|
97 cs->addDefaultName("default");
|
Chris@64
|
98 cs->addDefaultName(getUserInfo());
|
Chris@62
|
99
|
Chris@72
|
100 if (workFolderPath == "") {
|
Chris@72
|
101 open();
|
Chris@72
|
102 }
|
Chris@72
|
103
|
Chris@175
|
104 hgTest();
|
jtkorhonen@0
|
105 }
|
jtkorhonen@0
|
106
|
jtkorhonen@0
|
107
|
jtkorhonen@0
|
108 void MainWindow::closeEvent(QCloseEvent *)
|
jtkorhonen@0
|
109 {
|
jtkorhonen@0
|
110 writeSettings();
|
Chris@90
|
111 delete fsWatcher;
|
jtkorhonen@0
|
112 }
|
jtkorhonen@0
|
113
|
jtkorhonen@0
|
114
|
Chris@64
|
115 QString MainWindow::getUserInfo() const
|
Chris@64
|
116 {
|
Chris@64
|
117 QSettings settings;
|
Chris@64
|
118 settings.beginGroup("User Information");
|
Chris@64
|
119 QString name = settings.value("name", getUserRealName()).toString();
|
Chris@64
|
120 QString email = settings.value("email", "").toString();
|
Chris@64
|
121
|
Chris@64
|
122 QString identifier;
|
Chris@64
|
123
|
Chris@64
|
124 if (email != "") {
|
Chris@64
|
125 identifier = QString("%1 <%2>").arg(name).arg(email);
|
Chris@64
|
126 } else {
|
Chris@64
|
127 identifier = name;
|
Chris@64
|
128 }
|
Chris@64
|
129
|
Chris@64
|
130 return identifier;
|
Chris@64
|
131 }
|
Chris@64
|
132
|
jtkorhonen@0
|
133 void MainWindow::about()
|
jtkorhonen@0
|
134 {
|
Chris@97
|
135 QMessageBox::about(this, tr("About EasyMercurial"),
|
Chris@97
|
136 tr("<qt><h2>About EasyMercurial</h2>"
|
Chris@97
|
137 "<p>EasyMercurial is a simple user interface for the "
|
Chris@186
|
138 "Mercurial</a> version control system.</p>"
|
Chris@186
|
139 "<h4>Credits and Copyright</h4>"
|
Chris@186
|
140 "<p>Development carried out by Chris Cannam for "
|
Chris@186
|
141 "SoundSoftware.ac.uk at the Centre for Digital Music, "
|
Chris@186
|
142 "Queen Mary, University of London.</p>"
|
Chris@186
|
143 "<p>EasyMercurial is based on HgExplorer by "
|
Chris@186
|
144 "Jari Korhonen, with thanks.</p>"
|
Chris@186
|
145 "<p style=\"margin-left: 2em;\">"
|
Chris@186
|
146 "Copyright © 2010 Queen Mary, University of London.<br>"
|
Chris@186
|
147 "Copyright © 2010 Jari Korhonen.<br>"
|
Chris@186
|
148 "Copyright © 2010 Chris Cannam."
|
Chris@186
|
149 "</p>"
|
Chris@186
|
150 "<p style=\"margin-left: 2em;\">"
|
Chris@186
|
151 "This program requires Mercurial, by Matt Mackall and others.<br>"
|
Chris@186
|
152 "This program uses Qt by Nokia.<br>"
|
Chris@186
|
153 "This program uses Nuvola icons by David Vignoni.<br>"
|
Chris@186
|
154 "This program may use KDiff3 by Joachim Eibl.<br>"
|
Chris@186
|
155 "This program may use PyQt by River Bank Computing.<br>"
|
Chris@186
|
156 "Packaging for Mercurial and other dependencies on Windows is derived from TortoiseHg by Steve Borho and others."
|
Chris@186
|
157 "</p>"
|
Chris@186
|
158 "<h4>License</h4>"
|
Chris@186
|
159 "<p>This program is free software; you can redistribute it and/or "
|
Chris@97
|
160 "modify it under the terms of the GNU General Public License as "
|
Chris@97
|
161 "published by the Free Software Foundation; either version 2 of the "
|
Chris@97
|
162 "License, or (at your option) any later version. See the file "
|
Chris@186
|
163 "COPYING included with this distribution for more information.</p>"));
|
jtkorhonen@0
|
164 }
|
jtkorhonen@0
|
165
|
Chris@94
|
166 void MainWindow::clearSelections()
|
Chris@94
|
167 {
|
Chris@98
|
168 hgTabs->clearSelections();
|
Chris@94
|
169 }
|
jtkorhonen@0
|
170
|
Chris@120
|
171 void MainWindow::hgRefresh()
|
Chris@120
|
172 {
|
Chris@120
|
173 clearState();
|
Chris@120
|
174 hgQueryPaths();
|
Chris@120
|
175 }
|
Chris@120
|
176
|
Chris@175
|
177 void MainWindow::hgTest()
|
Chris@175
|
178 {
|
Chris@175
|
179 QStringList params;
|
Chris@175
|
180 params << "--version";
|
Chris@175
|
181 runner->requestAction(HgAction(ACT_TEST_HG, m_myDirPath, params));
|
Chris@175
|
182 }
|
Chris@175
|
183
|
jtkorhonen@0
|
184 void MainWindow::hgStat()
|
jtkorhonen@0
|
185 {
|
Chris@109
|
186 QStringList params;
|
Chris@109
|
187 params << "stat" << "-ardum";
|
Chris@153
|
188
|
Chris@163
|
189 lastStatOutput = "";
|
Chris@163
|
190
|
Chris@153
|
191 // annoyingly, hg stat actually modifies the working directory --
|
Chris@153
|
192 // it creates files called hg-checklink and hg-checkexec to test
|
Chris@153
|
193 // properties of the filesystem
|
Chris@153
|
194 if (fsWatcher) fsWatcher->blockSignals(true);
|
Chris@153
|
195
|
Chris@109
|
196 runner->requestAction(HgAction(ACT_STAT, workFolderPath, params));
|
jtkorhonen@0
|
197 }
|
jtkorhonen@0
|
198
|
Chris@109
|
199 void MainWindow::hgQueryPaths()
|
Chris@74
|
200 {
|
Chris@109
|
201 QStringList params;
|
Chris@109
|
202 params << "paths";
|
Chris@109
|
203 runner->requestAction(HgAction(ACT_QUERY_PATHS, workFolderPath, params));
|
Chris@74
|
204 }
|
Chris@74
|
205
|
Chris@109
|
206 void MainWindow::hgQueryBranch()
|
Chris@106
|
207 {
|
Chris@109
|
208 QStringList params;
|
Chris@109
|
209 params << "branch";
|
Chris@109
|
210 runner->requestAction(HgAction(ACT_QUERY_BRANCH, workFolderPath, params));
|
Chris@106
|
211 }
|
Chris@106
|
212
|
Chris@109
|
213 void MainWindow::hgQueryHeads()
|
jtkorhonen@0
|
214 {
|
Chris@109
|
215 QStringList params;
|
Chris@137
|
216 // On empty repos, "hg heads" will fail -- we don't care about
|
Chris@137
|
217 // that. Use --closed option so as to include closed branches;
|
Chris@137
|
218 // otherwise we'll be stuck if the user updates into one, and our
|
Chris@137
|
219 // incremental log will end up with spurious stuff in it because
|
Chris@137
|
220 // we won't be pruning at the ends of closed branches
|
Chris@137
|
221 params << "heads" << "--closed";
|
Chris@109
|
222 runner->requestAction(HgAction(ACT_QUERY_HEADS, workFolderPath, params));
|
jtkorhonen@0
|
223 }
|
jtkorhonen@0
|
224
|
jtkorhonen@0
|
225 void MainWindow::hgLog()
|
jtkorhonen@0
|
226 {
|
Chris@109
|
227 QStringList params;
|
Chris@109
|
228 params << "log";
|
Chris@109
|
229 params << "--template";
|
Chris@125
|
230 params << Changeset::getLogTemplate();
|
Chris@109
|
231
|
Chris@109
|
232 runner->requestAction(HgAction(ACT_LOG, workFolderPath, params));
|
Chris@109
|
233 }
|
Chris@109
|
234
|
Chris@150
|
235 void MainWindow::hgLogIncremental(QStringList prune)
|
Chris@120
|
236 {
|
Chris@120
|
237 QStringList params;
|
Chris@120
|
238 params << "log";
|
Chris@120
|
239
|
Chris@150
|
240 foreach (QString p, prune) {
|
Chris@153
|
241 params << "--prune" << Changeset::hashOf(p);
|
Chris@120
|
242 }
|
Chris@120
|
243
|
Chris@120
|
244 params << "--template";
|
Chris@125
|
245 params << Changeset::getLogTemplate();
|
Chris@120
|
246
|
Chris@120
|
247 runner->requestAction(HgAction(ACT_LOG_INCREMENTAL, workFolderPath, params));
|
Chris@120
|
248 }
|
Chris@109
|
249
|
Chris@109
|
250 void MainWindow::hgQueryParents()
|
Chris@109
|
251 {
|
Chris@109
|
252 QStringList params;
|
Chris@109
|
253 params << "parents";
|
Chris@109
|
254 runner->requestAction(HgAction(ACT_QUERY_PARENTS, workFolderPath, params));
|
Chris@109
|
255 }
|
Chris@109
|
256
|
Chris@109
|
257 void MainWindow::hgAnnotate()
|
Chris@109
|
258 {
|
Chris@109
|
259 QStringList params;
|
Chris@109
|
260 QString currentFile;//!!! = hgTabs -> getCurrentFileListLine();
|
Chris@109
|
261
|
Chris@109
|
262 if (!currentFile.isEmpty())
|
jtkorhonen@0
|
263 {
|
Chris@109
|
264 params << "annotate" << "--" << currentFile.mid(2); //Jump over status marker characters (e.g "M ")
|
jtkorhonen@0
|
265
|
Chris@109
|
266 runner->requestAction(HgAction(ACT_ANNOTATE, workFolderPath, params));
|
jtkorhonen@0
|
267 }
|
jtkorhonen@0
|
268 }
|
jtkorhonen@0
|
269
|
Chris@109
|
270 void MainWindow::hgResolveList()
|
Chris@109
|
271 {
|
Chris@109
|
272 QStringList params;
|
jtkorhonen@0
|
273
|
Chris@109
|
274 params << "resolve" << "--list";
|
Chris@109
|
275 runner->requestAction(HgAction(ACT_RESOLVE_LIST, workFolderPath, params));
|
Chris@109
|
276 }
|
Chris@109
|
277
|
Chris@109
|
278 void MainWindow::hgAdd()
|
jtkorhonen@0
|
279 {
|
Chris@109
|
280 QStringList params;
|
jtkorhonen@0
|
281
|
Chris@109
|
282 // hgExplorer permitted adding "all" files -- I'm not sure
|
Chris@109
|
283 // that one is a good idea, let's require the user to select
|
jtkorhonen@0
|
284
|
Chris@109
|
285 QStringList files = hgTabs->getSelectedAddableFiles();
|
Chris@109
|
286
|
Chris@109
|
287 if (!files.empty()) {
|
Chris@109
|
288 params << "add" << "--" << files;
|
Chris@109
|
289 runner->requestAction(HgAction(ACT_ADD, workFolderPath, params));
|
jtkorhonen@0
|
290 }
|
jtkorhonen@0
|
291 }
|
jtkorhonen@0
|
292
|
jtkorhonen@0
|
293
|
Chris@98
|
294 void MainWindow::hgRemove()
|
Chris@98
|
295 {
|
Chris@109
|
296 QStringList params;
|
Chris@98
|
297
|
Chris@109
|
298 QStringList files = hgTabs->getSelectedRemovableFiles();
|
Chris@98
|
299
|
Chris@109
|
300 //!!! todo: confirmation dialog (with file list in it) (or do we
|
Chris@109
|
301 // need that? all it does is move the files to the removed
|
Chris@109
|
302 // list... doesn't it?)
|
Chris@98
|
303
|
Chris@109
|
304 if (!files.empty()) {
|
Chris@109
|
305 params << "remove" << "--after" << "--force" << "--" << files;
|
Chris@109
|
306 runner->requestAction(HgAction(ACT_REMOVE, workFolderPath, params));
|
Chris@109
|
307 }
|
jtkorhonen@0
|
308 }
|
jtkorhonen@0
|
309
|
jtkorhonen@0
|
310 void MainWindow::hgCommit()
|
jtkorhonen@0
|
311 {
|
Chris@109
|
312 QStringList params;
|
Chris@109
|
313 QString comment;
|
Chris@94
|
314
|
Chris@157
|
315 if (justMerged) {
|
Chris@157
|
316 comment = mergeCommitComment;
|
Chris@157
|
317 }
|
Chris@157
|
318
|
Chris@109
|
319 QStringList files = hgTabs->getSelectedCommittableFiles();
|
Chris@127
|
320 QStringList reportFiles = files;
|
Chris@127
|
321 if (reportFiles.empty()) reportFiles = hgTabs->getAllCommittableFiles();
|
Chris@103
|
322
|
Chris@155
|
323 QString cf(tr("Commit files"));
|
Chris@155
|
324
|
Chris@109
|
325 if (ConfirmCommentDialog::confirmAndGetLongComment
|
Chris@109
|
326 (this,
|
Chris@155
|
327 cf,
|
Chris@155
|
328 tr("<h3>%1</h3><p>%2").arg(cf)
|
Chris@155
|
329 .arg(tr("You are about to commit the following files:")),
|
Chris@155
|
330 tr("<h3>%1</h3><p>%2").arg(cf)
|
Chris@168
|
331 .arg(tr("You are about to commit %n file(s).", "", reportFiles.size())),
|
Chris@127
|
332 reportFiles,
|
Chris@193
|
333 comment,
|
Chris@193
|
334 tr("Commit"))) {
|
Chris@103
|
335
|
Chris@157
|
336 if (!justMerged && !files.empty()) {
|
Chris@157
|
337 // User wants to commit selected file(s) (and this is not
|
Chris@157
|
338 // merge commit, which would fail if we selected files)
|
Chris@157
|
339 params << "commit" << "--message" << comment
|
Chris@157
|
340 << "--user" << getUserInfo() << "--" << files;
|
Chris@109
|
341 } else {
|
Chris@109
|
342 // Commit all changes
|
Chris@157
|
343 params << "commit" << "--message" << comment
|
Chris@157
|
344 << "--user" << getUserInfo();
|
jtkorhonen@0
|
345 }
|
Chris@109
|
346
|
Chris@109
|
347 runner->requestAction(HgAction(ACT_COMMIT, workFolderPath, params));
|
Chris@173
|
348 mergeCommitComment = "";
|
jtkorhonen@0
|
349 }
|
jtkorhonen@0
|
350 }
|
jtkorhonen@0
|
351
|
jtkorhonen@34
|
352 QString MainWindow::filterTag(QString tag)
|
jtkorhonen@34
|
353 {
|
jtkorhonen@34
|
354 for(int i = 0; i < tag.size(); i++)
|
jtkorhonen@34
|
355 {
|
jtkorhonen@34
|
356 if (tag[i].isLower() || tag[i].isUpper() || tag[i].isDigit() || (tag[i] == QChar('.')))
|
jtkorhonen@34
|
357 {
|
jtkorhonen@34
|
358 //ok
|
jtkorhonen@34
|
359 }
|
jtkorhonen@34
|
360 else
|
jtkorhonen@34
|
361 {
|
jtkorhonen@34
|
362 tag[i] = QChar('_');
|
jtkorhonen@34
|
363 }
|
jtkorhonen@34
|
364 }
|
jtkorhonen@34
|
365 return tag;
|
jtkorhonen@34
|
366 }
|
jtkorhonen@34
|
367
|
jtkorhonen@34
|
368
|
Chris@164
|
369 void MainWindow::hgTag(QString id)
|
jtkorhonen@34
|
370 {
|
Chris@109
|
371 QStringList params;
|
Chris@109
|
372 QString tag;
|
jtkorhonen@34
|
373
|
Chris@109
|
374 if (ConfirmCommentDialog::confirmAndGetShortComment
|
Chris@109
|
375 (this,
|
Chris@109
|
376 tr("Tag"),
|
Chris@109
|
377 tr("Enter tag:"),
|
Chris@193
|
378 tag,
|
Chris@193
|
379 tr("Add Tag"))) {
|
Chris@164
|
380 if (!tag.isEmpty()) {//!!! do something better if it is empty
|
Chris@164
|
381
|
Chris@164
|
382 params << "tag" << "--user" << getUserInfo();
|
Chris@164
|
383 params << "--rev" << Changeset::hashOf(id) << filterTag(tag);
|
Chris@109
|
384
|
Chris@109
|
385 runner->requestAction(HgAction(ACT_TAG, workFolderPath, params));
|
jtkorhonen@34
|
386 }
|
jtkorhonen@34
|
387 }
|
jtkorhonen@34
|
388 }
|
jtkorhonen@34
|
389
|
jtkorhonen@34
|
390
|
jtkorhonen@34
|
391 void MainWindow::hgIgnore()
|
jtkorhonen@34
|
392 {
|
Chris@109
|
393 QString hgIgnorePath;
|
Chris@109
|
394 QStringList params;
|
Chris@178
|
395
|
Chris@109
|
396 hgIgnorePath = workFolderPath;
|
Chris@178
|
397 hgIgnorePath += "/.hgignore";
|
Chris@109
|
398
|
Chris@109
|
399 params << hgIgnorePath;
|
Chris@179
|
400
|
Chris@179
|
401 QString editor = findEditorBinaryName();
|
Chris@112
|
402
|
Chris@179
|
403 if (editor == "") {
|
Chris@179
|
404 DEBUG << "Failed to find a text editor" << endl;
|
Chris@179
|
405 //!!! visible error!
|
Chris@179
|
406 return;
|
Chris@179
|
407 }
|
Chris@179
|
408
|
Chris@179
|
409 HgAction action(ACT_HG_IGNORE, workFolderPath, params);
|
Chris@179
|
410 action.executable = editor;
|
Chris@179
|
411
|
Chris@179
|
412 runner->requestAction(action);
|
Chris@179
|
413 }
|
Chris@179
|
414
|
Chris@179
|
415 QString MainWindow::findDiffBinaryName()
|
Chris@179
|
416 {
|
Chris@179
|
417 QSettings settings;
|
Chris@179
|
418 settings.beginGroup("Locations");
|
Chris@179
|
419 QString diff = settings.value("extdiffbinary", "").toString();
|
Chris@179
|
420 if (diff == "") {
|
Chris@179
|
421 QStringList bases;
|
Chris@179
|
422 bases << "opendiff" << "kompare" << "kdiff3" << "meld";
|
Chris@179
|
423 bool found = false;
|
Chris@179
|
424 foreach (QString base, bases) {
|
Chris@179
|
425 diff = findInPath(base, m_myDirPath, true);
|
Chris@179
|
426 if (diff != base && diff != base + ".exe") {
|
Chris@179
|
427 found = true;
|
Chris@179
|
428 break;
|
Chris@179
|
429 }
|
Chris@179
|
430 }
|
Chris@179
|
431 if (found) {
|
Chris@179
|
432 settings.setValue("extdiffbinary", diff);
|
Chris@179
|
433 } else {
|
Chris@179
|
434 diff = "";
|
Chris@179
|
435 }
|
Chris@179
|
436 }
|
Chris@179
|
437 return diff;
|
Chris@179
|
438 }
|
Chris@179
|
439
|
Chris@179
|
440 QString MainWindow::findMergeBinaryName()
|
Chris@179
|
441 {
|
Chris@179
|
442 QSettings settings;
|
Chris@179
|
443 settings.beginGroup("Locations");
|
Chris@195
|
444 QVariant v = settings.value("mergebinary");
|
Chris@195
|
445 if (v != QVariant()) {
|
Chris@195
|
446 return v.toString(); // even if empty: user may have specified no external tool
|
Chris@195
|
447 }
|
Chris@195
|
448 QString merge;
|
Chris@195
|
449 QStringList bases;
|
Chris@195
|
450 bases << "fmdiff3" << "meld" << "diffuse" << "kdiff3";
|
Chris@195
|
451 bool found = false;
|
Chris@195
|
452 foreach (QString base, bases) {
|
Chris@195
|
453 merge = findInPath(base, m_myDirPath, true);
|
Chris@195
|
454 if (merge != base && merge != base + ".exe") {
|
Chris@195
|
455 found = true;
|
Chris@195
|
456 break;
|
Chris@179
|
457 }
|
Chris@195
|
458 }
|
Chris@195
|
459 if (found) {
|
Chris@195
|
460 settings.setValue("mergebinary", merge);
|
Chris@195
|
461 } else {
|
Chris@195
|
462 merge = "";
|
Chris@179
|
463 }
|
Chris@179
|
464 return merge;
|
Chris@179
|
465 }
|
Chris@179
|
466
|
Chris@179
|
467 QString MainWindow::findEditorBinaryName()
|
Chris@179
|
468 {
|
Chris@178
|
469 QSettings settings;
|
Chris@178
|
470 settings.beginGroup("Locations");
|
Chris@178
|
471 QString editor = settings.value("editorbinary", "").toString();
|
Chris@178
|
472 if (editor == "") {
|
Chris@178
|
473 QStringList bases;
|
Chris@178
|
474 bases
|
Chris@178
|
475 #if defined Q_OS_WIN32
|
Chris@178
|
476 << "wordpad.exe"
|
Chris@178
|
477 << "C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe"
|
Chris@178
|
478 << "notepad.exe"
|
Chris@178
|
479 #elif defined Q_OS_MAC
|
Chris@178
|
480 << "textedit"
|
Chris@178
|
481 #else
|
Chris@178
|
482 << "gedit" << "kate"
|
Chris@178
|
483 #endif
|
Chris@178
|
484 ;
|
Chris@178
|
485 bool found = false;
|
Chris@178
|
486 foreach (QString base, bases) {
|
Chris@178
|
487 editor = findInPath(base, m_myDirPath, true);
|
Chris@178
|
488 if (editor != base && editor != base + ".exe") {
|
Chris@178
|
489 found = true;
|
Chris@178
|
490 break;
|
Chris@178
|
491 }
|
Chris@178
|
492 }
|
Chris@178
|
493 if (found) {
|
Chris@178
|
494 settings.setValue("editorbinary", editor);
|
Chris@178
|
495 } else {
|
Chris@178
|
496 editor = "";
|
Chris@178
|
497 }
|
Chris@178
|
498 }
|
Chris@179
|
499 return editor;
|
Chris@163
|
500 }
|
Chris@163
|
501
|
Chris@168
|
502 void MainWindow::hgShowSummary()
|
Chris@168
|
503 {
|
Chris@168
|
504 QStringList params;
|
Chris@168
|
505
|
Chris@168
|
506 params << "diff" << "--stat";
|
Chris@168
|
507
|
Chris@168
|
508 runner->requestAction(HgAction(ACT_DIFF_SUMMARY, workFolderPath, params));
|
Chris@168
|
509 }
|
Chris@168
|
510
|
jtkorhonen@0
|
511 void MainWindow::hgFolderDiff()
|
jtkorhonen@0
|
512 {
|
Chris@179
|
513 QString diff = findDiffBinaryName();
|
Chris@179
|
514 if (diff == "") return;
|
Chris@112
|
515
|
Chris@109
|
516 QStringList params;
|
jtkorhonen@0
|
517
|
Chris@112
|
518 // Diff parent against working folder (folder diff)
|
Chris@112
|
519
|
Chris@148
|
520 params << "--config" << "extensions.extdiff=" << "extdiff";
|
Chris@179
|
521 params << "--program" << diff;
|
Chris@109
|
522
|
Chris@153
|
523 params << hgTabs->getSelectedCommittableFiles(); // may be none: whole dir
|
Chris@153
|
524
|
Chris@109
|
525 runner->requestAction(HgAction(ACT_FOLDERDIFF, workFolderPath, params));
|
jtkorhonen@0
|
526 }
|
jtkorhonen@0
|
527
|
jtkorhonen@0
|
528
|
Chris@148
|
529 void MainWindow::hgDiffToCurrent(QString id)
|
jtkorhonen@0
|
530 {
|
Chris@179
|
531 QString diff = findDiffBinaryName();
|
Chris@179
|
532 if (diff == "") return;
|
Chris@163
|
533
|
Chris@148
|
534 QStringList params;
|
jtkorhonen@0
|
535
|
Chris@148
|
536 // Diff given revision against working folder
|
jtkorhonen@0
|
537
|
Chris@148
|
538 params << "--config" << "extensions.extdiff=" << "extdiff";
|
Chris@179
|
539 params << "--program" << diff;
|
Chris@153
|
540 params << "--rev" << Changeset::hashOf(id);
|
Chris@148
|
541
|
Chris@148
|
542 runner->requestAction(HgAction(ACT_FOLDERDIFF, workFolderPath, params));
|
jtkorhonen@0
|
543 }
|
jtkorhonen@0
|
544
|
jtkorhonen@0
|
545
|
Chris@148
|
546 void MainWindow::hgDiffToParent(QString child, QString parent)
|
Chris@148
|
547 {
|
Chris@179
|
548 QString diff = findDiffBinaryName();
|
Chris@179
|
549 if (diff == "") return;
|
Chris@163
|
550
|
Chris@148
|
551 QStringList params;
|
Chris@148
|
552
|
Chris@148
|
553 // Diff given revision against working folder
|
Chris@148
|
554
|
Chris@148
|
555 params << "--config" << "extensions.extdiff=" << "extdiff";
|
Chris@179
|
556 params << "--program" << diff;
|
Chris@153
|
557 params << "--rev" << Changeset::hashOf(parent)
|
Chris@153
|
558 << "--rev" << Changeset::hashOf(child);
|
Chris@148
|
559
|
Chris@148
|
560 runner->requestAction(HgAction(ACT_CHGSETDIFF, workFolderPath, params));
|
Chris@148
|
561 }
|
Chris@148
|
562
|
jtkorhonen@0
|
563
|
jtkorhonen@0
|
564 void MainWindow::hgUpdate()
|
jtkorhonen@0
|
565 {
|
Chris@109
|
566 QStringList params;
|
jtkorhonen@0
|
567
|
Chris@109
|
568 params << "update";
|
Chris@109
|
569
|
Chris@109
|
570 runner->requestAction(HgAction(ACT_UPDATE, workFolderPath, params));
|
jtkorhonen@0
|
571 }
|
jtkorhonen@0
|
572
|
jtkorhonen@0
|
573
|
Chris@148
|
574 void MainWindow::hgUpdateToRev(QString id)
|
jtkorhonen@0
|
575 {
|
Chris@148
|
576 QStringList params;
|
jtkorhonen@0
|
577
|
Chris@153
|
578 params << "update" << "--rev" << Changeset::hashOf(id) << "--check";
|
jtkorhonen@0
|
579
|
Chris@148
|
580 runner->requestAction(HgAction(ACT_UPDATE, workFolderPath, params));
|
jtkorhonen@0
|
581 }
|
jtkorhonen@0
|
582
|
jtkorhonen@0
|
583
|
jtkorhonen@0
|
584 void MainWindow::hgRevert()
|
jtkorhonen@0
|
585 {
|
Chris@109
|
586 QStringList params;
|
Chris@109
|
587 QString comment;
|
Chris@98
|
588
|
Chris@109
|
589 QStringList files = hgTabs->getSelectedRevertableFiles();
|
Chris@109
|
590 if (files.empty()) files = hgTabs->getAllRevertableFiles();
|
Chris@155
|
591
|
Chris@155
|
592 QString rf(tr("Revert files"));
|
Chris@109
|
593
|
Chris@109
|
594 if (ConfirmCommentDialog::confirmDangerousFilesAction
|
Chris@109
|
595 (this,
|
Chris@155
|
596 rf,
|
Chris@155
|
597 tr("<h3>%1</h3><p>%2").arg(rf)
|
Chris@155
|
598 .arg(tr("You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed:")),
|
Chris@155
|
599 tr("<h3>%1</h3><p>%2").arg(rf)
|
Chris@155
|
600 .arg(tr("You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.", "", files.size())),
|
Chris@193
|
601 files,
|
Chris@193
|
602 tr("Revert"))) {
|
Chris@163
|
603
|
Chris@163
|
604 lastRevertedFiles = files;
|
Chris@109
|
605
|
Chris@98
|
606 if (files.empty()) {
|
Chris@98
|
607 params << "revert" << "--no-backup";
|
Chris@98
|
608 } else {
|
Chris@164
|
609 params << "revert" << "--" << files;
|
Chris@98
|
610 }
|
Chris@163
|
611
|
Chris@163
|
612 //!!! This is problematic. If you've got an uncommitted
|
Chris@163
|
613 //!!! merge, you can't revert it without declaring which
|
Chris@163
|
614 //!!! parent of the merge you want to revert to (reasonably
|
Chris@163
|
615 //!!! enough). We're OK if we just did the merge in easyhg a
|
Chris@163
|
616 //!!! moment ago, because we have a record of which parent was
|
Chris@163
|
617 //!!! the target -- but if you exit and restart, we've lost
|
Chris@163
|
618 //!!! that record and it doesn't appear to be possible to get
|
Chris@163
|
619 //!!! it back from Hg. Even if you just switched from one
|
Chris@163
|
620 //!!! repo to another, the record is lost. What to do?
|
Chris@163
|
621
|
Chris@163
|
622 if (justMerged && mergeTargetRevision != "") {
|
Chris@163
|
623 params << "--rev" << mergeTargetRevision;
|
Chris@163
|
624 }
|
Chris@109
|
625
|
Chris@109
|
626 runner->requestAction(HgAction(ACT_REVERT, workFolderPath, params));
|
jtkorhonen@0
|
627 }
|
jtkorhonen@0
|
628 }
|
jtkorhonen@0
|
629
|
Chris@163
|
630
|
Chris@163
|
631 void MainWindow::hgMarkResolved(QStringList files)
|
Chris@163
|
632 {
|
Chris@163
|
633 QStringList params;
|
Chris@163
|
634
|
Chris@163
|
635 params << "resolve" << "--mark";
|
Chris@163
|
636
|
Chris@163
|
637 if (files.empty()) {
|
Chris@163
|
638 params << "--all";
|
Chris@163
|
639 } else {
|
Chris@164
|
640 params << "--" << files;
|
Chris@163
|
641 }
|
Chris@163
|
642
|
Chris@163
|
643 runner->requestAction(HgAction(ACT_RESOLVE_MARK, workFolderPath, params));
|
Chris@163
|
644 }
|
Chris@163
|
645
|
Chris@163
|
646
|
jtkorhonen@33
|
647 void MainWindow::hgRetryMerge()
|
jtkorhonen@33
|
648 {
|
Chris@109
|
649 QStringList params;
|
jtkorhonen@33
|
650
|
Chris@163
|
651 params << "resolve";
|
Chris@163
|
652
|
Chris@179
|
653 QString merge = findMergeBinaryName();
|
Chris@179
|
654 if (merge != "") {
|
Chris@179
|
655 params << "--tool" << merge;
|
Chris@163
|
656 }
|
Chris@163
|
657
|
Chris@163
|
658 QStringList files = hgTabs->getSelectedUnresolvedFiles();
|
Chris@163
|
659 if (files.empty()) {
|
Chris@163
|
660 params << "--all";
|
Chris@163
|
661 } else {
|
Chris@164
|
662 params << "--" << files;
|
Chris@163
|
663 }
|
Chris@163
|
664
|
Chris@109
|
665 runner->requestAction(HgAction(ACT_RETRY_MERGE, workFolderPath, params));
|
Chris@163
|
666
|
Chris@163
|
667 mergeCommitComment = tr("Merge");
|
jtkorhonen@33
|
668 }
|
jtkorhonen@33
|
669
|
jtkorhonen@33
|
670
|
jtkorhonen@0
|
671 void MainWindow::hgMerge()
|
jtkorhonen@0
|
672 {
|
Chris@163
|
673 if (hgTabs->canResolve()) {
|
Chris@163
|
674 hgRetryMerge();
|
Chris@163
|
675 return;
|
Chris@163
|
676 }
|
Chris@163
|
677
|
Chris@109
|
678 QStringList params;
|
jtkorhonen@0
|
679
|
Chris@109
|
680 params << "merge";
|
Chris@163
|
681
|
Chris@179
|
682 QString merge = findMergeBinaryName();
|
Chris@179
|
683 if (merge != "") {
|
Chris@179
|
684 params << "--tool" << merge;
|
Chris@163
|
685 }
|
Chris@163
|
686
|
Chris@163
|
687 if (currentParents.size() == 1) {
|
Chris@163
|
688 mergeTargetRevision = currentParents[0]->id();
|
Chris@163
|
689 }
|
Chris@163
|
690
|
Chris@109
|
691 runner->requestAction(HgAction(ACT_MERGE, workFolderPath, params));
|
Chris@157
|
692
|
Chris@157
|
693 mergeCommitComment = tr("Merge");
|
jtkorhonen@0
|
694 }
|
jtkorhonen@0
|
695
|
jtkorhonen@0
|
696
|
Chris@148
|
697 void MainWindow::hgMergeFrom(QString id)
|
Chris@148
|
698 {
|
Chris@148
|
699 QStringList params;
|
Chris@148
|
700
|
Chris@148
|
701 params << "merge";
|
Chris@153
|
702 params << "--rev" << Changeset::hashOf(id);
|
Chris@163
|
703
|
Chris@179
|
704 QString merge = findMergeBinaryName();
|
Chris@179
|
705 if (merge != "") {
|
Chris@179
|
706 params << "--tool" << merge;
|
Chris@163
|
707 }
|
Chris@148
|
708
|
Chris@148
|
709 runner->requestAction(HgAction(ACT_MERGE, workFolderPath, params));
|
Chris@157
|
710
|
Chris@157
|
711 mergeCommitComment = "";
|
Chris@157
|
712
|
Chris@157
|
713 foreach (Changeset *cs, currentHeads) {
|
Chris@157
|
714 if (cs->id() == id && !cs->isOnBranch(currentBranch)) {
|
Chris@157
|
715 if (cs->branch() == "" || cs->branch() == "default") {
|
Chris@157
|
716 mergeCommitComment = tr("Merge from the default branch");
|
Chris@157
|
717 } else {
|
Chris@157
|
718 mergeCommitComment = tr("Merge from branch \"%1\"").arg(cs->branch());
|
Chris@157
|
719 }
|
Chris@157
|
720 }
|
Chris@157
|
721 }
|
Chris@157
|
722
|
Chris@157
|
723 if (mergeCommitComment == "") {
|
Chris@157
|
724 mergeCommitComment = tr("Merge from %1").arg(id);
|
Chris@157
|
725 }
|
Chris@148
|
726 }
|
Chris@148
|
727
|
Chris@148
|
728
|
jtkorhonen@0
|
729 void MainWindow::hgCloneFromRemote()
|
jtkorhonen@0
|
730 {
|
Chris@109
|
731 QStringList params;
|
jtkorhonen@0
|
732
|
Chris@109
|
733 if (!QDir(workFolderPath).exists()) {
|
Chris@109
|
734 if (!QDir().mkpath(workFolderPath)) {
|
Chris@109
|
735 DEBUG << "hgCloneFromRemote: Failed to create target path "
|
Chris@109
|
736 << workFolderPath << endl;
|
Chris@109
|
737 //!!! report error
|
Chris@109
|
738 return;
|
Chris@104
|
739 }
|
Chris@109
|
740 }
|
Chris@104
|
741
|
Chris@109
|
742 params << "clone" << remoteRepoPath << workFolderPath;
|
Chris@109
|
743
|
Chris@109
|
744 hgTabs->setWorkFolderAndRepoNames(workFolderPath, remoteRepoPath);
|
Chris@113
|
745 hgTabs->updateWorkFolderFileList("");
|
jtkorhonen@0
|
746
|
Chris@109
|
747 runner->requestAction(HgAction(ACT_CLONEFROMREMOTE, workFolderPath, params));
|
jtkorhonen@0
|
748 }
|
jtkorhonen@0
|
749
|
jtkorhonen@0
|
750 void MainWindow::hgInit()
|
jtkorhonen@0
|
751 {
|
Chris@109
|
752 QStringList params;
|
jtkorhonen@0
|
753
|
Chris@109
|
754 params << "init";
|
Chris@109
|
755 params << workFolderPath;
|
jtkorhonen@0
|
756
|
Chris@109
|
757 runner->requestAction(HgAction(ACT_INIT, workFolderPath, params));
|
jtkorhonen@0
|
758 }
|
jtkorhonen@0
|
759
|
jtkorhonen@0
|
760 void MainWindow::hgIncoming()
|
jtkorhonen@0
|
761 {
|
Chris@109
|
762 QStringList params;
|
jtkorhonen@0
|
763
|
Chris@109
|
764 params << "incoming" << "--newest-first" << remoteRepoPath;
|
Chris@125
|
765 params << "--template" << Changeset::getLogTemplate();
|
jtkorhonen@0
|
766
|
Chris@109
|
767 runner->requestAction(HgAction(ACT_INCOMING, workFolderPath, params));
|
jtkorhonen@0
|
768 }
|
jtkorhonen@0
|
769
|
jtkorhonen@0
|
770 void MainWindow::hgPull()
|
jtkorhonen@0
|
771 {
|
Chris@193
|
772 if (ConfirmCommentDialog::confirm
|
Chris@126
|
773 (this, tr("Confirm pull"),
|
Chris@126
|
774 format3(tr("Confirm pull from remote repository"),
|
Chris@192
|
775 tr("You are about to pull changes from the following remote repository:"),
|
Chris@126
|
776 remoteRepoPath),
|
Chris@194
|
777 tr("Pull"))) {
|
jtkorhonen@0
|
778
|
Chris@126
|
779 QStringList params;
|
Chris@126
|
780 params << "pull" << remoteRepoPath;
|
Chris@126
|
781 runner->requestAction(HgAction(ACT_PULL, workFolderPath, params));
|
Chris@126
|
782 }
|
jtkorhonen@0
|
783 }
|
jtkorhonen@0
|
784
|
jtkorhonen@0
|
785 void MainWindow::hgPush()
|
jtkorhonen@0
|
786 {
|
Chris@193
|
787 if (ConfirmCommentDialog::confirm
|
Chris@126
|
788 (this, tr("Confirm push"),
|
Chris@126
|
789 format3(tr("Confirm push to remote repository"),
|
Chris@192
|
790 tr("You are about to push your changes to the following remote repository:"),
|
Chris@126
|
791 remoteRepoPath),
|
Chris@194
|
792 tr("Push"))) {
|
jtkorhonen@0
|
793
|
Chris@126
|
794 QStringList params;
|
Chris@154
|
795 params << "push" << "--new-branch" << remoteRepoPath;
|
Chris@126
|
796 runner->requestAction(HgAction(ACT_PUSH, workFolderPath, params));
|
Chris@126
|
797 }
|
jtkorhonen@0
|
798 }
|
jtkorhonen@0
|
799
|
Chris@182
|
800 QStringList MainWindow::listAllUpIpV4Addresses()
|
jtkorhonen@26
|
801 {
|
Chris@182
|
802 QStringList ret;
|
jtkorhonen@26
|
803 QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
|
jtkorhonen@26
|
804
|
Chris@182
|
805 for (int i = 0; i < ifaces.count(); i++) {
|
jtkorhonen@26
|
806 QNetworkInterface iface = ifaces.at(i);
|
Chris@182
|
807 if (iface.flags().testFlag(QNetworkInterface::IsUp)
|
Chris@182
|
808 && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
|
Chris@182
|
809 for (int j=0; j<iface.addressEntries().count(); j++) {
|
jtkorhonen@28
|
810 QHostAddress tmp = iface.addressEntries().at(j).ip();
|
Chris@182
|
811 if (QAbstractSocket::IPv4Protocol == tmp.protocol()) {
|
Chris@182
|
812 ret.push_back(tmp.toString());
|
jtkorhonen@24
|
813 }
|
jtkorhonen@24
|
814 }
|
jtkorhonen@22
|
815 }
|
jtkorhonen@17
|
816 }
|
jtkorhonen@28
|
817 return ret;
|
jtkorhonen@28
|
818 }
|
jtkorhonen@17
|
819
|
Chris@120
|
820 void MainWindow::clearState()
|
Chris@120
|
821 {
|
Chris@120
|
822 foreach (Changeset *cs, currentParents) delete cs;
|
Chris@120
|
823 currentParents.clear();
|
Chris@120
|
824 foreach (Changeset *cs, currentHeads) delete cs;
|
Chris@120
|
825 currentHeads.clear();
|
Chris@120
|
826 currentBranch = "";
|
Chris@163
|
827 lastStatOutput = "";
|
Chris@163
|
828 lastRevertedFiles.clear();
|
Chris@163
|
829 mergeTargetRevision = "";
|
Chris@163
|
830 mergeCommitComment = "";
|
Chris@173
|
831 stateUnknown = true;
|
Chris@120
|
832 needNewLog = true;
|
Chris@120
|
833 }
|
jtkorhonen@17
|
834
|
jtkorhonen@11
|
835 void MainWindow::hgServe()
|
jtkorhonen@11
|
836 {
|
Chris@109
|
837 QStringList params;
|
Chris@109
|
838 QString msg;
|
jtkorhonen@11
|
839
|
Chris@182
|
840 QStringList addrs = listAllUpIpV4Addresses();
|
Chris@182
|
841
|
Chris@182
|
842 if (addrs.empty()) {
|
Chris@182
|
843 QMessageBox::critical
|
Chris@182
|
844 (this, tr("Serve"), tr("Failed to identify an active IPv4 address"));
|
Chris@182
|
845 return;
|
Chris@182
|
846 }
|
Chris@182
|
847
|
Chris@182
|
848 //!!! should find available port as well
|
Chris@182
|
849
|
Chris@182
|
850 QTextStream ts(&msg);
|
Chris@182
|
851 ts << QString("<qt><p>%1</p>")
|
Chris@182
|
852 .arg(tr("Running temporary server at %n address(es):", "", addrs.size()));
|
Chris@182
|
853 foreach (QString addr, addrs) {
|
Chris@182
|
854 ts << QString("<pre> http://%1:8000</pre>").arg(xmlEncode(addr));
|
Chris@182
|
855 }
|
Chris@182
|
856 ts << tr("<p>Press Close to stop the server and return.</p>");
|
Chris@182
|
857 ts.flush();
|
Chris@182
|
858
|
Chris@109
|
859 params << "serve";
|
jtkorhonen@11
|
860
|
Chris@109
|
861 runner->requestAction(HgAction(ACT_SERVE, workFolderPath, params));
|
Chris@109
|
862
|
Chris@182
|
863 QMessageBox::information(this, tr("Serve"), msg, QMessageBox::Close);
|
Chris@182
|
864
|
Chris@182
|
865 runner->killCurrentActions();
|
jtkorhonen@11
|
866 }
|
jtkorhonen@11
|
867
|
Chris@64
|
868 void MainWindow::startupDialog()
|
Chris@64
|
869 {
|
Chris@64
|
870 StartupDialog *dlg = new StartupDialog(this);
|
Chris@65
|
871 if (dlg->exec()) firstStart = false;
|
Chris@64
|
872 }
|
jtkorhonen@11
|
873
|
Chris@69
|
874 void MainWindow::open()
|
Chris@69
|
875 {
|
Chris@86
|
876 bool done = false;
|
Chris@69
|
877
|
Chris@86
|
878 while (!done) {
|
Chris@69
|
879
|
Chris@86
|
880 MultiChoiceDialog *d = new MultiChoiceDialog
|
Chris@86
|
881 (tr("Open Repository"),
|
Chris@86
|
882 tr("<qt><big>What would you like to open?</big></qt>"),
|
Chris@86
|
883 this);
|
Chris@69
|
884
|
Chris@86
|
885 d->addChoice("remote",
|
Chris@86
|
886 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
|
Chris@86
|
887 tr("Open a remote Mercurial repository, by cloning from its URL into a local folder."),
|
Chris@86
|
888 MultiChoiceDialog::UrlToDirectoryArg);
|
Chris@69
|
889
|
Chris@86
|
890 d->addChoice("local",
|
Chris@86
|
891 tr("<qt><center><img src=\":images/hglogo-64.png\"><br>Local repository</center></qt>"),
|
Chris@86
|
892 tr("Open an existing local Mercurial repository."),
|
Chris@86
|
893 MultiChoiceDialog::DirectoryArg);
|
Chris@69
|
894
|
Chris@86
|
895 d->addChoice("init",
|
Chris@86
|
896 tr("<qt><center><img src=\":images/hdd_unmount-64.png\"><br>File folder</center></qt>"),
|
Chris@86
|
897 tr("Open a local folder, by creating a Mercurial repository in it."),
|
Chris@86
|
898 MultiChoiceDialog::DirectoryArg);
|
Chris@79
|
899
|
Chris@86
|
900 d->setCurrentChoice("local");
|
Chris@86
|
901
|
Chris@86
|
902 if (d->exec() == QDialog::Accepted) {
|
Chris@86
|
903
|
Chris@86
|
904 QString choice = d->getCurrentChoice();
|
Chris@86
|
905 QString arg = d->getArgument().trimmed();
|
Chris@86
|
906
|
Chris@86
|
907 bool result = false;
|
Chris@86
|
908
|
Chris@86
|
909 if (choice == "local") {
|
Chris@86
|
910 result = openLocal(arg);
|
Chris@86
|
911 } else if (choice == "remote") {
|
Chris@86
|
912 result = openRemote(arg, d->getAdditionalArgument().trimmed());
|
Chris@86
|
913 } else if (choice == "init") {
|
Chris@86
|
914 result = openInit(arg);
|
Chris@86
|
915 }
|
Chris@86
|
916
|
Chris@86
|
917 if (result) {
|
Chris@86
|
918 enableDisableActions();
|
Chris@120
|
919 clearState();
|
Chris@109
|
920 hgQueryPaths();
|
Chris@91
|
921 done = true;
|
Chris@91
|
922 }
|
Chris@86
|
923
|
Chris@86
|
924 } else {
|
Chris@86
|
925
|
Chris@86
|
926 // cancelled
|
Chris@86
|
927 done = true;
|
Chris@69
|
928 }
|
Chris@79
|
929
|
Chris@86
|
930 delete d;
|
Chris@69
|
931 }
|
Chris@69
|
932 }
|
Chris@69
|
933
|
Chris@182
|
934 void MainWindow::changeRemoteRepo()
|
Chris@182
|
935 {
|
Chris@183
|
936 // This will involve rewriting the local .hgrc
|
Chris@183
|
937
|
Chris@184
|
938 QDir hgDir(workFolderPath + "/.hg");
|
Chris@184
|
939 if (!hgDir.exists()) {
|
Chris@184
|
940 //!!! visible error!
|
Chris@184
|
941 return;
|
Chris@184
|
942 }
|
Chris@184
|
943
|
Chris@183
|
944 QFileInfo hgrc(workFolderPath + "/.hg/hgrc");
|
Chris@184
|
945 if (hgrc.exists() && !hgrc.isWritable()) {
|
Chris@183
|
946 //!!! visible error!
|
Chris@183
|
947 return;
|
Chris@183
|
948 }
|
Chris@183
|
949
|
Chris@183
|
950 MultiChoiceDialog *d = new MultiChoiceDialog
|
Chris@183
|
951 (tr("Change Remote Location"),
|
Chris@183
|
952 tr("<qt><big>Change the remote location</big></qt>"),
|
Chris@183
|
953 this);
|
Chris@183
|
954
|
Chris@183
|
955 d->addChoice("remote",
|
Chris@183
|
956 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
|
Chris@183
|
957 tr("Provide a new URL to use for push and pull actions from the current local repository."),
|
Chris@183
|
958 MultiChoiceDialog::UrlArg);
|
Chris@183
|
959
|
Chris@183
|
960 if (d->exec() == QDialog::Accepted) {
|
Chris@183
|
961 QSettings s(hgrc.canonicalFilePath(), QSettings::IniFormat);
|
Chris@183
|
962 s.beginGroup("paths");
|
Chris@183
|
963 s.setValue("default", d->getArgument());
|
Chris@186
|
964 stateUnknown = true;
|
Chris@183
|
965 hgQueryPaths();
|
Chris@183
|
966 }
|
Chris@183
|
967
|
Chris@183
|
968 delete d;
|
Chris@182
|
969 }
|
Chris@182
|
970
|
Chris@145
|
971 void MainWindow::open(QString local)
|
Chris@145
|
972 {
|
Chris@145
|
973 if (openLocal(local)) {
|
Chris@145
|
974 enableDisableActions();
|
Chris@145
|
975 clearState();
|
Chris@145
|
976 hgQueryPaths();
|
Chris@145
|
977 }
|
Chris@145
|
978 }
|
Chris@145
|
979
|
Chris@79
|
980 bool MainWindow::complainAboutFilePath(QString arg)
|
Chris@79
|
981 {
|
Chris@79
|
982 QMessageBox::critical
|
Chris@79
|
983 (this, tr("File chosen"),
|
Chris@84
|
984 tr("<qt><b>Folder required</b><br><br>You asked to open \"%1\".<br>This is a file; to open a repository, you need to choose a folder.</qt>").arg(xmlEncode(arg)));
|
Chris@79
|
985 return false;
|
Chris@79
|
986 }
|
Chris@79
|
987
|
Chris@79
|
988 bool MainWindow::complainAboutUnknownFolder(QString arg)
|
Chris@79
|
989 {
|
Chris@79
|
990 QMessageBox::critical
|
Chris@79
|
991 (this, tr("Folder does not exist"),
|
Chris@84
|
992 tr("<qt><b>Folder does not exist</b><br><br>You asked to open \"%1\".<br>This folder does not exist, and it cannot be created because its parent does not exist either.</qt>").arg(xmlEncode(arg)));
|
Chris@84
|
993 return false;
|
Chris@84
|
994 }
|
Chris@84
|
995
|
Chris@84
|
996 bool MainWindow::complainAboutInitInRepo(QString arg)
|
Chris@84
|
997 {
|
Chris@84
|
998 QMessageBox::critical
|
Chris@84
|
999 (this, tr("Path is in existing repository"),
|
Chris@84
|
1000 tr("<qt><b>Path is in an existing repository</b><br><br>You asked to initialise a repository at \"%1\".<br>This path is already inside an existing repository.</qt>").arg(xmlEncode(arg)));
|
Chris@84
|
1001 return false;
|
Chris@84
|
1002 }
|
Chris@84
|
1003
|
Chris@84
|
1004 bool MainWindow::complainAboutInitFile(QString arg)
|
Chris@84
|
1005 {
|
Chris@84
|
1006 QMessageBox::critical
|
Chris@84
|
1007 (this, tr("Path is a file"),
|
Chris@84
|
1008 tr("<qt><b>Path is a file</b><br><br>You asked to initialise a repository at \"%1\".<br>This is an existing file; it is only possible to initialise in folders.</qt>").arg(xmlEncode(arg)));
|
Chris@84
|
1009 return false;
|
Chris@84
|
1010 }
|
Chris@84
|
1011
|
Chris@84
|
1012 bool MainWindow::complainAboutCloneToExisting(QString arg)
|
Chris@84
|
1013 {
|
Chris@84
|
1014 QMessageBox::critical
|
Chris@84
|
1015 (this, tr("Path is in existing repository"),
|
Chris@84
|
1016 tr("<qt><b>Local path is in an existing repository</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This path is already inside an existing repository.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg)));
|
Chris@84
|
1017 return false;
|
Chris@84
|
1018 }
|
Chris@84
|
1019
|
Chris@84
|
1020 bool MainWindow::complainAboutCloneToFile(QString arg)
|
Chris@84
|
1021 {
|
Chris@84
|
1022 QMessageBox::critical
|
Chris@84
|
1023 (this, tr("Path is a file"),
|
Chris@84
|
1024 tr("<qt><b>Local path is a file</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This path is an existing file.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg)));
|
Chris@84
|
1025 return false;
|
Chris@84
|
1026 }
|
Chris@84
|
1027
|
Chris@84
|
1028 bool MainWindow::complainAboutCloneToExistingFolder(QString arg)
|
Chris@84
|
1029 {
|
Chris@84
|
1030 QMessageBox::critical
|
Chris@84
|
1031 (this, tr("Folder exists"),
|
Chris@84
|
1032 tr("<qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This is the path of an existing folder.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg)));
|
Chris@79
|
1033 return false;
|
Chris@79
|
1034 }
|
Chris@79
|
1035
|
Chris@79
|
1036 bool MainWindow::askToOpenParentRepo(QString arg, QString parent)
|
Chris@79
|
1037 {
|
Chris@79
|
1038 return (QMessageBox::question
|
Chris@84
|
1039 (this, tr("Path is inside a repository"),
|
Chris@86
|
1040 tr("<qt><b>Open the repository that contains this path?</b><br><br>You asked to open \"%1\".<br>This is not the root folder of a repository.<br>But it is inside a repository, whose root is at \"%2\". <br><br>Would you like to open that repository instead?</qt>")
|
Chris@79
|
1041 .arg(xmlEncode(arg)).arg(xmlEncode(parent)),
|
Chris@79
|
1042 QMessageBox::Ok | QMessageBox::Cancel,
|
Chris@79
|
1043 QMessageBox::Ok)
|
Chris@79
|
1044 == QMessageBox::Ok);
|
Chris@79
|
1045 }
|
Chris@79
|
1046
|
Chris@79
|
1047 bool MainWindow::askToInitExisting(QString arg)
|
Chris@79
|
1048 {
|
Chris@79
|
1049 return (QMessageBox::question
|
Chris@84
|
1050 (this, tr("Folder has no repository"),
|
Chris@84
|
1051 tr("<qt><b>Initialise a repository here?</b><br><br>You asked to open \"%1\".<br>This folder does not contain a Mercurial repository.<br><br>Would you like to initialise a repository here?</qt>")
|
Chris@79
|
1052 .arg(xmlEncode(arg)),
|
Chris@79
|
1053 QMessageBox::Ok | QMessageBox::Cancel,
|
Chris@79
|
1054 QMessageBox::Ok)
|
Chris@79
|
1055 == QMessageBox::Ok);
|
Chris@79
|
1056 }
|
Chris@79
|
1057
|
Chris@79
|
1058 bool MainWindow::askToInitNew(QString arg)
|
Chris@79
|
1059 {
|
Chris@79
|
1060 return (QMessageBox::question
|
Chris@84
|
1061 (this, tr("Folder does not exist"),
|
Chris@84
|
1062 tr("<qt><b>Initialise a new repository?</b><br><br>You asked to open \"%1\".<br>This folder does not yet exist.<br><br>Would you like to create the folder and initialise a new empty repository in it?</qt>")
|
Chris@84
|
1063 .arg(xmlEncode(arg)),
|
Chris@84
|
1064 QMessageBox::Ok | QMessageBox::Cancel,
|
Chris@84
|
1065 QMessageBox::Ok)
|
Chris@84
|
1066 == QMessageBox::Ok);
|
Chris@84
|
1067 }
|
Chris@84
|
1068
|
Chris@84
|
1069 bool MainWindow::askToOpenInsteadOfInit(QString arg)
|
Chris@84
|
1070 {
|
Chris@84
|
1071 return (QMessageBox::question
|
Chris@84
|
1072 (this, tr("Repository exists"),
|
Chris@84
|
1073 tr("<qt><b>Open existing repository?</b><br><br>You asked to initialise a new repository at \"%1\".<br>This folder already contains a repository. Would you like to open it?</qt>")
|
Chris@79
|
1074 .arg(xmlEncode(arg)),
|
Chris@79
|
1075 QMessageBox::Ok | QMessageBox::Cancel,
|
Chris@79
|
1076 QMessageBox::Ok)
|
Chris@79
|
1077 == QMessageBox::Ok);
|
Chris@79
|
1078 }
|
Chris@79
|
1079
|
Chris@79
|
1080 bool MainWindow::openLocal(QString local)
|
Chris@79
|
1081 {
|
Chris@79
|
1082 DEBUG << "open " << local << endl;
|
Chris@79
|
1083
|
Chris@79
|
1084 FolderStatus status = getFolderStatus(local);
|
Chris@79
|
1085 QString containing = getContainingRepoFolder(local);
|
Chris@79
|
1086
|
Chris@79
|
1087 switch (status) {
|
Chris@79
|
1088
|
Chris@79
|
1089 case FolderHasRepo:
|
Chris@79
|
1090 // fine
|
Chris@79
|
1091 break;
|
Chris@79
|
1092
|
Chris@79
|
1093 case FolderExists:
|
Chris@79
|
1094 if (containing != "") {
|
Chris@79
|
1095 if (!askToOpenParentRepo(local, containing)) return false;
|
Chris@84
|
1096 local = containing;
|
Chris@79
|
1097 } else {
|
Chris@86
|
1098 //!!! No -- this is likely to happen far more by accident
|
Chris@86
|
1099 // than because the user actually wanted to init something.
|
Chris@86
|
1100 // Don't ask, just politely reject.
|
Chris@79
|
1101 if (!askToInitExisting(local)) return false;
|
Chris@79
|
1102 return openInit(local);
|
Chris@79
|
1103 }
|
Chris@79
|
1104 break;
|
Chris@79
|
1105
|
Chris@79
|
1106 case FolderParentExists:
|
Chris@79
|
1107 if (containing != "") {
|
Chris@79
|
1108 if (!askToOpenParentRepo(local, containing)) return false;
|
Chris@84
|
1109 local = containing;
|
Chris@79
|
1110 } else {
|
Chris@79
|
1111 if (!askToInitNew(local)) return false;
|
Chris@79
|
1112 return openInit(local);
|
Chris@79
|
1113 }
|
Chris@79
|
1114 break;
|
Chris@79
|
1115
|
Chris@79
|
1116 case FolderUnknown:
|
Chris@84
|
1117 if (containing != "") {
|
Chris@84
|
1118 if (!askToOpenParentRepo(local, containing)) return false;
|
Chris@84
|
1119 local = containing;
|
Chris@84
|
1120 } else {
|
Chris@84
|
1121 return complainAboutUnknownFolder(local);
|
Chris@84
|
1122 }
|
Chris@84
|
1123 break;
|
Chris@79
|
1124
|
Chris@79
|
1125 case FolderIsFile:
|
Chris@79
|
1126 return complainAboutFilePath(local);
|
Chris@79
|
1127 }
|
Chris@79
|
1128
|
Chris@79
|
1129 workFolderPath = local;
|
Chris@79
|
1130 remoteRepoPath = "";
|
Chris@79
|
1131 return true;
|
Chris@79
|
1132 }
|
Chris@79
|
1133
|
Chris@79
|
1134 bool MainWindow::openRemote(QString remote, QString local)
|
Chris@79
|
1135 {
|
Chris@79
|
1136 DEBUG << "clone " << remote << " to " << local << endl;
|
Chris@84
|
1137
|
Chris@84
|
1138 FolderStatus status = getFolderStatus(local);
|
Chris@84
|
1139 QString containing = getContainingRepoFolder(local);
|
Chris@84
|
1140
|
Chris@84
|
1141 DEBUG << "status = " << status << ", containing = " << containing << endl;
|
Chris@84
|
1142
|
Chris@84
|
1143 if (status == FolderHasRepo || containing != "") {
|
Chris@84
|
1144 return complainAboutCloneToExisting(local);
|
Chris@84
|
1145 }
|
Chris@84
|
1146
|
Chris@84
|
1147 if (status == FolderIsFile) {
|
Chris@84
|
1148 return complainAboutCloneToFile(local);
|
Chris@84
|
1149 }
|
Chris@84
|
1150
|
Chris@84
|
1151 if (status == FolderUnknown) {
|
Chris@84
|
1152 return complainAboutUnknownFolder(local);
|
Chris@84
|
1153 }
|
Chris@84
|
1154
|
Chris@84
|
1155 if (status == FolderExists) {
|
Chris@84
|
1156 //!!! we can do better than this surely?
|
Chris@84
|
1157 return complainAboutCloneToExistingFolder(local);
|
Chris@84
|
1158 }
|
Chris@84
|
1159
|
Chris@84
|
1160 workFolderPath = local;
|
Chris@84
|
1161 remoteRepoPath = remote;
|
Chris@84
|
1162 hgCloneFromRemote();
|
Chris@84
|
1163
|
Chris@79
|
1164 return true;
|
Chris@79
|
1165 }
|
Chris@79
|
1166
|
Chris@84
|
1167 bool MainWindow::openInit(QString local)
|
Chris@79
|
1168 {
|
Chris@84
|
1169 DEBUG << "openInit " << local << endl;
|
Chris@84
|
1170
|
Chris@84
|
1171 FolderStatus status = getFolderStatus(local);
|
Chris@84
|
1172 QString containing = getContainingRepoFolder(local);
|
Chris@84
|
1173
|
Chris@84
|
1174 DEBUG << "status = " << status << ", containing = " << containing << endl;
|
Chris@84
|
1175
|
Chris@84
|
1176 if (status == FolderHasRepo) {
|
Chris@84
|
1177 if (!askToOpenInsteadOfInit(local)) return false;
|
Chris@84
|
1178 }
|
Chris@84
|
1179
|
Chris@84
|
1180 if (containing != "") {
|
Chris@84
|
1181 return complainAboutInitInRepo(local);
|
Chris@84
|
1182 }
|
Chris@84
|
1183
|
Chris@84
|
1184 if (status == FolderIsFile) {
|
Chris@84
|
1185 return complainAboutInitFile(local);
|
Chris@84
|
1186 }
|
Chris@84
|
1187
|
Chris@84
|
1188 if (status == FolderUnknown) {
|
Chris@84
|
1189 return complainAboutUnknownFolder(local);
|
Chris@84
|
1190 }
|
Chris@84
|
1191
|
Chris@84
|
1192 workFolderPath = local;
|
Chris@84
|
1193 remoteRepoPath = "";
|
Chris@84
|
1194 hgInit();
|
Chris@79
|
1195 return true;
|
Chris@79
|
1196 }
|
Chris@79
|
1197
|
jtkorhonen@0
|
1198 void MainWindow::settings()
|
jtkorhonen@0
|
1199 {
|
jtkorhonen@0
|
1200 SettingsDialog *settingsDlg = new SettingsDialog(this);
|
jtkorhonen@0
|
1201 settingsDlg->exec();
|
jtkorhonen@0
|
1202 }
|
jtkorhonen@0
|
1203
|
jtkorhonen@2
|
1204 #define STDOUT_NEEDS_BIG_WINDOW 512
|
jtkorhonen@2
|
1205 #define SMALL_WND_W 500
|
jtkorhonen@2
|
1206 #define SMALL_WND_H 300
|
jtkorhonen@2
|
1207
|
jtkorhonen@2
|
1208 #define BIG_WND_W 1024
|
jtkorhonen@2
|
1209 #define BIG_WND_H 768
|
jtkorhonen@2
|
1210
|
jtkorhonen@2
|
1211
|
jtkorhonen@2
|
1212 void MainWindow::presentLongStdoutToUser(QString stdo)
|
jtkorhonen@0
|
1213 {
|
jtkorhonen@2
|
1214 if (!stdo.isEmpty())
|
jtkorhonen@2
|
1215 {
|
jtkorhonen@2
|
1216 QDialog dlg;
|
jtkorhonen@0
|
1217
|
jtkorhonen@2
|
1218 if (stdo.length() > STDOUT_NEEDS_BIG_WINDOW)
|
jtkorhonen@2
|
1219 {
|
jtkorhonen@2
|
1220 dlg.setMinimumWidth(BIG_WND_W);
|
jtkorhonen@2
|
1221 dlg.setMinimumHeight(BIG_WND_H);
|
jtkorhonen@2
|
1222 }
|
jtkorhonen@2
|
1223 else
|
jtkorhonen@2
|
1224 {
|
jtkorhonen@2
|
1225 dlg.setMinimumWidth(SMALL_WND_W);
|
jtkorhonen@2
|
1226 dlg.setMinimumHeight(SMALL_WND_H);
|
jtkorhonen@2
|
1227 }
|
jtkorhonen@0
|
1228
|
jtkorhonen@2
|
1229 QVBoxLayout *box = new QVBoxLayout;
|
jtkorhonen@2
|
1230 QListWidget *list = new QListWidget;
|
jtkorhonen@2
|
1231 list-> addItems(stdo.split("\n"));
|
jtkorhonen@2
|
1232 QPushButton *btn = new QPushButton(tr("Ok"));
|
jtkorhonen@2
|
1233 connect(btn, SIGNAL(clicked()), &dlg, SLOT(accept()));
|
jtkorhonen@0
|
1234
|
jtkorhonen@2
|
1235 box -> addWidget(list);
|
jtkorhonen@2
|
1236 box -> addWidget(btn);
|
jtkorhonen@2
|
1237 dlg.setLayout(box);
|
jtkorhonen@2
|
1238
|
jtkorhonen@2
|
1239 dlg.exec();
|
jtkorhonen@2
|
1240 }
|
jtkorhonen@2
|
1241 else
|
jtkorhonen@2
|
1242 {
|
Chris@98
|
1243 QMessageBox::information(this, tr("EasyMercurial"), tr("Mercurial command did not return any output."));
|
jtkorhonen@2
|
1244 }
|
jtkorhonen@0
|
1245 }
|
jtkorhonen@0
|
1246
|
Chris@90
|
1247 void MainWindow::updateFileSystemWatcher()
|
Chris@90
|
1248 {
|
Chris@90
|
1249 delete fsWatcher;
|
Chris@90
|
1250 fsWatcher = new QFileSystemWatcher();
|
Chris@90
|
1251 std::deque<QString> pending;
|
Chris@90
|
1252 pending.push_back(workFolderPath);
|
Chris@90
|
1253 while (!pending.empty()) {
|
Chris@90
|
1254 QString path = pending.front();
|
Chris@90
|
1255 pending.pop_front();
|
Chris@90
|
1256 fsWatcher->addPath(path);
|
Chris@90
|
1257 DEBUG << "Added to file system watcher: " << path << endl;
|
Chris@90
|
1258 QDir d(path);
|
Chris@90
|
1259 if (d.exists()) {
|
Chris@115
|
1260 d.setFilter(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Readable);
|
Chris@90
|
1261 foreach (QString entry, d.entryList()) {
|
Chris@90
|
1262 if (entry == ".hg") continue;
|
Chris@90
|
1263 QString entryPath = d.absoluteFilePath(entry);
|
Chris@90
|
1264 pending.push_back(entryPath);
|
Chris@90
|
1265 }
|
Chris@90
|
1266 }
|
Chris@90
|
1267 }
|
Chris@90
|
1268 connect(fsWatcher, SIGNAL(directoryChanged(QString)),
|
Chris@90
|
1269 this, SLOT(fsDirectoryChanged(QString)));
|
Chris@90
|
1270 connect(fsWatcher, SIGNAL(fileChanged(QString)),
|
Chris@90
|
1271 this, SLOT(fsFileChanged(QString)));
|
Chris@90
|
1272 }
|
Chris@90
|
1273
|
Chris@122
|
1274 void MainWindow::fsDirectoryChanged(QString d)
|
Chris@90
|
1275 {
|
Chris@122
|
1276 DEBUG << "MainWindow::fsDirectoryChanged " << d << endl;
|
Chris@90
|
1277 hgStat();
|
Chris@90
|
1278 }
|
Chris@90
|
1279
|
Chris@122
|
1280 void MainWindow::fsFileChanged(QString f)
|
Chris@90
|
1281 {
|
Chris@122
|
1282 DEBUG << "MainWindow::fsFileChanged " << f << endl;
|
Chris@90
|
1283 hgStat();
|
Chris@90
|
1284 }
|
Chris@90
|
1285
|
Chris@125
|
1286 QString MainWindow::format3(QString head, QString intro, QString code)
|
Chris@125
|
1287 {
|
Chris@196
|
1288 code = xmlEncode(code).replace("\n", "<br>")
|
Chris@196
|
1289 #ifndef Q_OS_WIN32
|
Chris@196
|
1290 // The hard hyphen comes out funny on Windows
|
Chris@196
|
1291 .replace("-", "‑")
|
Chris@196
|
1292 #endif
|
Chris@196
|
1293 .replace(" ", " ");
|
Chris@125
|
1294 if (intro == "") {
|
Chris@168
|
1295 return QString("<qt><h3>%1</h3><p><code>%2</code></p>")
|
Chris@168
|
1296 .arg(head).arg(code);
|
Chris@126
|
1297 } else if (code == "") {
|
Chris@126
|
1298 return QString("<qt><h3>%1</h3><p>%2</p>")
|
Chris@126
|
1299 .arg(head).arg(intro);
|
Chris@125
|
1300 } else {
|
Chris@168
|
1301 return QString("<qt><h3>%1</h3><p>%2</p><p><code>%3</code></p>")
|
Chris@168
|
1302 .arg(head).arg(intro).arg(code);
|
Chris@125
|
1303 }
|
Chris@125
|
1304 }
|
Chris@125
|
1305
|
Chris@120
|
1306 void MainWindow::showIncoming(QString output)
|
Chris@120
|
1307 {
|
Chris@120
|
1308 runner->hide();
|
Chris@125
|
1309 IncomingDialog *d = new IncomingDialog(this, output);
|
Chris@125
|
1310 d->exec();
|
Chris@125
|
1311 delete d;
|
Chris@125
|
1312 }
|
Chris@125
|
1313
|
Chris@125
|
1314 int MainWindow::extractChangeCount(QString text)
|
Chris@125
|
1315 {
|
Chris@125
|
1316 QRegExp re("added (\\d+) ch\\w+ with (\\d+) ch\\w+ to (\\d+) f\\w+");
|
Chris@125
|
1317 if (re.indexIn(text) >= 0) {
|
Chris@125
|
1318 return re.cap(1).toInt();
|
Chris@125
|
1319 } else if (text.contains("no changes")) {
|
Chris@125
|
1320 return 0;
|
Chris@125
|
1321 } else {
|
Chris@125
|
1322 return -1; // unknown
|
Chris@125
|
1323 }
|
Chris@120
|
1324 }
|
Chris@120
|
1325
|
Chris@120
|
1326 void MainWindow::showPushResult(QString output)
|
Chris@120
|
1327 {
|
Chris@125
|
1328 QString report;
|
Chris@125
|
1329 int n = extractChangeCount(output);
|
Chris@125
|
1330 if (n > 0) {
|
Chris@125
|
1331 report = tr("Pushed %n changeset(s)", "", n);
|
Chris@125
|
1332 } else if (n == 0) {
|
Chris@125
|
1333 report = tr("No changes to push");
|
Chris@125
|
1334 } else {
|
Chris@125
|
1335 report = tr("Push complete");
|
Chris@125
|
1336 }
|
Chris@125
|
1337 report = format3(report, tr("The push command output was:"), output);
|
Chris@120
|
1338 runner->hide();
|
Chris@125
|
1339 QMessageBox::information(this, "Push complete", report);
|
Chris@120
|
1340 }
|
Chris@120
|
1341
|
Chris@120
|
1342 void MainWindow::showPullResult(QString output)
|
Chris@120
|
1343 {
|
Chris@125
|
1344 QString report;
|
Chris@125
|
1345 int n = extractChangeCount(output);
|
Chris@125
|
1346 if (n > 0) {
|
Chris@125
|
1347 report = tr("Pulled %n changeset(s)", "", n);
|
Chris@125
|
1348 } else if (n == 0) {
|
Chris@125
|
1349 report = tr("No changes to pull");
|
Chris@125
|
1350 } else {
|
Chris@125
|
1351 report = tr("Pull complete");
|
Chris@125
|
1352 }
|
Chris@125
|
1353 report = format3(report, tr("The pull command output was:"), output);
|
Chris@120
|
1354 runner->hide();
|
Chris@125
|
1355
|
Chris@125
|
1356 //!!! and something about updating
|
Chris@125
|
1357
|
Chris@125
|
1358 QMessageBox::information(this, "Pull complete", report);
|
Chris@120
|
1359 }
|
Chris@120
|
1360
|
Chris@174
|
1361 void MainWindow::reportNewRemoteHeads(QString output)
|
Chris@174
|
1362 {
|
Chris@174
|
1363 bool headsAreLocal = false;
|
Chris@174
|
1364
|
Chris@174
|
1365 if (currentParents.size() == 1) {
|
Chris@174
|
1366 int currentBranchHeads = 0;
|
Chris@174
|
1367 bool parentIsHead = false;
|
Chris@174
|
1368 Changeset *parent = currentParents[0];
|
Chris@174
|
1369 foreach (Changeset *head, currentHeads) {
|
Chris@174
|
1370 if (head->isOnBranch(currentBranch)) {
|
Chris@174
|
1371 ++currentBranchHeads;
|
Chris@174
|
1372 }
|
Chris@174
|
1373 if (parent->id() == head->id()) {
|
Chris@174
|
1374 parentIsHead = true;
|
Chris@174
|
1375 }
|
Chris@174
|
1376 }
|
Chris@174
|
1377 if (currentBranchHeads == 2 && parentIsHead) {
|
Chris@174
|
1378 headsAreLocal = true;
|
Chris@174
|
1379 }
|
Chris@174
|
1380 }
|
Chris@174
|
1381
|
Chris@174
|
1382 if (headsAreLocal) {
|
Chris@174
|
1383 QMessageBox::warning
|
Chris@174
|
1384 (this, tr("Push failed"),
|
Chris@174
|
1385 format3(tr("Push failed"),
|
Chris@174
|
1386 tr("Your local repository could not be pushed to the remote repository.<br><br>You may need to merge the changes locally first.<br><br>The output of the push command was:"),
|
Chris@174
|
1387 output));
|
Chris@174
|
1388 } else {
|
Chris@174
|
1389 QMessageBox::warning
|
Chris@174
|
1390 (this, tr("Push failed"),
|
Chris@174
|
1391 format3(tr("Push failed"),
|
Chris@174
|
1392 tr("Your local repository could not be pushed to the remote repository.<br><br>The remote repository may have been changed by someone else since you last pushed. Try pulling and merging their changes into your local repository first.<br><br>The output of the push command was:"),
|
Chris@174
|
1393 output));
|
Chris@174
|
1394 }
|
Chris@174
|
1395 }
|
Chris@174
|
1396
|
Chris@143
|
1397 void MainWindow::commandFailed(HgAction action, QString output)
|
Chris@62
|
1398 {
|
Chris@62
|
1399 DEBUG << "MainWindow::commandFailed" << endl;
|
Chris@74
|
1400
|
Chris@113
|
1401 // Some commands we just have to ignore bad return values from:
|
Chris@113
|
1402
|
Chris@113
|
1403 switch(action.action) {
|
Chris@113
|
1404 case ACT_NONE:
|
Chris@113
|
1405 // uh huh
|
Chris@113
|
1406 return;
|
Chris@175
|
1407 case ACT_TEST_HG:
|
Chris@175
|
1408 QMessageBox::warning
|
Chris@175
|
1409 (this, tr("Failed to run Mercurial"),
|
Chris@175
|
1410 format3(tr("Failed to run Mercurial"),
|
Chris@189
|
1411 tr("The Mercurial program either could not be found or failed to run.<br>This may indicate a problem with the Mercurial installation, or with the EasyHg interaction extension.<br><br>%1").arg(output == "" ? QString("") : tr("The test command said:")),
|
Chris@175
|
1412 output));
|
Chris@175
|
1413 settings();
|
Chris@175
|
1414 return;
|
Chris@113
|
1415 case ACT_INCOMING:
|
Chris@113
|
1416 // returns non-zero code if the check was successful but there
|
Chris@113
|
1417 // are no changes pending
|
Chris@143
|
1418 if (output.trimmed() == "") showIncoming("");
|
Chris@113
|
1419 return;
|
Chris@162
|
1420 case ACT_QUERY_HEADS:
|
Chris@162
|
1421 // fails if repo is empty; we don't care (if there's a genuine
|
Chris@162
|
1422 // problem, something else will fail too). Need to do this,
|
Chris@162
|
1423 // otherwise empty repo state will not be reflected properly
|
Chris@162
|
1424 // (since heads/log procedure never completes for empty repo)
|
Chris@162
|
1425 enableDisableActions();
|
Chris@162
|
1426 return;
|
Chris@113
|
1427 case ACT_FOLDERDIFF:
|
Chris@113
|
1428 case ACT_CHGSETDIFF:
|
Chris@113
|
1429 // external program, unlikely to be anything useful in stderr
|
Chris@113
|
1430 // and some return with failure codes when something as basic
|
Chris@113
|
1431 // as the user closing the window via the wm happens
|
Chris@113
|
1432 return;
|
Chris@174
|
1433 case ACT_PUSH:
|
Chris@174
|
1434 if (output.contains("creates new remote heads")) {
|
Chris@174
|
1435 reportNewRemoteHeads(output);
|
Chris@174
|
1436 return;
|
Chris@174
|
1437 }
|
Chris@113
|
1438 default:
|
Chris@114
|
1439 break;
|
Chris@113
|
1440 }
|
Chris@113
|
1441
|
Chris@113
|
1442 QString command = action.executable;
|
Chris@113
|
1443 if (command == "") command = "hg";
|
Chris@113
|
1444 foreach (QString arg, action.params) {
|
Chris@113
|
1445 command += " " + arg;
|
Chris@113
|
1446 }
|
Chris@113
|
1447
|
Chris@113
|
1448 QString message = tr("<qt><h3>Command failed</h3>"
|
Chris@113
|
1449 "<p>The following command failed:</p>"
|
Chris@113
|
1450 "<code>%1</code>"
|
Chris@113
|
1451 "%2</qt>")
|
Chris@113
|
1452 .arg(command)
|
Chris@143
|
1453 .arg((output.trimmed() != "") ?
|
Chris@113
|
1454 tr("<p>Its output said:</p><code>%1</code>")
|
Chris@143
|
1455 .arg(xmlEncode(output.left(800))
|
Chris@113
|
1456 .replace("\n", "<br>"))
|
Chris@113
|
1457 : "");
|
Chris@113
|
1458
|
Chris@113
|
1459 QMessageBox::warning(this, tr("Command failed"), message);
|
Chris@62
|
1460 }
|
Chris@62
|
1461
|
Chris@109
|
1462 void MainWindow::commandCompleted(HgAction completedAction, QString output)
|
jtkorhonen@0
|
1463 {
|
Chris@109
|
1464 HGACTIONS action = completedAction.action;
|
Chris@109
|
1465
|
Chris@109
|
1466 if (action == ACT_NONE) return;
|
Chris@109
|
1467
|
Chris@150
|
1468 bool headsChanged = false;
|
Chris@150
|
1469 QStringList oldHeadIds;
|
Chris@150
|
1470
|
Chris@150
|
1471 switch (action) {
|
Chris@109
|
1472
|
Chris@175
|
1473 case ACT_TEST_HG:
|
Chris@175
|
1474 break;
|
Chris@175
|
1475
|
Chris@109
|
1476 case ACT_QUERY_PATHS:
|
jtkorhonen@0
|
1477 {
|
Chris@109
|
1478 DEBUG << "stdout is " << output << endl;
|
Chris@109
|
1479 LogParser lp(output, "=");
|
Chris@109
|
1480 LogList ll = lp.parse();
|
Chris@109
|
1481 DEBUG << ll.size() << " results" << endl;
|
Chris@109
|
1482 if (!ll.empty()) {
|
Chris@109
|
1483 remoteRepoPath = lp.parse()[0]["default"].trimmed();
|
Chris@109
|
1484 DEBUG << "Set remote path to " << remoteRepoPath << endl;
|
Chris@109
|
1485 }
|
Chris@109
|
1486 MultiChoiceDialog::addRecentArgument("local", workFolderPath);
|
Chris@109
|
1487 MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
|
Chris@109
|
1488 hgTabs->setWorkFolderAndRepoNames(workFolderPath, remoteRepoPath);
|
Chris@109
|
1489 break;
|
Chris@109
|
1490 }
|
jtkorhonen@0
|
1491
|
Chris@109
|
1492 case ACT_QUERY_BRANCH:
|
Chris@109
|
1493 currentBranch = output.trimmed();
|
Chris@109
|
1494 break;
|
jtkorhonen@0
|
1495
|
Chris@109
|
1496 case ACT_STAT:
|
Chris@153
|
1497 if (fsWatcher) fsWatcher->blockSignals(false);
|
Chris@163
|
1498 lastStatOutput = output;
|
Chris@109
|
1499 updateFileSystemWatcher();
|
Chris@109
|
1500 break;
|
Chris@163
|
1501
|
Chris@163
|
1502 case ACT_RESOLVE_LIST:
|
Chris@163
|
1503 if (output != "") {
|
Chris@163
|
1504 // Remove lines beginning with R (they are resolved,
|
Chris@163
|
1505 // and the file stat parser treats R as removed)
|
Chris@163
|
1506 QStringList outList = output.split('\n');
|
Chris@163
|
1507 QStringList winnowed;
|
Chris@163
|
1508 foreach (QString line, outList) {
|
Chris@163
|
1509 if (!line.startsWith("R ")) winnowed.push_back(line);
|
Chris@163
|
1510 }
|
Chris@163
|
1511 output = winnowed.join("\n");
|
Chris@163
|
1512 }
|
Chris@163
|
1513 DEBUG << "lastStatOutput = " << lastStatOutput << endl;
|
Chris@163
|
1514 DEBUG << "output = " << output << endl;
|
Chris@163
|
1515 hgTabs->updateWorkFolderFileList(lastStatOutput + output);
|
Chris@163
|
1516 break;
|
Chris@163
|
1517
|
Chris@163
|
1518 case ACT_RESOLVE_MARK:
|
Chris@163
|
1519 shouldHgStat = true;
|
Chris@163
|
1520 break;
|
Chris@109
|
1521
|
Chris@109
|
1522 case ACT_INCOMING:
|
Chris@120
|
1523 showIncoming(output);
|
Chris@120
|
1524 break;
|
Chris@120
|
1525
|
Chris@109
|
1526 case ACT_ANNOTATE:
|
Chris@109
|
1527 presentLongStdoutToUser(output);
|
Chris@109
|
1528 shouldHgStat = true;
|
Chris@109
|
1529 break;
|
Chris@109
|
1530
|
Chris@109
|
1531 case ACT_PULL:
|
Chris@120
|
1532 showPullResult(output);
|
Chris@109
|
1533 shouldHgStat = true;
|
Chris@109
|
1534 break;
|
Chris@109
|
1535
|
Chris@109
|
1536 case ACT_PUSH:
|
Chris@120
|
1537 showPushResult(output);
|
Chris@109
|
1538 break;
|
Chris@109
|
1539
|
Chris@109
|
1540 case ACT_INIT:
|
Chris@109
|
1541 MultiChoiceDialog::addRecentArgument("init", workFolderPath);
|
Chris@109
|
1542 MultiChoiceDialog::addRecentArgument("local", workFolderPath);
|
Chris@109
|
1543 enableDisableActions();
|
Chris@109
|
1544 shouldHgStat = true;
|
Chris@109
|
1545 break;
|
Chris@109
|
1546
|
Chris@109
|
1547 case ACT_CLONEFROMREMOTE:
|
Chris@109
|
1548 MultiChoiceDialog::addRecentArgument("local", workFolderPath);
|
Chris@109
|
1549 MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
|
Chris@109
|
1550 MultiChoiceDialog::addRecentArgument("remote", workFolderPath, true);
|
Chris@109
|
1551 QMessageBox::information(this, "Clone", output);
|
Chris@109
|
1552 enableDisableActions();
|
Chris@109
|
1553 shouldHgStat = true;
|
Chris@109
|
1554 break;
|
Chris@109
|
1555
|
Chris@109
|
1556 case ACT_LOG:
|
Chris@120
|
1557 hgTabs->setNewLog(output);
|
Chris@120
|
1558 needNewLog = false;
|
Chris@120
|
1559 break;
|
Chris@120
|
1560
|
Chris@120
|
1561 case ACT_LOG_INCREMENTAL:
|
Chris@120
|
1562 hgTabs->addIncrementalLog(output);
|
Chris@109
|
1563 break;
|
Chris@109
|
1564
|
Chris@109
|
1565 case ACT_QUERY_PARENTS:
|
Chris@152
|
1566 {
|
Chris@109
|
1567 foreach (Changeset *cs, currentParents) delete cs;
|
Chris@109
|
1568 currentParents = Changeset::parseChangesets(output);
|
Chris@152
|
1569 QStringList parentIds = Changeset::getIds(currentParents);
|
Chris@153
|
1570 hgTabs->setCurrent(parentIds, currentBranch);
|
Chris@152
|
1571 }
|
Chris@109
|
1572 break;
|
Chris@109
|
1573
|
Chris@109
|
1574 case ACT_QUERY_HEADS:
|
Chris@150
|
1575 {
|
Chris@150
|
1576 oldHeadIds = Changeset::getIds(currentHeads);
|
Chris@150
|
1577 Changesets newHeads = Changeset::parseChangesets(output);
|
Chris@150
|
1578 QStringList newHeadIds = Changeset::getIds(newHeads);
|
Chris@150
|
1579 if (oldHeadIds != newHeadIds) {
|
Chris@150
|
1580 DEBUG << "Heads changed, will prompt an incremental log if appropriate" << endl;
|
Chris@150
|
1581 headsChanged = true;
|
Chris@150
|
1582 foreach (Changeset *cs, currentHeads) delete cs;
|
Chris@150
|
1583 currentHeads = newHeads;
|
Chris@150
|
1584 }
|
Chris@150
|
1585 }
|
Chris@109
|
1586 break;
|
Chris@130
|
1587
|
Chris@130
|
1588 case ACT_COMMIT:
|
Chris@130
|
1589 hgTabs->clearSelections();
|
Chris@163
|
1590 justMerged = false;
|
Chris@130
|
1591 shouldHgStat = true;
|
Chris@130
|
1592 break;
|
Chris@163
|
1593
|
Chris@163
|
1594 case ACT_REVERT:
|
Chris@163
|
1595 hgMarkResolved(lastRevertedFiles);
|
Chris@163
|
1596 justMerged = false;
|
Chris@163
|
1597 break;
|
Chris@109
|
1598
|
Chris@109
|
1599 case ACT_REMOVE:
|
Chris@109
|
1600 case ACT_ADD:
|
Chris@116
|
1601 hgTabs->clearSelections();
|
Chris@116
|
1602 shouldHgStat = true;
|
Chris@116
|
1603 break;
|
Chris@116
|
1604
|
Chris@164
|
1605 case ACT_TAG:
|
Chris@164
|
1606 needNewLog = true;
|
Chris@164
|
1607 shouldHgStat = true;
|
Chris@164
|
1608 break;
|
Chris@164
|
1609
|
Chris@168
|
1610 case ACT_DIFF_SUMMARY:
|
Chris@168
|
1611 QMessageBox::information(this, tr("Change summary"),
|
Chris@168
|
1612 format3(tr("Summary of uncommitted changes"),
|
Chris@168
|
1613 "",
|
Chris@168
|
1614 output));
|
Chris@168
|
1615 break;
|
Chris@168
|
1616
|
Chris@109
|
1617 case ACT_FOLDERDIFF:
|
Chris@109
|
1618 case ACT_CHGSETDIFF:
|
Chris@109
|
1619 case ACT_SERVE:
|
Chris@109
|
1620 case ACT_HG_IGNORE:
|
Chris@109
|
1621 shouldHgStat = true;
|
Chris@109
|
1622 break;
|
Chris@109
|
1623
|
Chris@109
|
1624 case ACT_UPDATE:
|
Chris@162
|
1625 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output)));
|
Chris@109
|
1626 shouldHgStat = true;
|
Chris@109
|
1627 break;
|
Chris@109
|
1628
|
Chris@109
|
1629 case ACT_MERGE:
|
Chris@196
|
1630 //!!! use format3?
|
Chris@196
|
1631 QMessageBox::information(this, tr("Merge"), tr("<qt><h3>Merge successful</h3><pre>%1</pre>").arg(xmlEncode(output)));
|
Chris@109
|
1632 shouldHgStat = true;
|
Chris@109
|
1633 justMerged = true;
|
Chris@109
|
1634 break;
|
Chris@109
|
1635
|
Chris@109
|
1636 case ACT_RETRY_MERGE:
|
Chris@163
|
1637 QMessageBox::information(this, tr("Resolved"),
|
Chris@163
|
1638 tr("<qt><h3>Merge resolved</h3><p>Merge resolved successfully.</p>"));
|
Chris@109
|
1639 shouldHgStat = true;
|
Chris@109
|
1640 justMerged = true;
|
Chris@109
|
1641 break;
|
Chris@109
|
1642
|
Chris@109
|
1643 default:
|
Chris@109
|
1644 break;
|
Chris@109
|
1645 }
|
Chris@108
|
1646
|
Chris@121
|
1647 // Sequence when no full log required:
|
Chris@163
|
1648 // paths -> branch -> stat -> resolve-list -> heads ->
|
Chris@150
|
1649 // incremental-log (only if heads changed) -> parents
|
Chris@150
|
1650 //
|
Chris@121
|
1651 // Sequence when full log required:
|
Chris@163
|
1652 // paths -> branch -> stat -> resolve-list -> heads -> parents -> log
|
Chris@150
|
1653 //
|
Chris@150
|
1654 // Note we want to call enableDisableActions only once, at the end
|
Chris@150
|
1655 // of whichever sequence is in use.
|
Chris@150
|
1656
|
Chris@156
|
1657 bool noMore = false;
|
Chris@156
|
1658
|
Chris@150
|
1659 switch (action) {
|
Chris@175
|
1660
|
Chris@175
|
1661 case ACT_TEST_HG:
|
Chris@175
|
1662 hgQueryPaths();
|
Chris@175
|
1663 break;
|
Chris@150
|
1664
|
Chris@150
|
1665 case ACT_QUERY_PATHS:
|
Chris@109
|
1666 hgQueryBranch();
|
Chris@150
|
1667 break;
|
Chris@150
|
1668
|
Chris@150
|
1669 case ACT_QUERY_BRANCH:
|
Chris@109
|
1670 hgStat();
|
Chris@150
|
1671 break;
|
Chris@150
|
1672
|
Chris@150
|
1673 case ACT_STAT:
|
Chris@163
|
1674 hgResolveList();
|
Chris@163
|
1675 break;
|
Chris@163
|
1676
|
Chris@163
|
1677 case ACT_RESOLVE_LIST:
|
Chris@150
|
1678 hgQueryHeads();
|
Chris@150
|
1679 break;
|
Chris@150
|
1680
|
Chris@150
|
1681 case ACT_QUERY_HEADS:
|
Chris@150
|
1682 if (headsChanged && !needNewLog) {
|
Chris@150
|
1683 hgLogIncremental(oldHeadIds);
|
Chris@121
|
1684 } else {
|
Chris@150
|
1685 hgQueryParents();
|
Chris@121
|
1686 }
|
Chris@150
|
1687 break;
|
Chris@150
|
1688
|
Chris@150
|
1689 case ACT_LOG_INCREMENTAL:
|
Chris@109
|
1690 hgQueryParents();
|
Chris@150
|
1691 break;
|
Chris@150
|
1692
|
Chris@150
|
1693 case ACT_QUERY_PARENTS:
|
Chris@120
|
1694 if (needNewLog) {
|
Chris@120
|
1695 hgLog();
|
Chris@150
|
1696 } else {
|
Chris@150
|
1697 // we're done
|
Chris@156
|
1698 noMore = true;
|
Chris@120
|
1699 }
|
Chris@150
|
1700 break;
|
Chris@150
|
1701
|
Chris@150
|
1702 case ACT_LOG:
|
Chris@150
|
1703 // we're done
|
Chris@156
|
1704 noMore = true;
|
Chris@150
|
1705
|
Chris@150
|
1706 default:
|
Chris@109
|
1707 if (shouldHgStat) {
|
Chris@163
|
1708 shouldHgStat = false;
|
Chris@109
|
1709 hgQueryPaths();
|
Chris@150
|
1710 } else {
|
Chris@156
|
1711 noMore = true;
|
jtkorhonen@0
|
1712 }
|
Chris@150
|
1713 break;
|
Chris@150
|
1714 }
|
Chris@156
|
1715
|
Chris@156
|
1716 if (noMore) {
|
Chris@173
|
1717 stateUnknown = false;
|
Chris@156
|
1718 enableDisableActions();
|
Chris@156
|
1719 hgTabs->updateHistory();
|
Chris@156
|
1720 }
|
jtkorhonen@0
|
1721 }
|
jtkorhonen@0
|
1722
|
jtkorhonen@0
|
1723 void MainWindow::connectActions()
|
jtkorhonen@0
|
1724 {
|
jtkorhonen@0
|
1725 connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
|
jtkorhonen@0
|
1726 connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
|
jtkorhonen@0
|
1727
|
Chris@120
|
1728 connect(hgRefreshAct, SIGNAL(triggered()), this, SLOT(hgRefresh()));
|
jtkorhonen@0
|
1729 connect(hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
|
jtkorhonen@0
|
1730 connect(hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
|
jtkorhonen@0
|
1731 connect(hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
|
jtkorhonen@0
|
1732 connect(hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
|
jtkorhonen@0
|
1733 connect(hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
|
jtkorhonen@0
|
1734 connect(hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
|
jtkorhonen@0
|
1735 connect(hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
|
jtkorhonen@34
|
1736 connect(hgIgnoreAct, SIGNAL(triggered()), this, SLOT(hgIgnore()));
|
jtkorhonen@0
|
1737
|
jtkorhonen@0
|
1738 connect(settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
|
Chris@69
|
1739 connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
|
Chris@182
|
1740 connect(changeRemoteRepoAct, SIGNAL(triggered()), this, SLOT(changeRemoteRepo()));
|
jtkorhonen@0
|
1741
|
jtkorhonen@0
|
1742 connect(hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
|
jtkorhonen@0
|
1743 connect(hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
|
jtkorhonen@0
|
1744 connect(hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
|
jtkorhonen@0
|
1745
|
jtkorhonen@0
|
1746 connect(hgAnnotateAct, SIGNAL(triggered()), this, SLOT(hgAnnotate()));
|
jtkorhonen@11
|
1747 connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
|
Chris@94
|
1748 connect(clearSelectionsAct, SIGNAL(triggered()), this, SLOT(clearSelections()));
|
jtkorhonen@0
|
1749 }
|
Chris@141
|
1750
|
Chris@141
|
1751 void MainWindow::connectTabsSignals()
|
Chris@141
|
1752 {
|
Chris@141
|
1753 connect(hgTabs, SIGNAL(commit()),
|
Chris@141
|
1754 this, SLOT(hgCommit()));
|
Chris@141
|
1755
|
Chris@141
|
1756 connect(hgTabs, SIGNAL(revert()),
|
Chris@141
|
1757 this, SLOT(hgRevert()));
|
Chris@141
|
1758
|
Chris@141
|
1759 connect(hgTabs, SIGNAL(diffWorkingFolder()),
|
Chris@141
|
1760 this, SLOT(hgFolderDiff()));
|
Chris@168
|
1761
|
Chris@168
|
1762 connect(hgTabs, SIGNAL(showSummary()),
|
Chris@168
|
1763 this, SLOT(hgShowSummary()));
|
Chris@148
|
1764
|
Chris@141
|
1765 connect(hgTabs, SIGNAL(updateTo(QString)),
|
Chris@148
|
1766 this, SLOT(hgUpdateToRev(QString)));
|
Chris@141
|
1767
|
Chris@141
|
1768 connect(hgTabs, SIGNAL(diffToCurrent(QString)),
|
Chris@148
|
1769 this, SLOT(hgDiffToCurrent(QString)));
|
Chris@141
|
1770
|
Chris@148
|
1771 connect(hgTabs, SIGNAL(diffToParent(QString, QString)),
|
Chris@148
|
1772 this, SLOT(hgDiffToParent(QString, QString)));
|
Chris@141
|
1773
|
Chris@141
|
1774 connect(hgTabs, SIGNAL(mergeFrom(QString)),
|
Chris@148
|
1775 this, SLOT(hgMergeFrom(QString)));
|
Chris@164
|
1776
|
Chris@141
|
1777 connect(hgTabs, SIGNAL(tag(QString)),
|
Chris@148
|
1778 this, SLOT(hgTag(QString)));
|
Chris@141
|
1779 }
|
Chris@141
|
1780
|
jtkorhonen@0
|
1781 void MainWindow::enableDisableActions()
|
jtkorhonen@0
|
1782 {
|
Chris@90
|
1783 DEBUG << "MainWindow::enableDisableActions" << endl;
|
Chris@90
|
1784
|
Chris@115
|
1785 //!!! should also do things like set the status texts for the
|
Chris@115
|
1786 //!!! actions appropriately by context
|
Chris@115
|
1787
|
jtkorhonen@0
|
1788 QDir localRepoDir;
|
jtkorhonen@0
|
1789 QDir workFolderDir;
|
Chris@145
|
1790 bool workFolderExist = true;
|
Chris@145
|
1791 bool localRepoExist = true;
|
jtkorhonen@0
|
1792
|
jtkorhonen@0
|
1793 remoteRepoActionsEnabled = true;
|
Chris@90
|
1794 if (remoteRepoPath.isEmpty()) {
|
jtkorhonen@0
|
1795 remoteRepoActionsEnabled = false;
|
jtkorhonen@0
|
1796 }
|
jtkorhonen@0
|
1797
|
jtkorhonen@0
|
1798 localRepoActionsEnabled = true;
|
Chris@90
|
1799 if (workFolderPath.isEmpty()) {
|
jtkorhonen@0
|
1800 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1801 workFolderExist = false;
|
jtkorhonen@0
|
1802 }
|
jtkorhonen@0
|
1803
|
Chris@90
|
1804 if (!workFolderDir.exists(workFolderPath)) {
|
jtkorhonen@0
|
1805 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1806 workFolderExist = false;
|
Chris@90
|
1807 } else {
|
jtkorhonen@0
|
1808 workFolderExist = true;
|
jtkorhonen@0
|
1809 }
|
jtkorhonen@0
|
1810
|
Chris@112
|
1811 if (!localRepoDir.exists(workFolderPath + "/.hg")) {
|
jtkorhonen@0
|
1812 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1813 localRepoExist = false;
|
jtkorhonen@0
|
1814 }
|
jtkorhonen@0
|
1815
|
jtkorhonen@0
|
1816 hgIncomingAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1817 hgPullAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1818 hgPushAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
Chris@169
|
1819
|
Chris@179
|
1820 bool haveDiff = false;
|
Chris@179
|
1821 QSettings settings;
|
Chris@179
|
1822 settings.beginGroup("Locations");
|
Chris@179
|
1823 if (settings.value("extdiffbinary", "").toString() != "") {
|
Chris@179
|
1824 haveDiff = true;
|
Chris@179
|
1825 }
|
Chris@179
|
1826 settings.endGroup();
|
Chris@112
|
1827
|
Chris@120
|
1828 hgRefreshAct -> setEnabled(localRepoActionsEnabled);
|
Chris@112
|
1829 hgFolderDiffAct -> setEnabled(localRepoActionsEnabled && haveDiff);
|
jtkorhonen@0
|
1830 hgRevertAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1831 hgAddAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1832 hgRemoveAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1833 hgUpdateAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1834 hgCommitAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1835 hgMergeAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@2
|
1836 hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@11
|
1837 hgServeAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@34
|
1838 hgIgnoreAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1839
|
Chris@90
|
1840 DEBUG << "localRepoActionsEnabled = " << localRepoActionsEnabled << endl;
|
Chris@98
|
1841 DEBUG << "canCommit = " << hgTabs->canCommit() << endl;
|
Chris@90
|
1842
|
Chris@98
|
1843 hgAddAct->setEnabled(localRepoActionsEnabled && hgTabs->canAdd());
|
Chris@98
|
1844 hgRemoveAct->setEnabled(localRepoActionsEnabled && hgTabs->canRemove());
|
Chris@98
|
1845 hgCommitAct->setEnabled(localRepoActionsEnabled && hgTabs->canCommit());
|
Chris@163
|
1846 hgRevertAct->setEnabled(localRepoActionsEnabled && hgTabs->canRevert());
|
Chris@163
|
1847 hgFolderDiffAct->setEnabled(localRepoActionsEnabled && hgTabs->canDiff());
|
Chris@90
|
1848
|
Chris@108
|
1849 // A default merge makes sense if:
|
Chris@108
|
1850 // * there is only one parent (if there are two, we have an uncommitted merge) and
|
Chris@108
|
1851 // * there are exactly two heads that have the same branch as the current branch and
|
Chris@108
|
1852 // * our parent is one of those heads
|
Chris@108
|
1853 //
|
Chris@108
|
1854 // A default update makes sense if:
|
Chris@108
|
1855 // * there is only one parent and
|
Chris@108
|
1856 // * the parent is not one of the current heads
|
Chris@156
|
1857
|
Chris@108
|
1858 bool canMerge = false;
|
Chris@108
|
1859 bool canUpdate = false;
|
Chris@156
|
1860 bool haveMerge = false;
|
Chris@162
|
1861 bool emptyRepo = false;
|
Chris@156
|
1862 int currentBranchHeads = 0;
|
Chris@156
|
1863
|
Chris@108
|
1864 if (currentParents.size() == 1) {
|
Chris@156
|
1865 bool parentIsHead = false;
|
Chris@108
|
1866 Changeset *parent = currentParents[0];
|
Chris@108
|
1867 foreach (Changeset *head, currentHeads) {
|
Chris@108
|
1868 DEBUG << "head branch " << head->branch() << ", current branch " << currentBranch << endl;
|
Chris@108
|
1869 if (head->isOnBranch(currentBranch)) {
|
Chris@108
|
1870 ++currentBranchHeads;
|
Chris@108
|
1871 if (parent->id() == head->id()) {
|
Chris@108
|
1872 parentIsHead = true;
|
Chris@108
|
1873 }
|
Chris@108
|
1874 }
|
Chris@108
|
1875 }
|
Chris@108
|
1876 if (currentBranchHeads == 2 && parentIsHead) {
|
Chris@108
|
1877 canMerge = true;
|
Chris@108
|
1878 }
|
Chris@108
|
1879 if (!parentIsHead) {
|
Chris@108
|
1880 canUpdate = true;
|
Chris@108
|
1881 DEBUG << "parent id = " << parent->id() << endl;
|
Chris@108
|
1882 DEBUG << " head ids "<<endl;
|
Chris@108
|
1883 foreach (Changeset *h, currentHeads) {
|
Chris@108
|
1884 DEBUG << "head id = " << h->id() << endl;
|
Chris@108
|
1885 }
|
Chris@108
|
1886 }
|
Chris@162
|
1887 } else if (currentParents.size() == 0) {
|
Chris@162
|
1888 emptyRepo = true;
|
Chris@156
|
1889 } else {
|
Chris@156
|
1890 haveMerge = true;
|
Chris@163
|
1891 justMerged = true;
|
Chris@108
|
1892 }
|
Chris@156
|
1893
|
Chris@163
|
1894 hgMergeAct->setEnabled(localRepoActionsEnabled &&
|
Chris@163
|
1895 (canMerge || hgTabs->canResolve()));
|
Chris@163
|
1896 hgUpdateAct->setEnabled(localRepoActionsEnabled &&
|
Chris@172
|
1897 (canUpdate && !hgTabs->haveChangesToCommit()));
|
Chris@115
|
1898
|
Chris@115
|
1899 // Set the state field on the file status widget
|
Chris@115
|
1900
|
Chris@115
|
1901 QString branchText;
|
Chris@115
|
1902 if (currentBranch == "" || currentBranch == "default") {
|
Chris@115
|
1903 branchText = tr("the default branch");
|
Chris@115
|
1904 } else {
|
Chris@115
|
1905 branchText = tr("branch \"%1\"").arg(currentBranch);
|
Chris@115
|
1906 }
|
Chris@156
|
1907
|
Chris@173
|
1908 if (stateUnknown) {
|
Chris@173
|
1909 hgTabs->setState(tr("(Examining repository)"));
|
Chris@173
|
1910 } else if (emptyRepo) {
|
Chris@162
|
1911 hgTabs->setState(tr("Nothing committed to this repository yet"));
|
Chris@162
|
1912 } else if (canMerge) {
|
Chris@156
|
1913 hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
|
Chris@163
|
1914 } else if (!hgTabs->getAllUnresolvedFiles().empty()) {
|
Chris@163
|
1915 hgTabs->setState(tr("Have unresolved files following merge on %1").arg(branchText));
|
Chris@156
|
1916 } else if (haveMerge) {
|
Chris@157
|
1917 hgTabs->setState(tr("Have merged but not yet committed on %1").arg(branchText));
|
Chris@156
|
1918 } else if (canUpdate) {
|
Chris@172
|
1919 if (hgTabs->haveChangesToCommit()) {
|
Chris@163
|
1920 // have uncommitted changes
|
Chris@163
|
1921 hgTabs->setState(tr("On %1. Not at the head of the branch").arg(branchText));
|
Chris@163
|
1922 } else {
|
Chris@163
|
1923 // no uncommitted changes
|
Chris@163
|
1924 hgTabs->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));
|
Chris@163
|
1925 }
|
Chris@156
|
1926 } else if (currentBranchHeads > 1) {
|
Chris@156
|
1927 hgTabs->setState(tr("At one of %n heads of %1", "", currentBranchHeads).arg(branchText));
|
Chris@115
|
1928 } else {
|
Chris@115
|
1929 hgTabs->setState(tr("At the head of %1").arg(branchText));
|
Chris@115
|
1930 }
|
jtkorhonen@0
|
1931 }
|
jtkorhonen@0
|
1932
|
jtkorhonen@0
|
1933 void MainWindow::createActions()
|
jtkorhonen@0
|
1934 {
|
jtkorhonen@0
|
1935 //File actions
|
Chris@69
|
1936 openAct = new QAction(QIcon(":/images/fileopen.png"), tr("Open..."), this);
|
Chris@169
|
1937 openAct -> setStatusTip(tr("Open a repository"));
|
Chris@69
|
1938
|
Chris@182
|
1939 changeRemoteRepoAct = new QAction(tr("Change Remote Location..."), this);
|
Chris@182
|
1940 changeRemoteRepoAct->setStatusTip(tr("Change the default remote repository for pull and push actions"));
|
Chris@182
|
1941
|
jtkorhonen@0
|
1942 settingsAct = new QAction(QIcon(":/images/settings.png"), tr("Settings..."), this);
|
jtkorhonen@0
|
1943 settingsAct -> setStatusTip(tr("View and change application settings"));
|
jtkorhonen@0
|
1944
|
Chris@169
|
1945 exitAct = new QAction(QIcon(":/images/exit.png"), tr("Quit"), this);
|
jtkorhonen@0
|
1946 exitAct->setShortcuts(QKeySequence::Quit);
|
Chris@169
|
1947 exitAct->setStatusTip(tr("Quit EasyMercurial"));
|
jtkorhonen@0
|
1948
|
jtkorhonen@0
|
1949 //Repository actions
|
Chris@120
|
1950 hgRefreshAct = new QAction(QIcon(":/images/status.png"), tr("Refresh"), this);
|
Chris@178
|
1951 hgRefreshAct->setStatusTip(tr("Refresh the window to show the current state of the working folder"));
|
Chris@61
|
1952
|
Chris@61
|
1953 hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("Preview"), this);
|
Chris@169
|
1954 hgIncomingAct -> setStatusTip(tr("See what changes are available in the remote repository waiting to be pulled"));
|
jtkorhonen@0
|
1955
|
Chris@61
|
1956 hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull"), this);
|
Chris@169
|
1957 hgPullAct -> setStatusTip(tr("Pull changes from the remote repository to the local repository"));
|
jtkorhonen@0
|
1958
|
Chris@61
|
1959 hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push"), this);
|
Chris@169
|
1960 hgPushAct->setStatusTip(tr("Push changes from the local repository to the remote repository"));
|
jtkorhonen@0
|
1961
|
jtkorhonen@0
|
1962 //Workfolder actions
|
Chris@99
|
1963 hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("Diff"), this);
|
Chris@169
|
1964 hgFolderDiffAct->setStatusTip(tr("See what has changed in the working folder compared with the last committed state"));
|
jtkorhonen@0
|
1965
|
Chris@61
|
1966 hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Revert"), this);
|
Chris@169
|
1967 hgRevertAct->setStatusTip(tr("Throw away your changes and return to the last committed state"));
|
jtkorhonen@0
|
1968
|
Chris@61
|
1969 hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add"), this);
|
Chris@169
|
1970 hgAddAct -> setStatusTip(tr("Mark the selected file(s) to be added on the next commit"));
|
jtkorhonen@0
|
1971
|
Chris@169
|
1972 //!!! needs to be modified for number
|
Chris@61
|
1973 hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove"), this);
|
Chris@169
|
1974 hgRemoveAct -> setStatusTip(tr("Mark the selected file(s) to be removed from version control on the next commit"));
|
jtkorhonen@0
|
1975
|
Chris@61
|
1976 hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update"), this);
|
Chris@169
|
1977 hgUpdateAct->setStatusTip(tr("Update the working folder to the head of the current repository branch"));
|
jtkorhonen@0
|
1978
|
Chris@169
|
1979 //!!! needs to be modified when files selected
|
Chris@61
|
1980 hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit"), this);
|
Chris@169
|
1981 hgCommitAct->setStatusTip(tr("Commit your changes to the local repository"));
|
jtkorhonen@0
|
1982
|
jtkorhonen@0
|
1983 hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
|
Chris@169
|
1984 hgMergeAct->setStatusTip(tr("Merge the two independent sets of changes in the local repository into the working folder"));
|
jtkorhonen@0
|
1985
|
jtkorhonen@0
|
1986 //Advanced actions
|
Chris@169
|
1987 //!!! needs to be modified for number
|
jtkorhonen@0
|
1988 hgAnnotateAct = new QAction(tr("Annotate"), this);
|
jtkorhonen@0
|
1989 hgAnnotateAct -> setStatusTip(tr("Show line-by-line version information for selected file"));
|
jtkorhonen@0
|
1990
|
Chris@182
|
1991 hgIgnoreAct = new QAction(tr("Edit .hgignore File"), this);
|
Chris@169
|
1992 hgIgnoreAct -> setStatusTip(tr("Edit the .hgignore file, containing the names of files that should be ignored by Mercurial"));
|
jtkorhonen@34
|
1993
|
Chris@182
|
1994 hgServeAct = new QAction(tr("Serve via HTTP"), this);
|
jtkorhonen@11
|
1995 hgServeAct -> setStatusTip(tr("Serve local repository via http for workgroup access"));
|
jtkorhonen@11
|
1996
|
jtkorhonen@0
|
1997 //Help actions
|
Chris@190
|
1998 aboutAct = new QAction(tr("About EasyMercurial"), this);
|
Chris@94
|
1999
|
Chris@94
|
2000 // Miscellaneous
|
Chris@94
|
2001 clearSelectionsAct = new QAction(tr("Clear selections"), this);
|
Chris@94
|
2002 clearSelectionsAct->setShortcut(Qt::Key_Escape);
|
jtkorhonen@0
|
2003 }
|
jtkorhonen@0
|
2004
|
jtkorhonen@0
|
2005 void MainWindow::createMenus()
|
jtkorhonen@0
|
2006 {
|
jtkorhonen@0
|
2007 fileMenu = menuBar()->addMenu(tr("File"));
|
Chris@169
|
2008
|
Chris@69
|
2009 fileMenu -> addAction(openAct);
|
Chris@182
|
2010 fileMenu -> addAction(changeRemoteRepoAct);
|
Chris@191
|
2011 fileMenu -> addSeparator();
|
Chris@191
|
2012
|
Chris@191
|
2013 advancedMenu = fileMenu->addMenu(tr("Advanced"));
|
Chris@191
|
2014
|
jtkorhonen@0
|
2015 fileMenu -> addAction(settingsAct);
|
Chris@191
|
2016
|
jtkorhonen@0
|
2017 fileMenu -> addSeparator();
|
jtkorhonen@0
|
2018 fileMenu -> addAction(exitAct);
|
jtkorhonen@0
|
2019
|
jtkorhonen@34
|
2020 advancedMenu -> addAction(hgIgnoreAct);
|
jtkorhonen@11
|
2021 advancedMenu -> addAction(hgServeAct);
|
jtkorhonen@0
|
2022
|
jtkorhonen@0
|
2023 helpMenu = menuBar()->addMenu(tr("Help"));
|
jtkorhonen@0
|
2024 helpMenu->addAction(aboutAct);
|
jtkorhonen@0
|
2025 }
|
jtkorhonen@0
|
2026
|
jtkorhonen@0
|
2027 void MainWindow::createToolBars()
|
jtkorhonen@0
|
2028 {
|
jtkorhonen@0
|
2029 fileToolBar = addToolBar(tr("File"));
|
jtkorhonen@0
|
2030 fileToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
Chris@69
|
2031 fileToolBar -> addAction(openAct);
|
Chris@120
|
2032 fileToolBar -> addAction(hgRefreshAct);
|
jtkorhonen@0
|
2033 fileToolBar -> addSeparator();
|
jtkorhonen@0
|
2034 fileToolBar -> setMovable(false);
|
jtkorhonen@0
|
2035
|
jtkorhonen@0
|
2036 repoToolBar = addToolBar(tr(REPOMENU_TITLE));
|
jtkorhonen@0
|
2037 repoToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
jtkorhonen@0
|
2038 repoToolBar->addAction(hgIncomingAct);
|
jtkorhonen@0
|
2039 repoToolBar->addAction(hgPullAct);
|
jtkorhonen@0
|
2040 repoToolBar->addAction(hgPushAct);
|
jtkorhonen@0
|
2041 repoToolBar -> setMovable(false);
|
jtkorhonen@0
|
2042
|
jtkorhonen@0
|
2043 workFolderToolBar = addToolBar(tr(WORKFOLDERMENU_TITLE));
|
jtkorhonen@0
|
2044 addToolBar(Qt::LeftToolBarArea, workFolderToolBar);
|
jtkorhonen@0
|
2045 workFolderToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
Chris@95
|
2046 workFolderToolBar->addAction(hgFolderDiffAct);
|
jtkorhonen@0
|
2047 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
2048 workFolderToolBar->addAction(hgRevertAct);
|
jtkorhonen@0
|
2049 workFolderToolBar->addAction(hgUpdateAct);
|
jtkorhonen@0
|
2050 workFolderToolBar->addAction(hgCommitAct);
|
jtkorhonen@0
|
2051 workFolderToolBar->addAction(hgMergeAct);
|
jtkorhonen@0
|
2052 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
2053 workFolderToolBar->addAction(hgAddAct);
|
jtkorhonen@0
|
2054 workFolderToolBar->addAction(hgRemoveAct);
|
jtkorhonen@0
|
2055 workFolderToolBar -> setMovable(false);
|
Chris@61
|
2056
|
Chris@61
|
2057 foreach (QToolButton *tb, findChildren<QToolButton *>()) {
|
Chris@61
|
2058 tb->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
|
Chris@61
|
2059 }
|
jtkorhonen@0
|
2060 }
|
jtkorhonen@0
|
2061
|
jtkorhonen@0
|
2062
|
jtkorhonen@0
|
2063 void MainWindow::createStatusBar()
|
jtkorhonen@0
|
2064 {
|
jtkorhonen@0
|
2065 statusBar()->showMessage(tr("Ready"));
|
jtkorhonen@0
|
2066 }
|
jtkorhonen@0
|
2067
|
Chris@69
|
2068
|
Chris@69
|
2069 //!!! review these:
|
Chris@69
|
2070
|
jtkorhonen@0
|
2071 void MainWindow::readSettings()
|
jtkorhonen@0
|
2072 {
|
jtkorhonen@0
|
2073 QDir workFolder;
|
jtkorhonen@0
|
2074
|
Chris@61
|
2075 QSettings settings;
|
jtkorhonen@0
|
2076
|
jtkorhonen@30
|
2077 remoteRepoPath = settings.value("remoterepopath", "").toString();
|
jtkorhonen@0
|
2078 workFolderPath = settings.value("workfolderpath", "").toString();
|
jtkorhonen@0
|
2079 if (!workFolder.exists(workFolderPath))
|
jtkorhonen@0
|
2080 {
|
jtkorhonen@0
|
2081 workFolderPath = "";
|
jtkorhonen@0
|
2082 }
|
jtkorhonen@0
|
2083
|
jtkorhonen@0
|
2084 QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
|
jtkorhonen@0
|
2085 QSize size = settings.value("size", QSize(400, 400)).toSize();
|
jtkorhonen@0
|
2086 firstStart = settings.value("firststart", QVariant(true)).toBool();
|
jtkorhonen@0
|
2087
|
Chris@109
|
2088 //!!! initialFileTypesBits = (unsigned char) settings.value("viewFileTypes", QVariant(DEFAULT_HG_STAT_BITS)).toInt();
|
jtkorhonen@0
|
2089 resize(size);
|
jtkorhonen@0
|
2090 move(pos);
|
jtkorhonen@0
|
2091 }
|
jtkorhonen@0
|
2092
|
jtkorhonen@17
|
2093
|
jtkorhonen@0
|
2094 void MainWindow::writeSettings()
|
jtkorhonen@0
|
2095 {
|
Chris@61
|
2096 QSettings settings;
|
jtkorhonen@0
|
2097 settings.setValue("pos", pos());
|
jtkorhonen@0
|
2098 settings.setValue("size", size());
|
jtkorhonen@0
|
2099 settings.setValue("remoterepopath", remoteRepoPath);
|
jtkorhonen@0
|
2100 settings.setValue("workfolderpath", workFolderPath);
|
jtkorhonen@0
|
2101 settings.setValue("firststart", firstStart);
|
Chris@98
|
2102 //!!!settings.setValue("viewFileTypes", hgTabs -> getFileTypesBits());
|
jtkorhonen@0
|
2103 }
|
jtkorhonen@0
|
2104
|
jtkorhonen@0
|
2105
|
jtkorhonen@0
|
2106
|
jtkorhonen@0
|
2107
|