annotate mainwindow.cpp @ 114:bb2d2eecdd60

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