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