annotate mainwindow.cpp @ 103:0bd32aedc6f6

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