annotate mainwindow.cpp @ 115:78374cefa10f

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