annotate mainwindow.cpp @ 104:af314dd436d5

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