annotate mainwindow.cpp @ 142:46bf2a4a1fc8

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