annotate mainwindow.cpp @ 153:70fe12873106

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