annotate mainwindow.cpp @ 150:fb697ce0f625

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