annotate mainwindow.cpp @ 179:a51980a00dac

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