annotate mainwindow.cpp @ 133:aaeab914f2a3

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