annotate src/mainwindow.cpp @ 624:38c84c66ad7a

* Added "show in" to show selected file in explorer
author Sam Izzo <sam@humbug.net>
date Sun, 26 Aug 2012 01:59:53 +1000
parents 2d5b831c1a0a
children db62a0cb3037
rev   line source
Chris@585 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@560 8 Copyright (c) 2012 Chris Cannam
Chris@560 9 Copyright (c) 2012 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@359 32 #include <QWidgetAction>
Chris@125 33 #include <QRegExp>
Chris@199 34 #include <QShortcut>
Chris@237 35 #include <QUrl>
Chris@476 36 #include <QDialogButtonBox>
Chris@238 37 #include <QTimer>
Chris@494 38 #include <QTextBrowser>
jtkorhonen@0 39
Chris@53 40 #include "mainwindow.h"
Chris@69 41 #include "multichoicedialog.h"
Chris@64 42 #include "startupdialog.h"
Chris@53 43 #include "colourset.h"
Chris@62 44 #include "debug.h"
Chris@74 45 #include "logparser.h"
Chris@103 46 #include "confirmcommentdialog.h"
Chris@125 47 #include "incomingdialog.h"
Chris@175 48 #include "settingsdialog.h"
Chris@275 49 #include "moreinformationdialog.h"
Chris@331 50 #include "annotatedialog.h"
Chris@229 51 #include "version.h"
Chris@287 52 #include "workstatuswidget.h"
Chris@414 53 #include "hgignoredialog.h"
Chris@491 54 #include "versiontester.h"
Chris@540 55 #include "fswatcher.h"
Chris@53 56
jtkorhonen@0 57
Chris@172 58 MainWindow::MainWindow(QString myDirPath) :
Chris@238 59 m_myDirPath(myDirPath),
Chris@540 60 m_helpDialog(0)
jtkorhonen@0 61 {
Chris@197 62 setWindowIcon(QIcon(":images/easyhg-icon.png"));
Chris@197 63
jtkorhonen@0 64 QString wndTitle;
jtkorhonen@0 65
Chris@284 66 m_showAllFiles = false;
Chris@273 67
Chris@540 68 m_fsWatcher = new FsWatcher();
Chris@540 69 m_fsWatcherToken = m_fsWatcher->getNewToken();
Chris@540 70 m_commandSequenceInProgress = false;
Chris@541 71 connect(m_fsWatcher, SIGNAL(changed()), this, SLOT(checkFilesystem()));
Chris@540 72
Chris@284 73 m_commitsSincePush = 0;
Chris@284 74 m_shouldHgStat = true;
Chris@90 75
jtkorhonen@0 76 createActions();
jtkorhonen@0 77 createMenus();
jtkorhonen@0 78 createToolBars();
jtkorhonen@0 79 createStatusBar();
jtkorhonen@0 80
Chris@284 81 m_runner = new HgRunner(m_myDirPath, this);
Chris@284 82 connect(m_runner, SIGNAL(commandStarting(HgAction)),
Chris@241 83 this, SLOT(commandStarting(HgAction)));
Chris@284 84 connect(m_runner, SIGNAL(commandCompleted(HgAction, QString)),
Chris@109 85 this, SLOT(commandCompleted(HgAction, QString)));
Chris@537 86 connect(m_runner, SIGNAL(commandFailed(HgAction, QString, QString)),
Chris@537 87 this, SLOT(commandFailed(HgAction, QString, QString)));
Chris@564 88 connect(m_runner, SIGNAL(commandCancelled(HgAction)),
Chris@564 89 this, SLOT(commandCancelled(HgAction)));
Chris@284 90 statusBar()->addPermanentWidget(m_runner);
jtkorhonen@0 91
Chris@61 92 setWindowTitle(tr("EasyMercurial"));
jtkorhonen@0 93
Chris@284 94 m_remoteRepoPath = "";
Chris@284 95 m_workFolderPath = "";
jtkorhonen@0 96
jtkorhonen@0 97 readSettings();
jtkorhonen@0 98
Chris@284 99 m_justMerged = false;
Chris@210 100
Chris@210 101 QWidget *central = new QWidget(this);
Chris@210 102 setCentralWidget(central);
Chris@210 103
Chris@210 104 QGridLayout *cl = new QGridLayout(central);
Chris@287 105 int row = 0;
Chris@210 106
Chris@210 107 #ifndef Q_OS_MAC
Chris@210 108 cl->setMargin(0);
Chris@210 109 #endif
jtkorhonen@0 110
Chris@287 111 m_workStatus = new WorkStatusWidget(this);
Chris@558 112 cl->addWidget(m_workStatus, row++, 0);
Chris@287 113
Chris@287 114 m_hgTabs = new HgTabWidget(central, m_workFolderPath);
Chris@287 115 connectTabsSignals();
Chris@287 116
Chris@554 117 cl->addWidget(m_hgTabs, row++, 0, 1, 2);
Chris@287 118
Chris@284 119 connect(m_hgTabs, SIGNAL(selectionChanged()),
Chris@95 120 this, SLOT(enableDisableActions()));
Chris@484 121 connect(m_hgTabs, SIGNAL(showAllChanged()),
Chris@484 122 this, SLOT(showAllChanged()));
Chris@95 123
jtkorhonen@0 124 setUnifiedTitleAndToolBarOnMac(true);
jtkorhonen@0 125 connectActions();
Chris@120 126 clearState();
jtkorhonen@0 127 enableDisableActions();
jtkorhonen@0 128
Chris@284 129 if (m_firstStart) {
Chris@64 130 startupDialog();
jtkorhonen@0 131 }
jtkorhonen@0 132
Chris@239 133 SettingsDialog::findDefaultLocations(m_myDirPath);
Chris@112 134
Chris@64 135 ColourSet *cs = ColourSet::instance();
Chris@64 136 cs->clearDefaultNames();
Chris@64 137 cs->addDefaultName("");
Chris@153 138 cs->addDefaultName("default");
Chris@64 139 cs->addDefaultName(getUserInfo());
Chris@62 140
Chris@491 141 VersionTester *vt = new VersionTester
Chris@507 142 ("easyhg.org", "/latest-version.txt", EASYHG_VERSION);
Chris@491 143 connect(vt, SIGNAL(newerVersionAvailable(QString)),
Chris@491 144 this, SLOT(newerVersionAvailable(QString)));
Chris@491 145
Chris@175 146 hgTest();
Chris@359 147 updateRecentMenu();
jtkorhonen@0 148 }
jtkorhonen@0 149
jtkorhonen@0 150
jtkorhonen@0 151 void MainWindow::closeEvent(QCloseEvent *)
jtkorhonen@0 152 {
jtkorhonen@0 153 writeSettings();
Chris@284 154 delete m_fsWatcher;
jtkorhonen@0 155 }
jtkorhonen@0 156
jtkorhonen@0 157
Chris@554 158 void MainWindow::resizeEvent(QResizeEvent *)
Chris@554 159 {
Chris@554 160 }
Chris@554 161
Chris@554 162
Chris@64 163 QString MainWindow::getUserInfo() const
Chris@64 164 {
Chris@64 165 QSettings settings;
Chris@64 166 settings.beginGroup("User Information");
Chris@64 167 QString name = settings.value("name", getUserRealName()).toString();
Chris@64 168 QString email = settings.value("email", "").toString();
Chris@64 169
Chris@64 170 QString identifier;
Chris@64 171
Chris@64 172 if (email != "") {
Chris@64 173 identifier = QString("%1 <%2>").arg(name).arg(email);
Chris@64 174 } else {
Chris@64 175 identifier = name;
Chris@64 176 }
Chris@64 177
Chris@64 178 return identifier;
Chris@64 179 }
Chris@64 180
jtkorhonen@0 181 void MainWindow::about()
jtkorhonen@0 182 {
Chris@97 183 QMessageBox::about(this, tr("About EasyMercurial"),
Chris@229 184 tr("<qt><h2>EasyMercurial v%1</h2>"
Chris@228 185 #ifdef Q_OS_MAC
Chris@228 186 "<font size=-1>"
Chris@228 187 #endif
Chris@97 188 "<p>EasyMercurial is a simple user interface for the "
Chris@186 189 "Mercurial</a> version control system.</p>"
Chris@186 190 "<h4>Credits and Copyright</h4>"
Chris@186 191 "<p>Development carried out by Chris Cannam for "
Chris@186 192 "SoundSoftware.ac.uk at the Centre for Digital Music, "
Chris@186 193 "Queen Mary, University of London.</p>"
Chris@186 194 "<p>EasyMercurial is based on HgExplorer by "
Chris@186 195 "Jari Korhonen, with thanks.</p>"
Chris@186 196 "<p style=\"margin-left: 2em;\">"
Chris@560 197 "Copyright &copy; 2012 Queen Mary, University of London.<br>"
Chris@186 198 "Copyright &copy; 2010 Jari Korhonen.<br>"
Chris@560 199 "Copyright &copy; 2012 Chris Cannam."
Chris@186 200 "</p>"
Chris@186 201 "<p style=\"margin-left: 2em;\">"
Chris@186 202 "This program requires Mercurial, by Matt Mackall and others.<br>"
Chris@186 203 "This program uses Qt by Nokia.<br>"
Chris@186 204 "This program uses Nuvola icons by David Vignoni.<br>"
Chris@186 205 "This program may use KDiff3 by Joachim Eibl.<br>"
Chris@186 206 "This program may use PyQt by River Bank Computing.<br>"
Chris@186 207 "Packaging for Mercurial and other dependencies on Windows is derived from TortoiseHg by Steve Borho and others."
Chris@186 208 "</p>"
Chris@186 209 "<h4>License</h4>"
Chris@186 210 "<p>This program is free software; you can redistribute it and/or "
Chris@97 211 "modify it under the terms of the GNU General Public License as "
Chris@97 212 "published by the Free Software Foundation; either version 2 of the "
Chris@97 213 "License, or (at your option) any later version. See the file "
Chris@223 214 "COPYING included with this distribution for more information.</p>"
Chris@228 215 #ifdef Q_OS_MAC
Chris@228 216 "</font>"
Chris@228 217 #endif
Chris@229 218 ).arg(EASYHG_VERSION));
jtkorhonen@0 219 }
jtkorhonen@0 220
Chris@94 221 void MainWindow::clearSelections()
Chris@94 222 {
Chris@284 223 m_hgTabs->clearSelections();
Chris@94 224 }
jtkorhonen@0 225
Chris@484 226 void MainWindow::showAllChanged()
Chris@199 227 {
Chris@199 228 hgQueryPaths();
Chris@199 229 }
Chris@199 230
Chris@120 231 void MainWindow::hgRefresh()
Chris@120 232 {
Chris@120 233 clearState();
Chris@120 234 hgQueryPaths();
Chris@120 235 }
Chris@120 236
Chris@175 237 void MainWindow::hgTest()
Chris@175 238 {
Chris@175 239 QStringList params;
Chris@175 240 params << "--version";
Chris@382 241 // The path is not necessarily set here, but we need something for
Chris@382 242 // this test or else HgRunner will (cautiously) refuse to run
Chris@382 243 QString path = m_myDirPath;
Chris@382 244 if (path == "") path = QDir::homePath();
Chris@382 245 m_runner->requestAction(HgAction(ACT_TEST_HG, path, params));
Chris@175 246 }
Chris@175 247
Chris@200 248 void MainWindow::hgTestExtension()
Chris@200 249 {
Chris@200 250 QStringList params;
Chris@200 251 params << "--version";
Chris@382 252 // The path is not necessarily set here, but we need something for
Chris@382 253 // this test or else HgRunner will (cautiously) refuse to run
Chris@382 254 QString path = m_myDirPath;
Chris@382 255 if (path == "") path = QDir::homePath();
Chris@382 256 m_runner->requestAction(HgAction(ACT_TEST_HG_EXT, path, params));
Chris@200 257 }
Chris@200 258
jtkorhonen@0 259 void MainWindow::hgStat()
jtkorhonen@0 260 {
Chris@109 261 QStringList params;
Chris@199 262
Chris@542 263 // We always stat all files, regardless of whether we're showing
Chris@542 264 // them all, because we need them for the filesystem monitor
Chris@542 265 params << "stat" << "-A";
Chris@153 266
Chris@284 267 m_lastStatOutput = "";
Chris@273 268
Chris@541 269 // We're about to do a stat, so we can silently bring ourselves
Chris@541 270 // up-to-date on any file changes to this point
Chris@541 271 (void)m_fsWatcher->getChangedPaths(m_fsWatcherToken);
Chris@541 272
Chris@284 273 m_runner->requestAction(HgAction(ACT_STAT, m_workFolderPath, params));
jtkorhonen@0 274 }
jtkorhonen@0 275
Chris@109 276 void MainWindow::hgQueryPaths()
Chris@74 277 {
Chris@484 278 m_showAllFiles = m_hgTabs->shouldShowAll();
Chris@484 279
Chris@210 280 // Quickest is to just read the file
Chris@198 281
Chris@284 282 QFileInfo hgrc(m_workFolderPath + "/.hg/hgrc");
Chris@198 283
Chris@210 284 QString path;
Chris@210 285
Chris@198 286 if (hgrc.exists()) {
Chris@198 287 QSettings s(hgrc.canonicalFilePath(), QSettings::IniFormat);
Chris@198 288 s.beginGroup("paths");
Chris@210 289 path = s.value("default").toString();
Chris@210 290 }
Chris@198 291
Chris@565 292 // std::cerr << "hgQueryPaths: setting m_remoteRepoPath to " << m_remoteRepoPath << " from file " << hgrc.absoluteFilePath() << std::endl;
Chris@553 293
Chris@284 294 m_remoteRepoPath = path;
Chris@198 295
Chris@210 296 // We have to do this here, because commandCompleted won't be called
Chris@284 297 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 298 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@287 299 updateWorkFolderAndRepoNames();
Chris@210 300
Chris@210 301 hgQueryBranch();
Chris@210 302 return;
Chris@210 303
Chris@210 304 /* The classic method!
Chris@198 305
Chris@109 306 QStringList params;
Chris@109 307 params << "paths";
Chris@284 308 m_runner->requestAction(HgAction(ACT_QUERY_PATHS, m_workFolderPath, params));
Chris@210 309 */
Chris@74 310 }
Chris@74 311
Chris@109 312 void MainWindow::hgQueryBranch()
Chris@106 313 {
Chris@210 314 // Quickest is to just read the file
Chris@198 315
Chris@284 316 QFile hgbr(m_workFolderPath + "/.hg/branch");
Chris@198 317
Chris@210 318 QString br = "default";
Chris@210 319
Chris@198 320 if (hgbr.exists() && hgbr.open(QFile::ReadOnly)) {
Chris@210 321 QByteArray ba = hgbr.readLine();
Chris@210 322 br = QString::fromUtf8(ba).trimmed();
Chris@210 323 }
Chris@210 324
Chris@284 325 m_currentBranch = br;
Chris@210 326
Chris@210 327 // We have to do this here, because commandCompleted won't be called
Chris@210 328 hgStat();
Chris@210 329 return;
Chris@198 330
Chris@210 331 /* The classic method!
Chris@198 332
Chris@109 333 QStringList params;
Chris@109 334 params << "branch";
Chris@284 335 m_runner->requestAction(HgAction(ACT_QUERY_BRANCH, m_workFolderPath, params));
Chris@210 336 */
Chris@106 337 }
Chris@106 338
Chris@506 339 void MainWindow::hgQueryHeadsActive()
Chris@506 340 {
Chris@506 341 QStringList params;
Chris@514 342 params << "heads";
Chris@506 343 m_runner->requestAction(HgAction(ACT_QUERY_HEADS_ACTIVE, m_workFolderPath, params));
Chris@506 344 }
Chris@506 345
Chris@109 346 void MainWindow::hgQueryHeads()
jtkorhonen@0 347 {
Chris@109 348 QStringList params;
Chris@137 349 // On empty repos, "hg heads" will fail -- we don't care about
Chris@137 350 // that. Use --closed option so as to include closed branches;
Chris@137 351 // otherwise we'll be stuck if the user updates into one, and our
Chris@137 352 // incremental log will end up with spurious stuff in it because
Chris@137 353 // we won't be pruning at the ends of closed branches
Chris@137 354 params << "heads" << "--closed";
Chris@284 355 m_runner->requestAction(HgAction(ACT_QUERY_HEADS, m_workFolderPath, params));
jtkorhonen@0 356 }
jtkorhonen@0 357
jtkorhonen@0 358 void MainWindow::hgLog()
jtkorhonen@0 359 {
mikel@617 360 QSettings settings;
mikel@617 361 settings.beginGroup("Presentation");
mikel@617 362
Chris@109 363 QStringList params;
Chris@109 364 params << "log";
mikel@617 365 params << "--date";
mikel@617 366 params << settings.value("datefrom", QDate(2000, 1, 1)).toDate().toString("yyyy-MM-dd") + " to " + QDate::currentDate().toString("yyyy-MM-dd");
Chris@109 367 params << "--template";
Chris@125 368 params << Changeset::getLogTemplate();
Chris@109 369
Chris@284 370 m_runner->requestAction(HgAction(ACT_LOG, m_workFolderPath, params));
Chris@109 371 }
Chris@109 372
Chris@150 373 void MainWindow::hgLogIncremental(QStringList prune)
Chris@120 374 {
Chris@305 375 // Sometimes we can be called with prune empty -- it represents
Chris@305 376 // the current heads, but if we have none already and for some
Chris@305 377 // reason are being prompted for an incremental update, we may run
Chris@305 378 // into trouble. In that case, make this a full log instead
Chris@305 379
Chris@305 380 if (prune.empty()) {
Chris@305 381 hgLog();
Chris@305 382 return;
Chris@305 383 }
Chris@305 384
Chris@120 385 QStringList params;
Chris@120 386 params << "log";
Chris@120 387
Chris@150 388 foreach (QString p, prune) {
Chris@153 389 params << "--prune" << Changeset::hashOf(p);
Chris@120 390 }
Chris@120 391
Chris@120 392 params << "--template";
Chris@125 393 params << Changeset::getLogTemplate();
Chris@120 394
Chris@284 395 m_runner->requestAction(HgAction(ACT_LOG_INCREMENTAL, m_workFolderPath, params));
Chris@120 396 }
Chris@109 397
Chris@109 398 void MainWindow::hgQueryParents()
Chris@109 399 {
Chris@109 400 QStringList params;
Chris@109 401 params << "parents";
Chris@284 402 m_runner->requestAction(HgAction(ACT_QUERY_PARENTS, m_workFolderPath, params));
Chris@109 403 }
Chris@109 404
Chris@326 405 void MainWindow::hgAnnotateFiles(QStringList files)
Chris@326 406 {
Chris@326 407 QStringList params;
Chris@326 408
Chris@326 409 if (!files.isEmpty()) {
Chris@332 410 params << "annotate" << "-udqc" << "--" << files;
Chris@326 411 m_runner->requestAction(HgAction(ACT_ANNOTATE, m_workFolderPath, params));
Chris@326 412 }
Chris@326 413 }
Chris@326 414
Chris@109 415 void MainWindow::hgResolveList()
Chris@109 416 {
Chris@109 417 QStringList params;
jtkorhonen@0 418
Chris@109 419 params << "resolve" << "--list";
Chris@284 420 m_runner->requestAction(HgAction(ACT_RESOLVE_LIST, m_workFolderPath, params));
Chris@109 421 }
Chris@109 422
Chris@109 423 void MainWindow::hgAdd()
jtkorhonen@0 424 {
Chris@109 425 // hgExplorer permitted adding "all" files -- I'm not sure
Chris@109 426 // that one is a good idea, let's require the user to select
jtkorhonen@0 427
Chris@326 428 hgAddFiles(m_hgTabs->getSelectedAddableFiles());
Chris@326 429 }
Chris@326 430
Chris@326 431 void MainWindow::hgAddFiles(QStringList files)
Chris@326 432 {
Chris@326 433 QStringList params;
Chris@109 434
Chris@109 435 if (!files.empty()) {
Chris@109 436 params << "add" << "--" << files;
Chris@284 437 m_runner->requestAction(HgAction(ACT_ADD, m_workFolderPath, params));
jtkorhonen@0 438 }
jtkorhonen@0 439 }
jtkorhonen@0 440
Chris@98 441 void MainWindow::hgRemove()
Chris@98 442 {
Chris@326 443 hgRemoveFiles(m_hgTabs->getSelectedRemovableFiles());
Chris@326 444 }
Chris@326 445
Chris@326 446 void MainWindow::hgRemoveFiles(QStringList files)
Chris@326 447 {
Chris@109 448 QStringList params;
Chris@98 449
Chris@109 450 if (!files.empty()) {
Chris@109 451 params << "remove" << "--after" << "--force" << "--" << files;
Chris@284 452 m_runner->requestAction(HgAction(ACT_REMOVE, m_workFolderPath, params));
Chris@109 453 }
jtkorhonen@0 454 }
jtkorhonen@0 455
jtkorhonen@0 456 void MainWindow::hgCommit()
jtkorhonen@0 457 {
Chris@326 458 hgCommitFiles(QStringList());
Chris@326 459 }
Chris@326 460
Chris@326 461 void MainWindow::hgCommitFiles(QStringList files)
Chris@326 462 {
Chris@109 463 QStringList params;
Chris@109 464 QString comment;
Chris@94 465
Chris@284 466 if (m_justMerged) {
Chris@284 467 comment = m_mergeCommitComment;
Chris@157 468 }
Chris@157 469
Chris@284 470 QStringList allFiles = m_hgTabs->getAllCommittableFiles();
Chris@127 471 QStringList reportFiles = files;
Chris@237 472 if (reportFiles.empty()) {
Chris@237 473 reportFiles = allFiles;
Chris@237 474 }
Chris@103 475
Chris@237 476 QString subsetNote;
Chris@237 477 if (reportFiles != allFiles) {
Chris@237 478 subsetNote = tr("<p><b>Note:</b> you are committing only the files you have selected, not all of the files that have been changed!");
Chris@237 479 }
Chris@237 480
Chris@155 481 QString cf(tr("Commit files"));
Chris@155 482
Chris@311 483 QString branchText;
Chris@311 484 if (m_currentBranch == "" || m_currentBranch == "default") {
Chris@311 485 branchText = tr("the default branch");
Chris@311 486 } else {
Chris@311 487 branchText = tr("branch \"%1\"").arg(m_currentBranch);
Chris@311 488 }
Chris@311 489
Chris@109 490 if (ConfirmCommentDialog::confirmAndGetLongComment
Chris@109 491 (this,
Chris@155 492 cf,
Chris@237 493 tr("<h3>%1</h3><p>%2%3").arg(cf)
Chris@473 494 .arg(tr("You are about to commit changes to the following files in %1:").arg(branchText))
Chris@237 495 .arg(subsetNote),
Chris@237 496 tr("<h3>%1</h3><p>%2%3").arg(cf)
Chris@473 497 .arg(tr("You are about to commit changes to %n file(s) in %1.", "", reportFiles.size()).arg(branchText))
Chris@237 498 .arg(subsetNote),
Chris@127 499 reportFiles,
Chris@193 500 comment,
Chris@365 501 tr("Co&mmit"))) {
Chris@103 502
Chris@284 503 if (!m_justMerged && !files.empty()) {
Chris@157 504 // User wants to commit selected file(s) (and this is not
Chris@157 505 // merge commit, which would fail if we selected files)
Chris@157 506 params << "commit" << "--message" << comment
Chris@157 507 << "--user" << getUserInfo() << "--" << files;
Chris@109 508 } else {
Chris@109 509 // Commit all changes
Chris@157 510 params << "commit" << "--message" << comment
Chris@157 511 << "--user" << getUserInfo();
jtkorhonen@0 512 }
Chris@109 513
Chris@284 514 m_runner->requestAction(HgAction(ACT_COMMIT, m_workFolderPath, params));
Chris@284 515 m_mergeCommitComment = "";
jtkorhonen@0 516 }
jtkorhonen@0 517 }
jtkorhonen@0 518
jtkorhonen@34 519 QString MainWindow::filterTag(QString tag)
jtkorhonen@34 520 {
Chris@278 521 for(int i = 0; i < tag.size(); i++) {
Chris@278 522 if (tag[i].isLower() || tag[i].isUpper() ||
Chris@278 523 tag[i].isDigit() || (tag[i] == QChar('.'))) {
jtkorhonen@34 524 //ok
Chris@278 525 } else {
jtkorhonen@34 526 tag[i] = QChar('_');
jtkorhonen@34 527 }
jtkorhonen@34 528 }
jtkorhonen@34 529 return tag;
jtkorhonen@34 530 }
jtkorhonen@34 531
jtkorhonen@34 532
Chris@311 533 void MainWindow::hgNewBranch()
Chris@278 534 {
Chris@278 535 QStringList params;
Chris@278 536 QString branch;
Chris@278 537
Chris@278 538 if (ConfirmCommentDialog::confirmAndGetShortComment
Chris@278 539 (this,
Chris@278 540 tr("New Branch"),
Chris@278 541 tr("Enter new branch name:"),
Chris@278 542 branch,
Chris@365 543 tr("Start &Branch"))) {
Chris@278 544 if (!branch.isEmpty()) {//!!! do something better if it is empty
Chris@278 545
Chris@278 546 params << "branch" << filterTag(branch);
Chris@307 547 m_runner->requestAction(HgAction(ACT_NEW_BRANCH, m_workFolderPath, params));
Chris@278 548 }
Chris@278 549 }
Chris@278 550 }
Chris@278 551
Chris@311 552 void MainWindow::hgNoBranch()
Chris@311 553 {
Chris@311 554 if (m_currentParents.empty()) return;
Chris@311 555
Chris@311 556 QString parentBranch = m_currentParents[0]->branch();
Chris@311 557 if (parentBranch == "") parentBranch = "default";
Chris@311 558
Chris@311 559 QStringList params;
Chris@311 560 params << "branch" << parentBranch;
Chris@311 561 m_runner->requestAction(HgAction(ACT_NEW_BRANCH, m_workFolderPath, params));
Chris@311 562 }
Chris@311 563
Chris@514 564 void MainWindow::hgCloseBranch()
Chris@514 565 {
Chris@514 566 QStringList params;
Chris@514 567
Chris@514 568 //!!! how to ensure this doesn't happen when uncommitted changes present?
Chris@514 569
Chris@514 570 QString cf(tr("Close branch"));
Chris@514 571 QString comment;
Chris@514 572
Chris@514 573 QString defaultWarning;
Chris@514 574
Chris@514 575 QString branchText;
Chris@514 576 if (m_currentBranch == "" || m_currentBranch == "default") {
Chris@514 577 branchText = tr("the default branch");
Chris@514 578 defaultWarning = tr("<p><b>Warning:</b> you are asking to close the default branch. This is not usually a good idea!</p>");
Chris@514 579 } else {
Chris@514 580 branchText = tr("branch \"%1\"").arg(m_currentBranch);
Chris@514 581 }
Chris@514 582
Chris@514 583 if (ConfirmCommentDialog::confirmAndGetLongComment
Chris@514 584 (this,
Chris@514 585 cf,
Chris@514 586 tr("<h3>%1</h3><p>%2%3").arg(cf)
Chris@518 587 .arg(tr("You are about to close %1.<p>This branch will be marked as closed and hidden from the history view.<p>You will still be able to see if it you select \"Show closed branches\" in the history view, and it will be reopened if you commit to it.<p>Please enter your comment for the commit log:").arg(branchText))
Chris@514 588 .arg(defaultWarning),
Chris@514 589 comment,
Chris@514 590 tr("C&lose branch"))) {
Chris@514 591
Chris@514 592 params << "commit" << "--message" << comment
Chris@514 593 << "--user" << getUserInfo() << "--close-branch";
Chris@514 594
Chris@514 595 m_runner->requestAction(HgAction(ACT_CLOSE_BRANCH, m_workFolderPath, params));
Chris@514 596 }
Chris@514 597 }
Chris@514 598
Chris@164 599 void MainWindow::hgTag(QString id)
jtkorhonen@34 600 {
Chris@109 601 QStringList params;
Chris@109 602 QString tag;
jtkorhonen@34 603
Chris@109 604 if (ConfirmCommentDialog::confirmAndGetShortComment
Chris@109 605 (this,
Chris@109 606 tr("Tag"),
Chris@109 607 tr("Enter tag:"),
Chris@193 608 tag,
Chris@365 609 tr("Add &Tag"))) {
Chris@164 610 if (!tag.isEmpty()) {//!!! do something better if it is empty
Chris@164 611
Chris@164 612 params << "tag" << "--user" << getUserInfo();
Chris@164 613 params << "--rev" << Changeset::hashOf(id) << filterTag(tag);
Chris@109 614
Chris@284 615 m_runner->requestAction(HgAction(ACT_TAG, m_workFolderPath, params));
jtkorhonen@34 616 }
jtkorhonen@34 617 }
jtkorhonen@34 618 }
jtkorhonen@34 619
Chris@417 620 void MainWindow::initHgIgnore()
jtkorhonen@34 621 {
Chris@284 622 if (!QDir(m_workFolderPath).exists()) return;
Chris@417 623 QString hgIgnorePath = m_workFolderPath + "/.hgignore";
Chris@417 624
Chris@249 625 QFile f(hgIgnorePath);
Chris@249 626 if (!f.exists()) {
Chris@249 627 f.open(QFile::WriteOnly);
Chris@249 628 QTextStream *ts = new QTextStream(&f);
Chris@249 629 *ts << "syntax: glob\n";
Chris@249 630 delete ts;
Chris@249 631 f.close();
Chris@249 632 }
Chris@417 633 }
Chris@417 634
Chris@425 635 void MainWindow::hgIgnore()
Chris@425 636 {
Chris@425 637 // hgExplorer permitted adding "all" files -- I'm not sure
Chris@425 638 // that one is a good idea, let's require the user to select
Chris@425 639
Chris@425 640 hgIgnoreFiles(m_hgTabs->getSelectedAddableFiles());
Chris@425 641 }
Chris@425 642
Chris@417 643 void MainWindow::hgEditIgnore()
Chris@417 644 {
Chris@417 645 if (!QDir(m_workFolderPath).exists()) return;
Chris@417 646
Chris@417 647 initHgIgnore();
Chris@417 648
Chris@417 649 QString hgIgnorePath = m_workFolderPath + "/.hgignore";
Chris@476 650
Chris@476 651 QFile f(hgIgnorePath);
Chris@476 652 if (!f.exists()) return; // shouldn't happen (after initHgIgnore called)
Chris@476 653
Chris@476 654 if (!f.open(QFile::ReadOnly)) return;
Chris@476 655 QTextStream sin(&f);
Chris@476 656 QString all = sin.readAll();
Chris@476 657 f.close();
Chris@476 658
Chris@476 659 QDialog d;
Chris@476 660 QGridLayout layout;
Chris@476 661 d.setLayout(&layout);
Chris@476 662
Chris@476 663 int row = 0;
Chris@476 664 layout.addWidget(new QLabel(tr("<qt><h3>Ignored File Patterns</h3></qt>")), row++, 0);//!!! todo: link to Hg docs?
Chris@476 665
Chris@476 666 QTextEdit ed;
Chris@476 667 ed.setAcceptRichText(false);
Chris@476 668 ed.setLineWrapMode(QTextEdit::NoWrap);
Chris@476 669 layout.setRowStretch(row, 10);
Chris@476 670 layout.addWidget(&ed, row++, 0);
Chris@179 671
Chris@476 672 QDialogButtonBox bb(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
Chris@476 673 connect(bb.button(QDialogButtonBox::Save), SIGNAL(clicked()),
Chris@476 674 &d, SLOT(accept()));
Chris@476 675 connect(bb.button(QDialogButtonBox::Cancel), SIGNAL(clicked()),
Chris@476 676 &d, SLOT(reject()));
Chris@476 677 layout.addWidget(&bb, row++, 0);
Chris@476 678
Chris@476 679 ed.document()->setPlainText(all);
Chris@476 680
Chris@476 681 d.resize(QSize(300, 400));
Chris@476 682
Chris@476 683 if (d.exec() == QDialog::Accepted) {
Chris@476 684 if (!f.open(QFile::WriteOnly | QFile::Truncate)) {
Chris@476 685 QMessageBox::critical(this, tr("Write failed"),
Chris@476 686 tr("Failed to open file %1 for writing")
Chris@476 687 .arg(f.fileName()));
Chris@476 688 return;
Chris@476 689 }
Chris@476 690 QTextStream sout(&f);
Chris@476 691 sout << ed.document()->toPlainText();
Chris@476 692 f.close();
Chris@179 693 }
Chris@179 694 }
Chris@179 695
Chris@421 696 static QString regexEscape(QString filename)
Chris@421 697 {
Chris@421 698 return filename
Chris@421 699 .replace(".", "\\.")
Chris@421 700 .replace("[", "\\[")
Chris@421 701 .replace("]", "\\]")
Chris@421 702 .replace("(", "\\(")
Chris@421 703 .replace(")", "\\)")
Chris@421 704 .replace("?", "\\?");
Chris@421 705 }
Chris@421 706
Chris@326 707 void MainWindow::hgIgnoreFiles(QStringList files)
Chris@326 708 {
Chris@417 709 if (!QDir(m_workFolderPath).exists() || files.empty()) return;
Chris@413 710
Chris@413 711 // we should:
Chris@413 712 //
Chris@413 713 // * show the user the list of file names selected
Chris@413 714 //
Chris@413 715 // * offer a choice (depending on the files selected?)
Chris@413 716 //
Chris@413 717 // - ignore only these files
Chris@413 718 //
Chris@413 719 // - ignore files with these names, in any subdirectories?
Chris@413 720 //
Chris@413 721 // - ignore all files with this extension (if they have a common
Chris@413 722 // extension)?
Chris@413 723 //
Chris@413 724 // - ignore all files with these extensions (if they have any
Chris@413 725 // extensions?)
Chris@413 726
Chris@414 727 DEBUG << "MainWindow::hgIgnoreFiles: File names are:" << endl;
Chris@414 728 foreach (QString file, files) DEBUG << file << endl;
Chris@414 729
Chris@414 730 QSet<QString> suffixes;
Chris@414 731 foreach (QString file, files) {
Chris@414 732 QString s = QFileInfo(file).suffix();
Chris@414 733 if (s != "") suffixes.insert(s);
Chris@414 734 }
Chris@414 735
Chris@419 736 QString directory;
Chris@429 737 int dirCount = 0;
Chris@419 738 foreach (QString file, files) {
Chris@419 739 QString d = QFileInfo(file).path();
Chris@419 740 if (d != directory) {
Chris@419 741 ++dirCount;
Chris@419 742 directory = d;
Chris@419 743 }
Chris@419 744 }
Chris@421 745 if (dirCount != 1 || directory == ".") directory = "";
Chris@419 746
Chris@414 747 HgIgnoreDialog::IgnoreType itype =
Chris@415 748 HgIgnoreDialog::confirmIgnore
Chris@419 749 (this, files, QStringList::fromSet(suffixes), directory);
Chris@414 750
Chris@416 751 DEBUG << "hgIgnoreFiles: Ignore type is " << itype << endl;
Chris@417 752
Chris@421 753 if (itype == HgIgnoreDialog::IgnoreNothing) return;
Chris@421 754
Chris@417 755 // Now, .hgignore can be switched from regex to glob syntax
Chris@417 756 // part-way through -- and glob is much simpler for us, so we
Chris@417 757 // should do that if it's in regex mode at the end of the file.
Chris@417 758
Chris@417 759 initHgIgnore();
Chris@417 760
Chris@417 761 QString hgIgnorePath = m_workFolderPath + "/.hgignore";
Chris@417 762
Chris@417 763 // hgignore file should now exist (initHgIgnore should have
Chris@417 764 // created it if it didn't). Check for glob status first
Chris@417 765
Chris@417 766 QFile f(hgIgnorePath);
Chris@417 767 if (!f.exists()) {
Chris@417 768 std::cerr << "MainWindow::ignoreFiles: Internal error: .hgignore file not found (even though we were supposed to have created it)" << std::endl;
Chris@417 769 return;
Chris@417 770 }
Chris@417 771
Chris@417 772 f.open(QFile::ReadOnly);
Chris@417 773 bool glob = false;
Chris@606 774 bool cr = false; // whether the last line examined ended with a CR
Chris@417 775 while (!f.atEnd()) {
Chris@417 776 QByteArray ba = f.readLine();
Chris@606 777 QString s = QString::fromLocal8Bit(ba);
Chris@606 778 cr = (s.endsWith('\n') || s.endsWith('\r'));
Chris@606 779 s = s.trimmed();
Chris@417 780 if (s.startsWith("syntax:")) {
Chris@417 781 if (s.endsWith("glob")) {
Chris@417 782 glob = true;
Chris@417 783 } else {
Chris@417 784 glob = false;
Chris@417 785 }
Chris@417 786 }
Chris@417 787 }
Chris@417 788 f.close();
Chris@417 789
Chris@417 790 f.open(QFile::Append);
Chris@417 791 QTextStream out(&f);
Chris@417 792
Chris@606 793 if (!cr) {
Chris@606 794 out << endl;
Chris@606 795 }
Chris@606 796
Chris@417 797 if (!glob) {
Chris@417 798 out << "syntax: glob" << endl;
Chris@417 799 }
Chris@417 800
Chris@421 801 QString info = "<qt><h3>" + tr("Ignored files") + "</h3><p>";
Chris@421 802 info += tr("The following lines have been added to the .hgignore file for this working copy:");
Chris@421 803 info += "</p><code>";
Chris@421 804
Chris@421 805 QStringList args;
Chris@417 806 if (itype == HgIgnoreDialog::IgnoreAllFilesOfGivenSuffixes) {
Chris@421 807 args = QStringList::fromSet(suffixes);
Chris@421 808 } else if (itype == HgIgnoreDialog::IgnoreGivenFilesOnly) {
Chris@421 809 args = files;
Chris@421 810 } else if (itype == HgIgnoreDialog::IgnoreAllFilesOfGivenNames) {
Chris@421 811 QSet<QString> names;
Chris@421 812 foreach (QString f, files) {
Chris@421 813 names << QFileInfo(f).fileName();
Chris@417 814 }
Chris@421 815 args = QStringList::fromSet(names);
Chris@421 816 } else if (itype == HgIgnoreDialog::IgnoreWholeDirectory) {
Chris@421 817 args << directory;
Chris@421 818 }
Chris@421 819
Chris@421 820 bool first = true;
Chris@421 821
Chris@421 822 foreach (QString a, args) {
Chris@421 823 QString line;
Chris@421 824 if (itype == HgIgnoreDialog::IgnoreAllFilesOfGivenSuffixes) {
Chris@421 825 line = "*." + a;
Chris@421 826 } else if (itype == HgIgnoreDialog::IgnoreGivenFilesOnly) {
Chris@421 827 // Doesn't seem to be possible to do this with a glob,
Chris@421 828 // because the glob is always unanchored and there is no
Chris@421 829 // equivalent of ^ to anchor it
chris@423 830 line = "re:^" + regexEscape(a) + "$";
Chris@421 831 } else if (itype == HgIgnoreDialog::IgnoreAllFilesOfGivenNames) {
Chris@421 832 line = a;
Chris@421 833 } else if (itype == HgIgnoreDialog::IgnoreWholeDirectory) {
Chris@421 834 line = "re:^" + regexEscape(a) + "/";
Chris@418 835 }
Chris@421 836 if (line != "") {
Chris@421 837 out << line << endl;
Chris@421 838 if (!first) info += "<br>";
Chris@421 839 first = false;
Chris@421 840 info += xmlEncode(line);
Chris@417 841 }
Chris@417 842 }
Chris@417 843
Chris@419 844 f.close();
Chris@419 845
Chris@421 846 info += "</code></qt>";
Chris@421 847
Chris@421 848 QMessageBox::information(this, tr("Ignored files"),
Chris@421 849 info);
Chris@421 850
Chris@417 851 hgRefresh();
Chris@326 852 }
Chris@326 853
Chris@326 854 void MainWindow::hgUnIgnoreFiles(QStringList files)
Chris@326 855 {
Chris@421 856 // Not implemented: edit the .hgignore instead
Chris@421 857 hgEditIgnore();
Chris@326 858 }
Chris@326 859
sam@624 860 void MainWindow::hgShowIn(QStringList files)
sam@624 861 {
sam@624 862 foreach (QString file, files)
sam@624 863 {
sam@624 864 QStringList args;
sam@624 865 #if defined Q_OS_WIN32
sam@624 866 // Although the Win32 API is quite happy to have
sam@624 867 // forward slashes as directory separators, Windows
sam@624 868 // Explorer is not
sam@624 869 file = file.replace('/', '\\');
sam@624 870 args << "/select," << file;
sam@624 871 // FIXME: This shouldn't be using a hardcoded path.
sam@624 872 QProcess::execute("c:/windows/explorer.exe", args);
sam@624 873 #else if defined(Q_OS_MAC)
sam@624 874 args << file;
sam@624 875 QProcess::execute("/usr/bin/open", args);
sam@624 876 #endif
sam@624 877 }
sam@624 878 }
sam@624 879
Chris@239 880 QString MainWindow::getDiffBinaryName()
Chris@179 881 {
Chris@179 882 QSettings settings;
Chris@179 883 settings.beginGroup("Locations");
Chris@239 884 return settings.value("extdiffbinary", "").toString();
Chris@179 885 }
Chris@179 886
Chris@239 887 QString MainWindow::getMergeBinaryName()
Chris@179 888 {
Chris@179 889 QSettings settings;
Chris@179 890 settings.beginGroup("Locations");
Chris@239 891 return settings.value("mergebinary", "").toString();
Chris@179 892 }
Chris@179 893
Chris@168 894 void MainWindow::hgShowSummary()
Chris@168 895 {
Chris@168 896 QStringList params;
Chris@168 897
Chris@168 898 params << "diff" << "--stat";
Chris@168 899
Chris@288 900 m_runner->requestAction(HgAction(ACT_UNCOMMITTED_SUMMARY, m_workFolderPath, params));
Chris@168 901 }
Chris@168 902
jtkorhonen@0 903 void MainWindow::hgFolderDiff()
jtkorhonen@0 904 {
Chris@326 905 hgDiffFiles(QStringList());
Chris@326 906 }
Chris@326 907
Chris@326 908 void MainWindow::hgDiffFiles(QStringList files)
Chris@326 909 {
Chris@239 910 QString diff = getDiffBinaryName();
Chris@179 911 if (diff == "") return;
Chris@112 912
Chris@109 913 QStringList params;
jtkorhonen@0 914
Chris@112 915 // Diff parent against working folder (folder diff)
Chris@112 916
Chris@148 917 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@179 918 params << "--program" << diff;
Chris@109 919
Chris@331 920 params << "--" << files; // may be none: whole dir
Chris@273 921
Chris@284 922 m_runner->requestAction(HgAction(ACT_FOLDERDIFF, m_workFolderPath, params));
jtkorhonen@0 923 }
jtkorhonen@0 924
Chris@148 925 void MainWindow::hgDiffToCurrent(QString id)
jtkorhonen@0 926 {
Chris@239 927 QString diff = getDiffBinaryName();
Chris@179 928 if (diff == "") return;
Chris@163 929
Chris@148 930 QStringList params;
jtkorhonen@0 931
Chris@148 932 // Diff given revision against working folder
jtkorhonen@0 933
Chris@148 934 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@179 935 params << "--program" << diff;
Chris@153 936 params << "--rev" << Changeset::hashOf(id);
Chris@148 937
Chris@284 938 m_runner->requestAction(HgAction(ACT_FOLDERDIFF, m_workFolderPath, params));
jtkorhonen@0 939 }
jtkorhonen@0 940
Chris@148 941 void MainWindow::hgDiffToParent(QString child, QString parent)
Chris@148 942 {
Chris@239 943 QString diff = getDiffBinaryName();
Chris@179 944 if (diff == "") return;
Chris@163 945
Chris@148 946 QStringList params;
Chris@148 947
Chris@281 948 // Diff given revision against parent revision
Chris@148 949
Chris@148 950 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@179 951 params << "--program" << diff;
Chris@153 952 params << "--rev" << Changeset::hashOf(parent)
Chris@153 953 << "--rev" << Changeset::hashOf(child);
Chris@148 954
Chris@284 955 m_runner->requestAction(HgAction(ACT_CHGSETDIFF, m_workFolderPath, params));
Chris@273 956 }
Chris@326 957
Chris@273 958
Chris@289 959 void MainWindow::hgShowSummaryFor(Changeset *cs)
Chris@288 960 {
Chris@288 961 QStringList params;
Chris@288 962
Chris@289 963 // This will pick a default parent if there is more than one
Chris@289 964 // (whereas with diff we need to supply one). But it does need a
Chris@289 965 // bit more parsing
Chris@289 966 params << "log" << "--stat" << "--rev" << Changeset::hashOf(cs->id());
Chris@289 967
Chris@289 968 m_runner->requestAction(HgAction(ACT_DIFF_SUMMARY, m_workFolderPath,
Chris@289 969 params, cs));
Chris@148 970 }
Chris@148 971
jtkorhonen@0 972
jtkorhonen@0 973 void MainWindow::hgUpdate()
jtkorhonen@0 974 {
Chris@109 975 QStringList params;
jtkorhonen@0 976
Chris@109 977 params << "update";
Chris@109 978
Chris@284 979 m_runner->requestAction(HgAction(ACT_UPDATE, m_workFolderPath, params));
jtkorhonen@0 980 }
jtkorhonen@0 981
jtkorhonen@0 982
Chris@148 983 void MainWindow::hgUpdateToRev(QString id)
jtkorhonen@0 984 {
Chris@148 985 QStringList params;
jtkorhonen@0 986
Chris@153 987 params << "update" << "--rev" << Changeset::hashOf(id) << "--check";
jtkorhonen@0 988
Chris@284 989 m_runner->requestAction(HgAction(ACT_UPDATE, m_workFolderPath, params));
jtkorhonen@0 990 }
jtkorhonen@0 991
jtkorhonen@0 992
jtkorhonen@0 993 void MainWindow::hgRevert()
jtkorhonen@0 994 {
Chris@326 995 hgRevertFiles(QStringList());
Chris@326 996 }
Chris@326 997
Chris@326 998 void MainWindow::hgRevertFiles(QStringList files)
Chris@326 999 {
Chris@109 1000 QStringList params;
Chris@109 1001 QString comment;
Chris@237 1002 bool all = false;
Chris@98 1003
Chris@284 1004 QStringList allFiles = m_hgTabs->getAllRevertableFiles();
Chris@237 1005 if (files.empty() || files == allFiles) {
Chris@237 1006 files = allFiles;
Chris@237 1007 all = true;
Chris@237 1008 }
Chris@237 1009
Chris@237 1010 QString subsetNote;
Chris@237 1011 if (!all) {
Chris@237 1012 subsetNote = tr("<p><b>Note:</b> you are reverting only the files you have selected, not all of the files that have been changed!");
Chris@237 1013 }
Chris@155 1014
Chris@155 1015 QString rf(tr("Revert files"));
Chris@237 1016
Chris@237 1017 // Set up params before asking for confirmation, because there is
Chris@237 1018 // a failure case here that we would need to report on early
Chris@237 1019
Chris@284 1020 DEBUG << "hgRevert: m_justMerged = " << m_justMerged << ", m_mergeTargetRevision = " << m_mergeTargetRevision << endl;
Chris@273 1021
Chris@284 1022 if (m_justMerged) {
Chris@237 1023
Chris@237 1024 // This is a little fiddly. The proper way to "revert" the
Chris@237 1025 // whole of an uncommitted merge is with "hg update --clean ."
Chris@237 1026 // But if the user has selected only some files, we're sort of
Chris@237 1027 // promising to revert only those, which means we need to
Chris@237 1028 // specify which parent to revert to. We can only do that if
Chris@237 1029 // we have a record of it, which we do if you just did the
Chris@237 1030 // merge from within easyhg but don't if you've exited and
Chris@237 1031 // restarted, or changed repository, since then. Hmmm.
Chris@237 1032
Chris@237 1033 if (all) {
Chris@237 1034 params << "update" << "--clean" << ".";
Chris@237 1035 } else {
Chris@284 1036 if (m_mergeTargetRevision != "") {
Chris@237 1037 params << "revert" << "--rev"
Chris@284 1038 << Changeset::hashOf(m_mergeTargetRevision)
Chris@237 1039 << "--" << files;
Chris@237 1040 } else {
Chris@237 1041 QMessageBox::information
Chris@237 1042 (this, tr("Unable to revert"),
Chris@237 1043 tr("<qt><b>Sorry, unable to revert these files</b><br><br>EasyMercurial can only revert a subset of files during a merge if it still has a record of which parent was the original merge target; that information is no longer available.<br><br>This is a limitation of EasyMercurial. Consider reverting all files, or using hg revert with a specific revision at the command-line instead.</qt>"));
Chris@237 1044 return;
Chris@237 1045 }
Chris@237 1046 }
Chris@237 1047 } else {
Chris@237 1048 params << "revert" << "--" << files;
Chris@237 1049 }
Chris@237 1050
Chris@109 1051 if (ConfirmCommentDialog::confirmDangerousFilesAction
Chris@109 1052 (this,
Chris@155 1053 rf,
Chris@237 1054 tr("<h3>%1</h3><p>%2%3").arg(rf)
Chris@237 1055 .arg(tr("You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed."))
Chris@237 1056 .arg(subsetNote),
Chris@237 1057 tr("<h3>%1</h3><p>%2%3").arg(rf)
Chris@237 1058 .arg(tr("You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.", "", files.size()))
Chris@237 1059 .arg(subsetNote),
Chris@193 1060 files,
Chris@365 1061 tr("Re&vert"))) {
Chris@163 1062
Chris@284 1063 m_lastRevertedFiles = files;
Chris@109 1064
Chris@284 1065 m_runner->requestAction(HgAction(ACT_REVERT, m_workFolderPath, params));
jtkorhonen@0 1066 }
jtkorhonen@0 1067 }
jtkorhonen@0 1068
Chris@163 1069
Chris@361 1070 void MainWindow::hgRenameFiles(QStringList files)
Chris@361 1071 {
Chris@361 1072 QString renameTo;
Chris@361 1073
Chris@361 1074 QString file;
Chris@361 1075 if (files.empty()) return;
Chris@361 1076 file = files[0];
Chris@361 1077
Chris@361 1078 if (ConfirmCommentDialog::confirmAndGetShortComment
Chris@361 1079 (this,
Chris@361 1080 tr("Rename"),
Chris@361 1081 tr("Rename <code>%1</code> to:").arg(xmlEncode(file)),
Chris@361 1082 renameTo,
Chris@365 1083 tr("Re&name"))) {
Chris@361 1084
Chris@361 1085 if (renameTo != "" && renameTo != file) {
Chris@361 1086
Chris@361 1087 QStringList params;
Chris@361 1088
Chris@361 1089 params << "rename" << "--" << file << renameTo;
Chris@361 1090
Chris@361 1091 m_runner->requestAction(HgAction(ACT_RENAME_FILE, m_workFolderPath, params));
Chris@361 1092 }
Chris@361 1093 }
Chris@361 1094 }
Chris@361 1095
Chris@361 1096
Chris@361 1097 void MainWindow::hgCopyFiles(QStringList files)
Chris@361 1098 {
Chris@361 1099 QString copyTo;
Chris@361 1100
Chris@361 1101 QString file;
Chris@361 1102 if (files.empty()) return;
Chris@361 1103 file = files[0];
Chris@361 1104
Chris@361 1105 if (ConfirmCommentDialog::confirmAndGetShortComment
Chris@361 1106 (this,
Chris@361 1107 tr("Copy"),
Chris@361 1108 tr("Copy <code>%1</code> to:").arg(xmlEncode(file)),
Chris@361 1109 copyTo,
Chris@365 1110 tr("Co&py"))) {
Chris@361 1111
Chris@361 1112 if (copyTo != "" && copyTo != file) {
Chris@361 1113
Chris@361 1114 QStringList params;
Chris@361 1115
Chris@361 1116 params << "copy" << "--" << file << copyTo;
Chris@361 1117
Chris@361 1118 m_runner->requestAction(HgAction(ACT_COPY_FILE, m_workFolderPath, params));
Chris@361 1119 }
Chris@361 1120 }
Chris@361 1121 }
Chris@361 1122
Chris@361 1123
Chris@326 1124 void MainWindow::hgMarkFilesResolved(QStringList files)
Chris@163 1125 {
Chris@163 1126 QStringList params;
Chris@163 1127
Chris@163 1128 params << "resolve" << "--mark";
Chris@163 1129
Chris@163 1130 if (files.empty()) {
Chris@163 1131 params << "--all";
Chris@163 1132 } else {
Chris@164 1133 params << "--" << files;
Chris@163 1134 }
Chris@163 1135
Chris@284 1136 m_runner->requestAction(HgAction(ACT_RESOLVE_MARK, m_workFolderPath, params));
Chris@163 1137 }
Chris@163 1138
Chris@163 1139
Chris@326 1140 void MainWindow::hgRedoMerge()
Chris@326 1141 {
Chris@326 1142 hgRedoFileMerges(QStringList());
Chris@326 1143 }
Chris@326 1144
Chris@326 1145
Chris@326 1146 void MainWindow::hgRedoFileMerges(QStringList files)
jtkorhonen@33 1147 {
Chris@109 1148 QStringList params;
jtkorhonen@33 1149
Chris@163 1150 params << "resolve";
Chris@163 1151
Chris@239 1152 QString merge = getMergeBinaryName();
Chris@179 1153 if (merge != "") {
Chris@179 1154 params << "--tool" << merge;
Chris@163 1155 }
Chris@163 1156
Chris@163 1157 if (files.empty()) {
Chris@163 1158 params << "--all";
Chris@163 1159 } else {
Chris@164 1160 params << "--" << files;
Chris@163 1161 }
Chris@163 1162
Chris@284 1163 if (m_currentParents.size() == 1) {
Chris@284 1164 m_mergeTargetRevision = m_currentParents[0]->id();
Chris@237 1165 }
Chris@237 1166
Chris@284 1167 m_runner->requestAction(HgAction(ACT_RETRY_MERGE, m_workFolderPath, params));
Chris@273 1168
Chris@284 1169 m_mergeCommitComment = tr("Merge");
jtkorhonen@33 1170 }
Chris@326 1171
jtkorhonen@33 1172
jtkorhonen@0 1173 void MainWindow::hgMerge()
jtkorhonen@0 1174 {
Chris@284 1175 if (m_hgTabs->canResolve()) {
Chris@326 1176 hgRedoMerge();
Chris@163 1177 return;
Chris@163 1178 }
Chris@163 1179
Chris@109 1180 QStringList params;
jtkorhonen@0 1181
Chris@109 1182 params << "merge";
Chris@163 1183
Chris@239 1184 QString merge = getMergeBinaryName();
Chris@179 1185 if (merge != "") {
Chris@179 1186 params << "--tool" << merge;
Chris@163 1187 }
Chris@163 1188
Chris@284 1189 if (m_currentParents.size() == 1) {
Chris@284 1190 m_mergeTargetRevision = m_currentParents[0]->id();
Chris@163 1191 }
Chris@163 1192
Chris@284 1193 m_runner->requestAction(HgAction(ACT_MERGE, m_workFolderPath, params));
Chris@273 1194
Chris@284 1195 m_mergeCommitComment = tr("Merge");
jtkorhonen@0 1196 }
jtkorhonen@0 1197
jtkorhonen@0 1198
Chris@148 1199 void MainWindow::hgMergeFrom(QString id)
Chris@148 1200 {
Chris@148 1201 QStringList params;
Chris@148 1202
Chris@148 1203 params << "merge";
Chris@153 1204 params << "--rev" << Changeset::hashOf(id);
Chris@163 1205
Chris@239 1206 QString merge = getMergeBinaryName();
Chris@179 1207 if (merge != "") {
Chris@179 1208 params << "--tool" << merge;
Chris@163 1209 }
Chris@148 1210
Chris@284 1211 if (m_currentParents.size() == 1) {
Chris@284 1212 m_mergeTargetRevision = m_currentParents[0]->id();
Chris@237 1213 }
Chris@237 1214
Chris@284 1215 m_runner->requestAction(HgAction(ACT_MERGE, m_workFolderPath, params));
Chris@273 1216
Chris@284 1217 m_mergeCommitComment = "";
Chris@273 1218
Chris@284 1219 foreach (Changeset *cs, m_currentHeads) {
Chris@284 1220 if (cs->id() == id && !cs->isOnBranch(m_currentBranch)) {
Chris@157 1221 if (cs->branch() == "" || cs->branch() == "default") {
Chris@284 1222 m_mergeCommitComment = tr("Merge from the default branch");
Chris@157 1223 } else {
Chris@284 1224 m_mergeCommitComment = tr("Merge from branch \"%1\"").arg(cs->branch());
Chris@157 1225 }
Chris@157 1226 }
Chris@157 1227 }
Chris@157 1228
Chris@284 1229 if (m_mergeCommitComment == "") {
Chris@284 1230 m_mergeCommitComment = tr("Merge from %1").arg(id);
Chris@157 1231 }
Chris@148 1232 }
Chris@148 1233
Chris@148 1234
jtkorhonen@0 1235 void MainWindow::hgCloneFromRemote()
jtkorhonen@0 1236 {
Chris@109 1237 QStringList params;
jtkorhonen@0 1238
Chris@284 1239 if (!QDir(m_workFolderPath).exists()) {
Chris@284 1240 if (!QDir().mkpath(m_workFolderPath)) {
Chris@109 1241 DEBUG << "hgCloneFromRemote: Failed to create target path "
Chris@284 1242 << m_workFolderPath << endl;
Chris@607 1243 QMessageBox::critical
Chris@607 1244 (this, tr("Could not create target folder"),
Chris@607 1245 tr("<qt><b>Could not create target folder</b><br><br>The local target folder \"%1\" does not exist<br>and could not be created.</qt>").arg(xmlEncode(m_workFolderPath)));
Chris@608 1246 m_workFolderPath = "";
Chris@109 1247 return;
Chris@104 1248 }
Chris@109 1249 }
Chris@104 1250
Chris@284 1251 params << "clone" << m_remoteRepoPath << m_workFolderPath;
Chris@109 1252
Chris@287 1253 updateWorkFolderAndRepoNames();
Chris@284 1254 m_hgTabs->updateWorkFolderFileList("");
Chris@608 1255 m_hgTabs->clearAll();
Chris@273 1256
Chris@284 1257 m_runner->requestAction(HgAction(ACT_CLONEFROMREMOTE, m_workFolderPath, params));
jtkorhonen@0 1258 }
jtkorhonen@0 1259
jtkorhonen@0 1260 void MainWindow::hgInit()
jtkorhonen@0 1261 {
Chris@109 1262 QStringList params;
jtkorhonen@0 1263
Chris@109 1264 params << "init";
Chris@284 1265 params << m_workFolderPath;
Chris@273 1266
Chris@284 1267 m_runner->requestAction(HgAction(ACT_INIT, m_workFolderPath, params));
jtkorhonen@0 1268 }
jtkorhonen@0 1269
jtkorhonen@0 1270 void MainWindow::hgIncoming()
jtkorhonen@0 1271 {
Chris@109 1272 QStringList params;
jtkorhonen@0 1273
Chris@284 1274 params << "incoming" << "--newest-first" << m_remoteRepoPath;
Chris@125 1275 params << "--template" << Changeset::getLogTemplate();
jtkorhonen@0 1276
Chris@284 1277 m_runner->requestAction(HgAction(ACT_INCOMING, m_workFolderPath, params));
jtkorhonen@0 1278 }
jtkorhonen@0 1279
jtkorhonen@0 1280 void MainWindow::hgPull()
jtkorhonen@0 1281 {
Chris@193 1282 if (ConfirmCommentDialog::confirm
Chris@126 1283 (this, tr("Confirm pull"),
Chris@299 1284 tr("<qt><h3>Pull from remote repository?</h3></qt>"),
Chris@299 1285 tr("<qt><p>You are about to pull changes from the remote repository at <code>%1</code>.</p></qt>").arg(xmlEncode(m_remoteRepoPath)),
Chris@365 1286 tr("&Pull"))) {
jtkorhonen@0 1287
Chris@126 1288 QStringList params;
Chris@284 1289 params << "pull" << m_remoteRepoPath;
Chris@284 1290 m_runner->requestAction(HgAction(ACT_PULL, m_workFolderPath, params));
Chris@126 1291 }
jtkorhonen@0 1292 }
jtkorhonen@0 1293
jtkorhonen@0 1294 void MainWindow::hgPush()
jtkorhonen@0 1295 {
Chris@363 1296 if (m_remoteRepoPath.isEmpty()) {
Chris@363 1297 changeRemoteRepo(true);
Chris@363 1298 if (m_remoteRepoPath.isEmpty()) return;
Chris@363 1299 }
Chris@363 1300
Chris@356 1301 QString uncommittedNote;
Chris@356 1302 if (m_hgTabs->canCommit()) {
Chris@356 1303 uncommittedNote = tr("<p><b>Note:</b> You have uncommitted changes. If you want to push these changes to the remote repository, you need to commit them first.");
Chris@356 1304 }
Chris@356 1305
Chris@193 1306 if (ConfirmCommentDialog::confirm
Chris@126 1307 (this, tr("Confirm push"),
Chris@299 1308 tr("<qt><h3>Push to remote repository?</h3></qt>"),
Chris@356 1309 tr("<qt><p>You are about to push your commits to the remote repository at <code>%1</code>.</p>%2</qt>").arg(xmlEncode(m_remoteRepoPath)).arg(uncommittedNote),
Chris@365 1310 tr("&Push"))) {
jtkorhonen@0 1311
Chris@126 1312 QStringList params;
Chris@284 1313 params << "push" << "--new-branch" << m_remoteRepoPath;
Chris@284 1314 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params));
Chris@126 1315 }
jtkorhonen@0 1316 }
jtkorhonen@0 1317
Chris@182 1318 QStringList MainWindow::listAllUpIpV4Addresses()
jtkorhonen@26 1319 {
Chris@182 1320 QStringList ret;
jtkorhonen@26 1321 QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
jtkorhonen@26 1322
Chris@182 1323 for (int i = 0; i < ifaces.count(); i++) {
jtkorhonen@26 1324 QNetworkInterface iface = ifaces.at(i);
Chris@182 1325 if (iface.flags().testFlag(QNetworkInterface::IsUp)
Chris@182 1326 && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
Chris@182 1327 for (int j=0; j<iface.addressEntries().count(); j++) {
jtkorhonen@28 1328 QHostAddress tmp = iface.addressEntries().at(j).ip();
Chris@182 1329 if (QAbstractSocket::IPv4Protocol == tmp.protocol()) {
Chris@182 1330 ret.push_back(tmp.toString());
jtkorhonen@24 1331 }
jtkorhonen@24 1332 }
jtkorhonen@22 1333 }
jtkorhonen@17 1334 }
jtkorhonen@28 1335 return ret;
jtkorhonen@28 1336 }
jtkorhonen@17 1337
Chris@120 1338 void MainWindow::clearState()
Chris@120 1339 {
Chris@305 1340 DEBUG << "MainWindow::clearState" << endl;
Chris@284 1341 foreach (Changeset *cs, m_currentParents) delete cs;
Chris@284 1342 m_currentParents.clear();
Chris@284 1343 foreach (Changeset *cs, m_currentHeads) delete cs;
Chris@284 1344 m_currentHeads.clear();
Chris@506 1345 m_closedHeadIds.clear();
Chris@284 1346 m_currentBranch = "";
Chris@284 1347 m_lastStatOutput = "";
Chris@284 1348 m_lastRevertedFiles.clear();
Chris@284 1349 m_mergeTargetRevision = "";
Chris@284 1350 m_mergeCommitComment = "";
Chris@284 1351 m_stateUnknown = true;
Chris@284 1352 m_needNewLog = true;
Chris@120 1353 }
jtkorhonen@17 1354
jtkorhonen@11 1355 void MainWindow::hgServe()
jtkorhonen@11 1356 {
Chris@109 1357 QStringList params;
Chris@109 1358 QString msg;
jtkorhonen@11 1359
Chris@182 1360 QStringList addrs = listAllUpIpV4Addresses();
Chris@182 1361
Chris@182 1362 if (addrs.empty()) {
Chris@182 1363 QMessageBox::critical
Chris@182 1364 (this, tr("Serve"), tr("Failed to identify an active IPv4 address"));
Chris@182 1365 return;
Chris@182 1366 }
Chris@182 1367
Chris@526 1368 // See #202. We really want to display the port that the server
Chris@526 1369 // ends up using -- but we don't get that information until after
Chris@526 1370 // it has exited! However, we can improve the likelihood of
Chris@526 1371 // showing the right port by at least checking whether a port is
Chris@526 1372 // defined in the hgrc file.
Chris@526 1373
Chris@526 1374 QFileInfo hgrc(QDir::homePath() + "/.hgrc");
Chris@526 1375 QString path;
Chris@526 1376 int port = 8000; // the default
Chris@526 1377 if (hgrc.exists()) {
Chris@526 1378 QSettings s(hgrc.canonicalFilePath(), QSettings::IniFormat);
Chris@526 1379 s.beginGroup("web");
Chris@527 1380 int p = s.value("port").toInt();
Chris@527 1381 if (p) port = p;
Chris@526 1382 }
Chris@182 1383
Chris@182 1384 QTextStream ts(&msg);
Chris@429 1385 ts << QString("<qt><h3>%1</h3><p>%2</p>")
Chris@425 1386 .arg(tr("Sharing Repository"))
Chris@429 1387 .arg(tr("Your local repository is now being made temporarily available via HTTP for workgroup access."));
Chris@429 1388 if (addrs.size() > 1) {
Chris@429 1389 ts << QString("<p>%3</p>")
Chris@429 1390 .arg(tr("Users who have network access to your computer can now clone your repository, by using one of the following URLs as a remote location:"));
Chris@429 1391 } else {
Chris@429 1392 ts << QString("<p>%3</p>")
Chris@429 1393 .arg(tr("Users who have network access to your computer can now clone your repository, by using the following URL as a remote location:"));
Chris@429 1394 }
Chris@182 1395 foreach (QString addr, addrs) {
Chris@526 1396 ts << QString("<pre>&nbsp;&nbsp;http://%1:%2</pre>").arg(xmlEncode(addr)).arg(port);
Chris@182 1397 }
Chris@425 1398 ts << tr("<p>Press Close to terminate this server, end remote access, and return.</p>");
Chris@182 1399 ts.flush();
Chris@182 1400
Chris@109 1401 params << "serve";
jtkorhonen@11 1402
Chris@284 1403 m_runner->requestAction(HgAction(ACT_SERVE, m_workFolderPath, params));
Chris@109 1404
Chris@425 1405 QMessageBox::information(this, tr("Share Repository"), msg, QMessageBox::Close);
Chris@182 1406
Chris@284 1407 m_runner->killCurrentActions();
jtkorhonen@11 1408 }
jtkorhonen@11 1409
Chris@64 1410 void MainWindow::startupDialog()
Chris@64 1411 {
Chris@64 1412 StartupDialog *dlg = new StartupDialog(this);
Chris@284 1413 if (dlg->exec()) m_firstStart = false;
Chris@344 1414 else exit(0);
Chris@64 1415 }
jtkorhonen@11 1416
Chris@69 1417 void MainWindow::open()
Chris@69 1418 {
Chris@86 1419 bool done = false;
Chris@69 1420
Chris@86 1421 while (!done) {
Chris@69 1422
Chris@86 1423 MultiChoiceDialog *d = new MultiChoiceDialog
Chris@86 1424 (tr("Open Repository"),
Chris@86 1425 tr("<qt><big>What would you like to open?</big></qt>"),
Chris@86 1426 this);
Chris@69 1427
Chris@345 1428 d->addChoice("remote",
Chris@345 1429 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
Chris@345 1430 tr("Open a remote Mercurial repository, by cloning from its URL into a local folder."),
Chris@345 1431 MultiChoiceDialog::UrlToDirectoryArg);
Chris@345 1432
Chris@339 1433 d->addChoice("local",
Chris@339 1434 tr("<qt><center><img src=\":images/hglogo-64.png\"><br>Local repository</center></qt>"),
Chris@339 1435 tr("Open an existing local Mercurial repository."),
Chris@339 1436 MultiChoiceDialog::DirectoryArg);
Chris@339 1437
Chris@339 1438 d->addChoice("init",
Chris@339 1439 tr("<qt><center><img src=\":images/hdd_unmount-64.png\"><br>File folder</center></qt>"),
Chris@339 1440 tr("Open a local folder, by creating a Mercurial repository in it."),
Chris@339 1441 MultiChoiceDialog::DirectoryArg);
Chris@339 1442
Chris@248 1443 QSettings settings;
Chris@484 1444 settings.beginGroup("");
Chris@359 1445 QString lastChoice = settings.value("lastopentype", "remote").toString();
Chris@248 1446 if (lastChoice != "local" &&
Chris@248 1447 lastChoice != "remote" &&
Chris@248 1448 lastChoice != "init") {
Chris@359 1449 lastChoice = "remote";
Chris@248 1450 }
Chris@248 1451
Chris@248 1452 d->setCurrentChoice(lastChoice);
Chris@86 1453
Chris@86 1454 if (d->exec() == QDialog::Accepted) {
Chris@86 1455
Chris@86 1456 QString choice = d->getCurrentChoice();
Chris@248 1457 settings.setValue("lastopentype", choice);
Chris@248 1458
Chris@86 1459 QString arg = d->getArgument().trimmed();
Chris@86 1460
Chris@86 1461 bool result = false;
Chris@86 1462
Chris@86 1463 if (choice == "local") {
Chris@86 1464 result = openLocal(arg);
Chris@86 1465 } else if (choice == "remote") {
Chris@86 1466 result = openRemote(arg, d->getAdditionalArgument().trimmed());
Chris@86 1467 } else if (choice == "init") {
Chris@86 1468 result = openInit(arg);
Chris@86 1469 }
Chris@86 1470
Chris@86 1471 if (result) {
Chris@86 1472 enableDisableActions();
Chris@120 1473 clearState();
Chris@109 1474 hgQueryPaths();
Chris@91 1475 done = true;
Chris@91 1476 }
Chris@86 1477
Chris@86 1478 } else {
Chris@86 1479
Chris@86 1480 // cancelled
Chris@86 1481 done = true;
Chris@69 1482 }
Chris@79 1483
Chris@86 1484 delete d;
Chris@69 1485 }
Chris@69 1486 }
Chris@69 1487
Chris@359 1488 void MainWindow::recentMenuActivated()
Chris@359 1489 {
Chris@359 1490 QAction *a = qobject_cast<QAction *>(sender());
Chris@359 1491 if (!a) return;
Chris@359 1492 QString local = a->text();
Chris@359 1493 open(local);
Chris@359 1494 }
Chris@359 1495
Chris@182 1496 void MainWindow::changeRemoteRepo()
Chris@182 1497 {
Chris@363 1498 changeRemoteRepo(false);
Chris@363 1499 }
Chris@363 1500
Chris@363 1501 void MainWindow::changeRemoteRepo(bool initial)
Chris@363 1502 {
Chris@183 1503 // This will involve rewriting the local .hgrc
Chris@183 1504
Chris@284 1505 QDir hgDir(m_workFolderPath + "/.hg");
Chris@184 1506 if (!hgDir.exists()) {
Chris@184 1507 //!!! visible error!
Chris@184 1508 return;
Chris@184 1509 }
Chris@184 1510
Chris@284 1511 QFileInfo hgrc(m_workFolderPath + "/.hg/hgrc");
Chris@184 1512 if (hgrc.exists() && !hgrc.isWritable()) {
Chris@183 1513 //!!! visible error!
Chris@183 1514 return;
Chris@183 1515 }
Chris@183 1516
Chris@183 1517 MultiChoiceDialog *d = new MultiChoiceDialog
Chris@363 1518 (tr("Set Remote Location"),
Chris@363 1519 tr("<qt><big>Set the remote location</big></qt>"),
Chris@183 1520 this);
Chris@183 1521
Chris@363 1522 QString explanation;
Chris@363 1523 if (initial) {
Chris@609 1524 explanation = tr("Provide a remote URL to use when pushing from, or pulling to, the local<br>repository <code>%1</code>.<br>This will be the default for subsequent pushes and pulls.<br>You can change it using &ldquo;Set Remote Location&rdquo; on the File menu.").arg(m_workFolderPath);
Chris@363 1525 } else {
Chris@609 1526 explanation = tr("Provide a new remote URL to use when pushing from, or pulling to, the local<br>repository <code>%1</code>.").arg(m_workFolderPath);
Chris@363 1527 }
Chris@363 1528
Chris@183 1529 d->addChoice("remote",
Chris@183 1530 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
Chris@363 1531 explanation,
Chris@553 1532 MultiChoiceDialog::UrlArg,
Chris@553 1533 true); // default empty
Chris@183 1534
Chris@183 1535 if (d->exec() == QDialog::Accepted) {
Chris@210 1536
Chris@210 1537 // New block to ensure QSettings is deleted before
Chris@210 1538 // hgQueryPaths called. NB use of absoluteFilePath instead of
Chris@210 1539 // canonicalFilePath, which would fail if the file did not yet
Chris@210 1540 // exist
Chris@210 1541
Chris@210 1542 {
Chris@210 1543 QSettings s(hgrc.absoluteFilePath(), QSettings::IniFormat);
Chris@210 1544 s.beginGroup("paths");
Chris@210 1545 s.setValue("default", d->getArgument());
Chris@210 1546 }
Chris@210 1547
Chris@284 1548 m_stateUnknown = true;
Chris@183 1549 hgQueryPaths();
Chris@183 1550 }
Chris@183 1551
Chris@183 1552 delete d;
Chris@182 1553 }
Chris@182 1554
Chris@145 1555 void MainWindow::open(QString local)
Chris@145 1556 {
Chris@145 1557 if (openLocal(local)) {
Chris@145 1558 enableDisableActions();
Chris@145 1559 clearState();
Chris@145 1560 hgQueryPaths();
Chris@145 1561 }
Chris@145 1562 }
Chris@145 1563
Chris@79 1564 bool MainWindow::complainAboutFilePath(QString arg)
Chris@79 1565 {
Chris@79 1566 QMessageBox::critical
Chris@79 1567 (this, tr("File chosen"),
Chris@84 1568 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 1569 return false;
Chris@79 1570 }
Chris@79 1571
Chris@248 1572 bool MainWindow::askAboutUnknownFolder(QString arg)
Chris@248 1573 {
Chris@248 1574 bool result = (QMessageBox::question
Chris@248 1575 (this, tr("Path does not exist"),
Chris@248 1576 tr("<qt><b>Path does not exist: create it?</b><br><br>You asked to open a remote repository by cloning it to \"%1\". This folder does not exist, and neither does its parent.<br><br>Would you like to create the parent folder as well?</qt>").arg(xmlEncode(arg)),
Chris@248 1577 QMessageBox::Ok | QMessageBox::Cancel,
Chris@248 1578 QMessageBox::Cancel)
Chris@248 1579 == QMessageBox::Ok);
Chris@248 1580 if (result) {
Chris@248 1581 QDir dir(arg);
Chris@248 1582 dir.cdUp();
Chris@248 1583 if (!dir.mkpath(dir.absolutePath())) {
Chris@248 1584 QMessageBox::critical
Chris@248 1585 (this, tr("Failed to create folder"),
Chris@248 1586 tr("<qt><b>Failed to create folder</b><br><br>Sorry, the path for the parent folder \"%1\" could not be created.</qt>").arg(dir.absolutePath()));
Chris@248 1587 return false;
Chris@248 1588 }
Chris@248 1589 return true;
Chris@248 1590 }
Chris@248 1591 return false;
Chris@248 1592 }
Chris@248 1593
Chris@79 1594 bool MainWindow::complainAboutUnknownFolder(QString arg)
Chris@79 1595 {
Chris@79 1596 QMessageBox::critical
Chris@79 1597 (this, tr("Folder does not exist"),
Chris@84 1598 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 1599 return false;
Chris@84 1600 }
Chris@84 1601
Chris@84 1602 bool MainWindow::complainAboutInitInRepo(QString arg)
Chris@84 1603 {
Chris@84 1604 QMessageBox::critical
Chris@84 1605 (this, tr("Path is in existing repository"),
Chris@84 1606 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 1607 return false;
Chris@84 1608 }
Chris@84 1609
Chris@84 1610 bool MainWindow::complainAboutInitFile(QString arg)
Chris@84 1611 {
Chris@84 1612 QMessageBox::critical
Chris@84 1613 (this, tr("Path is a file"),
Chris@84 1614 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 1615 return false;
Chris@84 1616 }
Chris@84 1617
Chris@84 1618 bool MainWindow::complainAboutCloneToExisting(QString arg)
Chris@84 1619 {
Chris@84 1620 QMessageBox::critical
Chris@84 1621 (this, tr("Path is in existing repository"),
Chris@237 1622 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 different folder name for the local repository.</qt>").arg(xmlEncode(arg)));
Chris@84 1623 return false;
Chris@84 1624 }
Chris@84 1625
Chris@84 1626 bool MainWindow::complainAboutCloneToFile(QString arg)
Chris@84 1627 {
Chris@84 1628 QMessageBox::critical
Chris@84 1629 (this, tr("Path is a file"),
Chris@84 1630 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 1631 return false;
Chris@84 1632 }
Chris@84 1633
Chris@237 1634 QString MainWindow::complainAboutCloneToExistingFolder(QString arg, QString remote)
Chris@84 1635 {
Chris@348 1636 // If the directory "arg" exists but is empty, then we accept it.
Chris@348 1637
Chris@348 1638 // If the directory "arg" exists and is non-empty, but "arg" plus
Chris@348 1639 // the last path component of "remote" does not exist, then offer
Chris@348 1640 // the latter as an alternative path.
Chris@237 1641
Chris@237 1642 QString offer;
Chris@237 1643
Chris@237 1644 QDir d(arg);
Chris@348 1645
Chris@237 1646 if (d.exists()) {
Chris@348 1647
Chris@348 1648 if (d.entryList(QDir::Dirs | QDir::Files |
Chris@348 1649 QDir::NoDotAndDotDot |
Chris@348 1650 QDir::Hidden | QDir::System).empty()) {
Chris@348 1651 // directory is empty; accept it
Chris@348 1652 return arg;
Chris@348 1653 }
Chris@348 1654
Chris@237 1655 if (QRegExp("^\\w+://").indexIn(remote) >= 0) {
Chris@237 1656 QString rpath = QUrl(remote).path();
Chris@237 1657 if (rpath != "") {
Chris@237 1658 rpath = QDir(rpath).dirName();
Chris@237 1659 if (rpath != "" && !d.exists(rpath)) {
Chris@237 1660 offer = d.filePath(rpath);
Chris@237 1661 }
Chris@237 1662 }
Chris@237 1663 }
Chris@237 1664 }
Chris@237 1665
Chris@237 1666 if (offer != "") {
Chris@237 1667 bool result = (QMessageBox::question
Chris@237 1668 (this, tr("Folder exists"),
Chris@237 1669 tr("<qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to \"%1\", but this folder already exists and so cannot be cloned to.<br><br>Would you like to create the new folder \"%2\" instead?</qt>")
Chris@237 1670 .arg(xmlEncode(arg)).arg(xmlEncode(offer)),
Chris@237 1671 QMessageBox::Ok | QMessageBox::Cancel,
Chris@237 1672 QMessageBox::Cancel)
Chris@237 1673 == QMessageBox::Ok);
Chris@237 1674 if (result) return offer;
Chris@237 1675 else return "";
Chris@237 1676 }
Chris@237 1677
Chris@84 1678 QMessageBox::critical
Chris@84 1679 (this, tr("Folder exists"),
Chris@237 1680 tr("<qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to \"%1\", but this file or folder already exists and so cannot be cloned to.<br>Please provide a different folder name for the local repository.</qt>").arg(xmlEncode(arg)));
Chris@237 1681 return "";
Chris@79 1682 }
Chris@79 1683
Chris@79 1684 bool MainWindow::askToOpenParentRepo(QString arg, QString parent)
Chris@79 1685 {
Chris@79 1686 return (QMessageBox::question
Chris@84 1687 (this, tr("Path is inside a repository"),
Chris@86 1688 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 1689 .arg(xmlEncode(arg)).arg(xmlEncode(parent)),
Chris@79 1690 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1691 QMessageBox::Ok)
Chris@79 1692 == QMessageBox::Ok);
Chris@79 1693 }
Chris@79 1694
Chris@79 1695 bool MainWindow::askToInitExisting(QString arg)
Chris@79 1696 {
Chris@79 1697 return (QMessageBox::question
Chris@84 1698 (this, tr("Folder has no repository"),
Chris@359 1699 tr("<qt><b>Initialise a repository here?</b><br><br>You asked to open \"%1\".<br>This folder is not a Mercurial working copy.<br><br>Would you like to initialise a repository here?</qt>")
Chris@79 1700 .arg(xmlEncode(arg)),
Chris@79 1701 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1702 QMessageBox::Ok)
Chris@79 1703 == QMessageBox::Ok);
Chris@79 1704 }
Chris@79 1705
Chris@79 1706 bool MainWindow::askToInitNew(QString arg)
Chris@79 1707 {
Chris@79 1708 return (QMessageBox::question
Chris@84 1709 (this, tr("Folder does not exist"),
Chris@84 1710 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 1711 .arg(xmlEncode(arg)),
Chris@84 1712 QMessageBox::Ok | QMessageBox::Cancel,
Chris@84 1713 QMessageBox::Ok)
Chris@84 1714 == QMessageBox::Ok);
Chris@84 1715 }
Chris@84 1716
Chris@84 1717 bool MainWindow::askToOpenInsteadOfInit(QString arg)
Chris@84 1718 {
Chris@84 1719 return (QMessageBox::question
Chris@84 1720 (this, tr("Repository exists"),
Chris@84 1721 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 1722 .arg(xmlEncode(arg)),
Chris@79 1723 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1724 QMessageBox::Ok)
Chris@79 1725 == QMessageBox::Ok);
Chris@79 1726 }
Chris@79 1727
Chris@79 1728 bool MainWindow::openLocal(QString local)
Chris@79 1729 {
Chris@79 1730 DEBUG << "open " << local << endl;
Chris@79 1731
Chris@79 1732 FolderStatus status = getFolderStatus(local);
Chris@79 1733 QString containing = getContainingRepoFolder(local);
Chris@79 1734
Chris@79 1735 switch (status) {
Chris@79 1736
Chris@79 1737 case FolderHasRepo:
Chris@79 1738 // fine
Chris@79 1739 break;
Chris@79 1740
Chris@79 1741 case FolderExists:
Chris@79 1742 if (containing != "") {
Chris@79 1743 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1744 local = containing;
Chris@79 1745 } else {
Chris@86 1746 //!!! No -- this is likely to happen far more by accident
Chris@86 1747 // than because the user actually wanted to init something.
Chris@86 1748 // Don't ask, just politely reject.
Chris@79 1749 if (!askToInitExisting(local)) return false;
Chris@79 1750 return openInit(local);
Chris@79 1751 }
Chris@79 1752 break;
Chris@79 1753
Chris@79 1754 case FolderParentExists:
Chris@79 1755 if (containing != "") {
Chris@79 1756 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1757 local = containing;
Chris@79 1758 } else {
Chris@79 1759 if (!askToInitNew(local)) return false;
Chris@79 1760 return openInit(local);
Chris@79 1761 }
Chris@79 1762 break;
Chris@79 1763
Chris@79 1764 case FolderUnknown:
Chris@84 1765 if (containing != "") {
Chris@84 1766 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1767 local = containing;
Chris@84 1768 } else {
Chris@84 1769 return complainAboutUnknownFolder(local);
Chris@84 1770 }
Chris@84 1771 break;
Chris@79 1772
Chris@79 1773 case FolderIsFile:
Chris@79 1774 return complainAboutFilePath(local);
Chris@79 1775 }
Chris@79 1776
Chris@284 1777 m_workFolderPath = local;
Chris@284 1778 m_remoteRepoPath = "";
Chris@79 1779 return true;
Chris@79 1780 }
Chris@79 1781
Chris@79 1782 bool MainWindow::openRemote(QString remote, QString local)
Chris@79 1783 {
Chris@79 1784 DEBUG << "clone " << remote << " to " << local << endl;
Chris@84 1785
Chris@84 1786 FolderStatus status = getFolderStatus(local);
Chris@84 1787 QString containing = getContainingRepoFolder(local);
Chris@84 1788
Chris@84 1789 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 1790
Chris@84 1791 if (status == FolderHasRepo || containing != "") {
Chris@84 1792 return complainAboutCloneToExisting(local);
Chris@84 1793 }
Chris@84 1794
Chris@84 1795 if (status == FolderIsFile) {
Chris@84 1796 return complainAboutCloneToFile(local);
Chris@84 1797 }
Chris@84 1798
Chris@84 1799 if (status == FolderUnknown) {
Chris@248 1800 if (!askAboutUnknownFolder(local)) {
Chris@248 1801 return false;
Chris@248 1802 }
Chris@84 1803 }
Chris@84 1804
Chris@84 1805 if (status == FolderExists) {
Chris@237 1806 local = complainAboutCloneToExistingFolder(local, remote);
Chris@237 1807 if (local == "") return false;
Chris@84 1808 }
Chris@84 1809
Chris@284 1810 m_workFolderPath = local;
Chris@284 1811 m_remoteRepoPath = remote;
Chris@84 1812 hgCloneFromRemote();
Chris@84 1813
Chris@79 1814 return true;
Chris@79 1815 }
Chris@79 1816
Chris@84 1817 bool MainWindow::openInit(QString local)
Chris@79 1818 {
Chris@84 1819 DEBUG << "openInit " << local << endl;
Chris@84 1820
Chris@84 1821 FolderStatus status = getFolderStatus(local);
Chris@84 1822 QString containing = getContainingRepoFolder(local);
Chris@84 1823
Chris@84 1824 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 1825
Chris@84 1826 if (status == FolderHasRepo) {
Chris@84 1827 if (!askToOpenInsteadOfInit(local)) return false;
Chris@552 1828 return openLocal(local);
Chris@84 1829 }
Chris@84 1830
Chris@84 1831 if (containing != "") {
Chris@84 1832 return complainAboutInitInRepo(local);
Chris@84 1833 }
Chris@84 1834
Chris@84 1835 if (status == FolderIsFile) {
Chris@84 1836 return complainAboutInitFile(local);
Chris@84 1837 }
Chris@84 1838
Chris@84 1839 if (status == FolderUnknown) {
Chris@84 1840 return complainAboutUnknownFolder(local);
Chris@84 1841 }
Chris@84 1842
Chris@284 1843 m_workFolderPath = local;
Chris@284 1844 m_remoteRepoPath = "";
Chris@84 1845 hgInit();
Chris@79 1846 return true;
Chris@79 1847 }
Chris@79 1848
jtkorhonen@0 1849 void MainWindow::settings()
jtkorhonen@0 1850 {
Chris@472 1851 settings(SettingsDialog::PersonalDetailsTab);
Chris@472 1852 }
Chris@472 1853
Chris@472 1854 void MainWindow::settings(SettingsDialog::Tab tab)
Chris@472 1855 {
jtkorhonen@0 1856 SettingsDialog *settingsDlg = new SettingsDialog(this);
Chris@472 1857 settingsDlg->setCurrentTab(tab);
jtkorhonen@0 1858 settingsDlg->exec();
Chris@230 1859
Chris@230 1860 if (settingsDlg->presentationChanged()) {
Chris@284 1861 m_hgTabs->updateFileStates();
Chris@230 1862 updateToolBarStyle();
Chris@273 1863 hgRefresh();
Chris@230 1864 }
jtkorhonen@0 1865 }
jtkorhonen@0 1866
Chris@541 1867 void MainWindow::updateFsWatcher()
Chris@541 1868 {
Chris@541 1869 m_fsWatcher->setWorkDirPath(m_workFolderPath);
Chris@541 1870 m_fsWatcher->setTrackedFilePaths(m_hgTabs->getFileStates().trackedFiles());
Chris@541 1871 }
Chris@541 1872
Chris@238 1873 void MainWindow::checkFilesystem()
Chris@238 1874 {
Chris@238 1875 DEBUG << "MainWindow::checkFilesystem" << endl;
Chris@541 1876 if (!m_commandSequenceInProgress) {
Chris@541 1877 if (!m_fsWatcher->getChangedPaths(m_fsWatcherToken).empty()) {
Chris@541 1878 hgRefresh();
Chris@541 1879 return;
Chris@541 1880 }
Chris@549 1881 updateFsWatcher();
Chris@541 1882 }
Chris@90 1883 }
Chris@90 1884
Chris@275 1885 QString MainWindow::format1(QString head)
Chris@275 1886 {
Chris@275 1887 return QString("<qt><h3>%1</h3></qt>").arg(head);
Chris@275 1888 }
Chris@275 1889
Chris@125 1890 QString MainWindow::format3(QString head, QString intro, QString code)
Chris@125 1891 {
Chris@196 1892 code = xmlEncode(code).replace("\n", "<br>")
Chris@196 1893 #ifndef Q_OS_WIN32
Chris@196 1894 // The hard hyphen comes out funny on Windows
Chris@196 1895 .replace("-", "&#8209;")
Chris@196 1896 #endif
Chris@196 1897 .replace(" ", "&nbsp;");
Chris@125 1898 if (intro == "") {
Chris@168 1899 return QString("<qt><h3>%1</h3><p><code>%2</code></p>")
Chris@168 1900 .arg(head).arg(code);
Chris@126 1901 } else if (code == "") {
Chris@126 1902 return QString("<qt><h3>%1</h3><p>%2</p>")
Chris@126 1903 .arg(head).arg(intro);
Chris@125 1904 } else {
Chris@168 1905 return QString("<qt><h3>%1</h3><p>%2</p><p><code>%3</code></p>")
Chris@168 1906 .arg(head).arg(intro).arg(code);
Chris@125 1907 }
Chris@125 1908 }
Chris@125 1909
Chris@120 1910 void MainWindow::showIncoming(QString output)
Chris@120 1911 {
Chris@284 1912 m_runner->hide();
Chris@125 1913 IncomingDialog *d = new IncomingDialog(this, output);
Chris@125 1914 d->exec();
Chris@125 1915 delete d;
Chris@125 1916 }
Chris@125 1917
Chris@125 1918 int MainWindow::extractChangeCount(QString text)
Chris@125 1919 {
Chris@125 1920 QRegExp re("added (\\d+) ch\\w+ with (\\d+) ch\\w+ to (\\d+) f\\w+");
Chris@125 1921 if (re.indexIn(text) >= 0) {
Chris@125 1922 return re.cap(1).toInt();
Chris@125 1923 } else if (text.contains("no changes")) {
Chris@125 1924 return 0;
Chris@125 1925 } else {
Chris@125 1926 return -1; // unknown
Chris@125 1927 }
Chris@120 1928 }
Chris@120 1929
Chris@120 1930 void MainWindow::showPushResult(QString output)
Chris@120 1931 {
Chris@291 1932 QString head;
Chris@125 1933 QString report;
Chris@125 1934 int n = extractChangeCount(output);
Chris@125 1935 if (n > 0) {
Chris@291 1936 head = tr("Pushed %n changeset(s)", "", n);
Chris@300 1937 report = tr("<qt>Successfully pushed to the remote repository at <code>%1</code>.</qt>").arg(xmlEncode(m_remoteRepoPath));
Chris@125 1938 } else if (n == 0) {
Chris@291 1939 head = tr("No changes to push");
Chris@291 1940 report = tr("The remote repository already contains all changes that have been committed locally.");
Chris@294 1941 if (m_hgTabs->canCommit()) {
Chris@291 1942 report = tr("%1<p>You do have some uncommitted changes. If you wish to push those to the remote repository, commit them locally first.").arg(report);
Chris@291 1943 }
Chris@125 1944 } else {
Chris@291 1945 head = tr("Push complete");
Chris@125 1946 }
Chris@284 1947 m_runner->hide();
Chris@291 1948
Chris@291 1949 MoreInformationDialog::information(this, tr("Push complete"),
Chris@291 1950 head, report, output);
Chris@120 1951 }
Chris@120 1952
Chris@120 1953 void MainWindow::showPullResult(QString output)
Chris@120 1954 {
Chris@291 1955 QString head;
Chris@125 1956 QString report;
Chris@125 1957 int n = extractChangeCount(output);
Chris@125 1958 if (n > 0) {
Chris@291 1959 head = tr("Pulled %n changeset(s)", "", n);
Chris@322 1960 report = tr("New changes will be highlighted in yellow in the history.");
Chris@125 1961 } else if (n == 0) {
Chris@291 1962 head = tr("No changes to pull");
Chris@291 1963 report = tr("Your local repository already contains all changes found in the remote repository.");
Chris@125 1964 } else {
Chris@291 1965 head = tr("Pull complete");
Chris@125 1966 }
Chris@284 1967 m_runner->hide();
Chris@275 1968
Chris@275 1969 MoreInformationDialog::information(this, tr("Pull complete"),
Chris@291 1970 head, report, output);
Chris@120 1971 }
Chris@120 1972
Chris@174 1973 void MainWindow::reportNewRemoteHeads(QString output)
Chris@174 1974 {
Chris@174 1975 bool headsAreLocal = false;
Chris@174 1976
Chris@284 1977 if (m_currentParents.size() == 1) {
Chris@506 1978 int currentBranchActiveHeads = 0;
Chris@174 1979 bool parentIsHead = false;
Chris@284 1980 Changeset *parent = m_currentParents[0];
Chris@506 1981 foreach (Changeset *head, m_activeHeads) {
Chris@284 1982 if (head->isOnBranch(m_currentBranch)) {
Chris@506 1983 ++currentBranchActiveHeads;
Chris@174 1984 }
Chris@174 1985 if (parent->id() == head->id()) {
Chris@174 1986 parentIsHead = true;
Chris@174 1987 }
Chris@174 1988 }
Chris@506 1989 if (currentBranchActiveHeads == 2 && parentIsHead) {
Chris@174 1990 headsAreLocal = true;
Chris@174 1991 }
Chris@174 1992 }
Chris@174 1993
Chris@174 1994 if (headsAreLocal) {
Chris@291 1995 MoreInformationDialog::warning
Chris@291 1996 (this,
Chris@291 1997 tr("Push failed"),
Chris@291 1998 tr("Push failed"),
Chris@291 1999 tr("Your local repository could not be pushed to the remote repository.<br><br>You may need to merge the changes locally first."),
Chris@291 2000 output);
Chris@318 2001 } else if (m_hgTabs->canCommit() && m_currentParents.size() > 1) {
Chris@318 2002 MoreInformationDialog::warning
Chris@318 2003 (this,
Chris@318 2004 tr("Push failed"),
Chris@318 2005 tr("Push failed"),
Chris@318 2006 tr("Your local repository could not be pushed to the remote repository.<br><br>You have an uncommitted merge in your local folder. You probably need to commit it before you push."),
Chris@318 2007 output);
Chris@174 2008 } else {
Chris@291 2009 MoreInformationDialog::warning
Chris@291 2010 (this,
Chris@291 2011 tr("Push failed"),
Chris@291 2012 tr("Push failed"),
Chris@291 2013 tr("Your local repository could not be pushed to the remote repository.<br><br>The remote repository may have been changed by someone else since you last pushed. Try pulling and merging their changes into your local repository first."),
Chris@291 2014 output);
Chris@174 2015 }
Chris@174 2016 }
Chris@174 2017
Chris@353 2018 void MainWindow::reportAuthFailed(QString output)
Chris@353 2019 {
Chris@353 2020 MoreInformationDialog::warning
Chris@353 2021 (this,
Chris@353 2022 tr("Authorization failed"),
Chris@353 2023 tr("Authorization failed"),
Chris@353 2024 tr("You may have entered an incorrect user name or password, or the remote URL may be wrong.<br><br>Or you may lack the necessary permissions on the remote repository.<br><br>Check with the administrator of your remote repository if necessary."),
Chris@353 2025 output);
Chris@353 2026 }
Chris@353 2027
Chris@238 2028 void MainWindow::commandStarting(HgAction action)
Chris@238 2029 {
Chris@540 2030 m_commandSequenceInProgress = true;
Chris@238 2031 }
Chris@238 2032
Chris@546 2033 void MainWindow::commandFailed(HgAction action, QString stdErr, QString stdOut)
Chris@62 2034 {
Chris@62 2035 DEBUG << "MainWindow::commandFailed" << endl;
Chris@540 2036
Chris@540 2037 m_commandSequenceInProgress = false;
Chris@74 2038
Chris@210 2039 QString setstr;
Chris@210 2040 #ifdef Q_OS_MAC
Chris@210 2041 setstr = tr("Preferences");
Chris@210 2042 #else
Chris@210 2043 setstr = tr("Settings");
Chris@210 2044 #endif
Chris@210 2045
Chris@353 2046 // Some commands we just have to ignore bad return values from,
Chris@353 2047 // and some output gets special treatment.
Chris@353 2048
Chris@353 2049 // Note our fallback case should always be to report a
Chris@353 2050 // non-specific error and show the text -- in case output scraping
Chris@353 2051 // fails (as it surely will). Note also that we must force the
Chris@353 2052 // locale in order to ensure the output is scrapable; this happens
Chris@353 2053 // in HgRunner and may break some system encodings.
Chris@113 2054
Chris@113 2055 switch(action.action) {
Chris@113 2056 case ACT_NONE:
Chris@113 2057 // uh huh
Chris@113 2058 return;
Chris@175 2059 case ACT_TEST_HG:
Chris@291 2060 MoreInformationDialog::warning
Chris@291 2061 (this,
Chris@291 2062 tr("Failed to run Mercurial"),
Chris@291 2063 tr("Failed to run Mercurial"),
Chris@483 2064 tr("The Mercurial program either could not be found or failed to run.<br><br>Check that the Mercurial program path is correct in %1.").arg(setstr),
Chris@545 2065 stdErr);
Chris@472 2066 settings(SettingsDialog::PathsTab);
Chris@200 2067 return;
Chris@200 2068 case ACT_TEST_HG_EXT:
Chris@309 2069 MoreInformationDialog::warning
Chris@291 2070 (this,
Chris@291 2071 tr("Failed to run Mercurial"),
Chris@291 2072 tr("Failed to run Mercurial with extension enabled"),
Chris@310 2073 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication might not work if you do this.").arg(setstr),
Chris@545 2074 stdErr);
Chris@472 2075 settings(SettingsDialog::PathsTab);
Chris@175 2076 return;
Chris@252 2077 case ACT_CLONEFROMREMOTE:
Chris@252 2078 // if clone fails, we have no repo
Chris@284 2079 m_workFolderPath = "";
Chris@252 2080 enableDisableActions();
Chris@330 2081 break; // go on to default report
Chris@113 2082 case ACT_INCOMING:
Chris@545 2083 if (stdErr.contains("authorization failed")) {
Chris@545 2084 reportAuthFailed(stdErr);
Chris@353 2085 return;
Chris@545 2086 } else if (stdErr.contains("entry cancelled")) {
Chris@358 2087 // ignore this, user cancelled username or password dialog
Chris@358 2088 return;
Chris@353 2089 } else {
Chris@545 2090 // Incoming returns non-zero code and no stdErr if the
Chris@353 2091 // check was successful but there are no changes
Chris@353 2092 // pending. This is the only case where we need to remove
Chris@353 2093 // warning messages, because it's the only case where a
Chris@353 2094 // non-zero code can be returned even though the command
Chris@353 2095 // has for our purposes succeeded
Chris@545 2096 QString replaced = stdErr;
Chris@352 2097 while (1) {
Chris@352 2098 QString r1 = replaced;
Chris@352 2099 r1.replace(QRegExp("warning: [^\\n]*"), "");
Chris@352 2100 if (r1 == replaced) break;
Chris@352 2101 replaced = r1.trimmed();
Chris@352 2102 }
Chris@352 2103 if (replaced == "") {
Chris@352 2104 showIncoming("");
Chris@352 2105 return;
Chris@352 2106 }
Chris@211 2107 }
Chris@330 2108 break; // go on to default report
Chris@353 2109 case ACT_PULL:
Chris@545 2110 if (stdErr.contains("authorization failed")) {
Chris@545 2111 reportAuthFailed(stdErr);
Chris@353 2112 return;
Chris@545 2113 } else if (stdErr.contains("entry cancelled")) {
Chris@358 2114 // ignore this, user cancelled username or password dialog
Chris@358 2115 return;
Chris@546 2116 } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
Chris@537 2117 // success: hg 2.1 starts returning failure code for empty pull/push
Chris@540 2118 m_commandSequenceInProgress = true; // there may be further commands
Chris@546 2119 commandCompleted(action, stdOut);
Chris@537 2120 return;
Chris@353 2121 }
Chris@353 2122 break; // go on to default report
Chris@353 2123 case ACT_PUSH:
Chris@545 2124 if (stdErr.contains("creates new remote head")) {
Chris@545 2125 reportNewRemoteHeads(stdErr);
Chris@353 2126 return;
Chris@545 2127 } else if (stdErr.contains("authorization failed")) {
Chris@545 2128 reportAuthFailed(stdErr);
Chris@353 2129 return;
Chris@545 2130 } else if (stdErr.contains("entry cancelled")) {
Chris@358 2131 // ignore this, user cancelled username or password dialog
Chris@358 2132 return;
Chris@546 2133 } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
Chris@537 2134 // success: hg 2.1 starts returning failure code for empty pull/push
Chris@540 2135 m_commandSequenceInProgress = true; // there may be further commands
Chris@546 2136 commandCompleted(action, stdOut);
Chris@537 2137 return;
Chris@353 2138 }
Chris@353 2139 break; // go on to default report
Chris@506 2140 case ACT_QUERY_HEADS_ACTIVE:
Chris@162 2141 case ACT_QUERY_HEADS:
Chris@162 2142 // fails if repo is empty; we don't care (if there's a genuine
Chris@202 2143 // problem, something else will fail too). Pretend it
Chris@202 2144 // succeeded, so that any further actions that are contingent
Chris@202 2145 // on the success of the heads query get carried out properly.
Chris@540 2146 m_commandSequenceInProgress = true; // there may be further commands
Chris@202 2147 commandCompleted(action, "");
Chris@162 2148 return;
Chris@113 2149 case ACT_FOLDERDIFF:
Chris@113 2150 case ACT_CHGSETDIFF:
Chris@545 2151 // external program, unlikely to be anything useful in stdErr
Chris@113 2152 // and some return with failure codes when something as basic
Chris@113 2153 // as the user closing the window via the wm happens
Chris@113 2154 return;
Chris@328 2155 case ACT_MERGE:
Chris@545 2156 if (stdErr.contains("working directory ancestor")) {
Chris@530 2157 // arguably we should prevent this upfront, but that's
Chris@530 2158 // trickier!
Chris@530 2159 MoreInformationDialog::information
Chris@530 2160 (this, tr("Merge"), tr("Merge has no effect"),
Chris@530 2161 tr("You asked to merge a revision with one of its ancestors.<p>This has no effect, because the ancestor's changes already exist in both revisions."),
Chris@545 2162 stdErr);
Chris@530 2163 return;
Chris@530 2164 }
Chris@530 2165 // else fall through
Chris@328 2166 case ACT_RETRY_MERGE:
Chris@328 2167 MoreInformationDialog::information
Chris@328 2168 (this, tr("Merge"), tr("Merge failed"),
Chris@328 2169 tr("Some files were not merged successfully.<p>You can Merge again to repeat the interactive merge; use Revert to abandon the merge entirely; or edit the files that are in conflict in an editor and, when you are happy with them, choose Mark Resolved in each file's right-button menu."),
Chris@545 2170 stdErr);
Chris@378 2171 m_mergeCommitComment = "";
Chris@603 2172 hgQueryPaths();
Chris@328 2173 return;
Chris@199 2174 case ACT_STAT:
Chris@330 2175 break; // go on to default report
Chris@113 2176 default:
Chris@114 2177 break;
Chris@113 2178 }
Chris@113 2179
Chris@113 2180 QString command = action.executable;
Chris@113 2181 if (command == "") command = "hg";
Chris@113 2182 foreach (QString arg, action.params) {
Chris@113 2183 command += " " + arg;
Chris@113 2184 }
Chris@113 2185
Chris@309 2186 MoreInformationDialog::warning
Chris@309 2187 (this,
Chris@309 2188 tr("Command failed"),
Chris@309 2189 tr("Command failed"),
Chris@545 2190 (stdErr == "" ?
Chris@483 2191 tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.") :
Chris@483 2192 tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See &ldquo;More Details&rdquo; for the command output.")),
Chris@545 2193 stdErr);
Chris@62 2194 }
Chris@62 2195
Chris@109 2196 void MainWindow::commandCompleted(HgAction completedAction, QString output)
jtkorhonen@0 2197 {
Chris@521 2198 // std::cerr << "commandCompleted: " << completedAction.action << std::endl;
Chris@519 2199
Chris@109 2200 HGACTIONS action = completedAction.action;
Chris@109 2201
Chris@109 2202 if (action == ACT_NONE) return;
Chris@109 2203
Chris@519 2204 output.replace("\r\n", "\n");
Chris@519 2205
Chris@150 2206 bool headsChanged = false;
Chris@150 2207 QStringList oldHeadIds;
Chris@150 2208
Chris@150 2209 switch (action) {
Chris@109 2210
Chris@175 2211 case ACT_TEST_HG:
Chris@377 2212 {
Chris@377 2213 QRegExp versionRE("^Mercurial.*version ([\\d+])\\.([\\d+])");
Chris@377 2214 int pos = versionRE.indexIn(output);
Chris@377 2215 if (pos >= 0) {
Chris@377 2216 int major = versionRE.cap(1).toInt();
Chris@377 2217 int minor = versionRE.cap(2).toInt();
Chris@377 2218 // We need v1.7 or newer
Chris@377 2219 if (major < 1 || (major == 1 && minor < 7)) {
Chris@377 2220 MoreInformationDialog::warning
Chris@377 2221 (this,
Chris@377 2222 tr("Newer Mercurial version required"),
Chris@377 2223 tr("Newer Mercurial version required"),
Chris@377 2224 tr("To use EasyMercurial, you should have at least Mercurial v1.7 installed.<br><br>The version found on this system (v%1.%2) does not support all of the features required by EasyMercurial.").arg(major).arg(minor),
Chris@377 2225 output);
Chris@377 2226 }
Chris@377 2227 }
Chris@175 2228 break;
Chris@377 2229 }
Chris@175 2230
Chris@200 2231 case ACT_TEST_HG_EXT:
Chris@200 2232 break;
Chris@200 2233
Chris@109 2234 case ACT_QUERY_PATHS:
jtkorhonen@0 2235 {
Chris@109 2236 DEBUG << "stdout is " << output << endl;
Chris@109 2237 LogParser lp(output, "=");
Chris@109 2238 LogList ll = lp.parse();
Chris@109 2239 DEBUG << ll.size() << " results" << endl;
Chris@109 2240 if (!ll.empty()) {
Chris@284 2241 m_remoteRepoPath = lp.parse()[0]["default"].trimmed();
Chris@284 2242 DEBUG << "Set remote path to " << m_remoteRepoPath << endl;
Chris@210 2243 } else {
Chris@284 2244 m_remoteRepoPath = "";
Chris@109 2245 }
Chris@284 2246 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 2247 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@287 2248 updateWorkFolderAndRepoNames();
Chris@109 2249 break;
Chris@109 2250 }
jtkorhonen@0 2251
Chris@109 2252 case ACT_QUERY_BRANCH:
Chris@284 2253 m_currentBranch = output.trimmed();
Chris@109 2254 break;
jtkorhonen@0 2255
Chris@109 2256 case ACT_STAT:
Chris@284 2257 m_lastStatOutput = output;
Chris@109 2258 break;
Chris@163 2259
Chris@163 2260 case ACT_RESOLVE_LIST:
Chris@505 2261 // This happens on every update, after the stat (above)
Chris@163 2262 if (output != "") {
Chris@163 2263 // Remove lines beginning with R (they are resolved,
Chris@163 2264 // and the file stat parser treats R as removed)
Chris@163 2265 QStringList outList = output.split('\n');
Chris@163 2266 QStringList winnowed;
Chris@163 2267 foreach (QString line, outList) {
Chris@163 2268 if (!line.startsWith("R ")) winnowed.push_back(line);
Chris@163 2269 }
Chris@163 2270 output = winnowed.join("\n");
Chris@163 2271 }
Chris@284 2272 DEBUG << "m_lastStatOutput = " << m_lastStatOutput << endl;
Chris@199 2273 DEBUG << "resolve output = " << output << endl;
Chris@284 2274 m_hgTabs->updateWorkFolderFileList(m_lastStatOutput + output);
Chris@163 2275 break;
Chris@163 2276
Chris@163 2277 case ACT_RESOLVE_MARK:
Chris@284 2278 m_shouldHgStat = true;
Chris@163 2279 break;
Chris@109 2280
Chris@109 2281 case ACT_INCOMING:
Chris@120 2282 showIncoming(output);
Chris@120 2283 break;
Chris@120 2284
Chris@109 2285 case ACT_ANNOTATE:
Chris@331 2286 {
Chris@331 2287 AnnotateDialog dialog(this, output);
Chris@331 2288 dialog.exec();
Chris@284 2289 m_shouldHgStat = true;
Chris@109 2290 break;
Chris@331 2291 }
Chris@109 2292
Chris@109 2293 case ACT_PULL:
Chris@120 2294 showPullResult(output);
Chris@284 2295 m_shouldHgStat = true;
Chris@109 2296 break;
Chris@109 2297
Chris@109 2298 case ACT_PUSH:
Chris@120 2299 showPushResult(output);
Chris@109 2300 break;
Chris@109 2301
Chris@109 2302 case ACT_INIT:
Chris@284 2303 MultiChoiceDialog::addRecentArgument("init", m_workFolderPath);
Chris@284 2304 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@109 2305 enableDisableActions();
Chris@284 2306 m_shouldHgStat = true;
Chris@109 2307 break;
Chris@109 2308
Chris@109 2309 case ACT_CLONEFROMREMOTE:
Chris@284 2310 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 2311 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@284 2312 MultiChoiceDialog::addRecentArgument("remote", m_workFolderPath, true);
Chris@291 2313 MoreInformationDialog::information
Chris@291 2314 (this,
Chris@291 2315 tr("Clone"),
Chris@384 2316 tr("Open successful"),
Chris@295 2317 tr("The remote repository was successfully cloned to the local folder <code>%1</code>.").arg(xmlEncode(m_workFolderPath)),
Chris@291 2318 output);
Chris@109 2319 enableDisableActions();
Chris@284 2320 m_shouldHgStat = true;
Chris@109 2321 break;
Chris@109 2322
Chris@109 2323 case ACT_LOG:
Chris@284 2324 m_hgTabs->setNewLog(output);
Chris@284 2325 m_needNewLog = false;
Chris@120 2326 break;
Chris@120 2327
Chris@120 2328 case ACT_LOG_INCREMENTAL:
Chris@284 2329 m_hgTabs->addIncrementalLog(output);
Chris@109 2330 break;
Chris@109 2331
Chris@109 2332 case ACT_QUERY_PARENTS:
Chris@152 2333 {
Chris@284 2334 foreach (Changeset *cs, m_currentParents) delete cs;
Chris@284 2335 m_currentParents = Changeset::parseChangesets(output);
Chris@284 2336 QStringList parentIds = Changeset::getIds(m_currentParents);
Chris@284 2337 m_hgTabs->setCurrent(parentIds, m_currentBranch);
Chris@152 2338 }
Chris@109 2339 break;
Chris@109 2340
Chris@506 2341 case ACT_QUERY_HEADS_ACTIVE:
Chris@506 2342 foreach (Changeset *cs, m_activeHeads) delete cs;
Chris@506 2343 m_activeHeads = Changeset::parseChangesets(output);
Chris@506 2344 break;
Chris@506 2345
Chris@109 2346 case ACT_QUERY_HEADS:
Chris@150 2347 {
Chris@284 2348 oldHeadIds = Changeset::getIds(m_currentHeads);
Chris@150 2349 Changesets newHeads = Changeset::parseChangesets(output);
Chris@150 2350 QStringList newHeadIds = Changeset::getIds(newHeads);
Chris@150 2351 if (oldHeadIds != newHeadIds) {
Chris@150 2352 DEBUG << "Heads changed, will prompt an incremental log if appropriate" << endl;
Chris@305 2353 DEBUG << "Old heads: " << oldHeadIds.join(",") << endl;
Chris@305 2354 DEBUG << "New heads: " << newHeadIds.join(",") << endl;
Chris@150 2355 headsChanged = true;
Chris@284 2356 foreach (Changeset *cs, m_currentHeads) delete cs;
Chris@284 2357 m_currentHeads = newHeads;
Chris@506 2358 updateClosedHeads();
Chris@150 2359 }
Chris@150 2360 }
Chris@109 2361 break;
Chris@130 2362
Chris@130 2363 case ACT_COMMIT:
Chris@347 2364 if (m_currentParents.empty()) {
Chris@347 2365 // first commit to empty repo
Chris@347 2366 m_needNewLog = true;
Chris@347 2367 }
Chris@284 2368 m_hgTabs->clearSelections();
Chris@284 2369 m_justMerged = false;
Chris@284 2370 m_shouldHgStat = true;
Chris@130 2371 break;
Chris@163 2372
Chris@514 2373 case ACT_CLOSE_BRANCH:
Chris@514 2374 m_hgTabs->clearSelections();
Chris@514 2375 m_justMerged = false;
Chris@514 2376 m_shouldHgStat = true;
Chris@514 2377 break;
Chris@514 2378
Chris@163 2379 case ACT_REVERT:
Chris@326 2380 hgMarkFilesResolved(m_lastRevertedFiles);
Chris@284 2381 m_justMerged = false;
Chris@163 2382 break;
Chris@109 2383
Chris@109 2384 case ACT_REMOVE:
Chris@109 2385 case ACT_ADD:
Chris@284 2386 m_hgTabs->clearSelections();
Chris@284 2387 m_shouldHgStat = true;
Chris@116 2388 break;
Chris@116 2389
Chris@164 2390 case ACT_TAG:
Chris@284 2391 m_needNewLog = true;
Chris@284 2392 m_shouldHgStat = true;
Chris@164 2393 break;
Chris@164 2394
Chris@278 2395 case ACT_NEW_BRANCH:
Chris@307 2396 m_shouldHgStat = true;
Chris@278 2397 break;
Chris@278 2398
Chris@288 2399 case ACT_UNCOMMITTED_SUMMARY:
Chris@168 2400 QMessageBox::information(this, tr("Change summary"),
Chris@168 2401 format3(tr("Summary of uncommitted changes"),
Chris@168 2402 "",
Chris@168 2403 output));
Chris@168 2404 break;
Chris@168 2405
Chris@288 2406 case ACT_DIFF_SUMMARY:
Chris@289 2407 {
Chris@289 2408 // Output has log info first, diff following after a blank line
Chris@289 2409 QStringList olist = output.split("\n\n", QString::SkipEmptyParts);
Chris@289 2410 if (olist.size() > 1) output = olist[1];
Chris@289 2411
Chris@289 2412 Changeset *cs = (Changeset *)completedAction.extraData;
Chris@289 2413 if (cs) {
Chris@289 2414 QMessageBox::information
Chris@289 2415 (this, tr("Change summary"),
Chris@289 2416 format3(tr("Summary of changes"),
Chris@289 2417 cs->formatHtml(),
Chris@289 2418 output));
Chris@289 2419 } else if (output == "") {
Chris@289 2420 // Can happen, for a merge commit (depending on parent)
Chris@288 2421 QMessageBox::information(this, tr("Change summary"),
Chris@288 2422 format3(tr("Summary of changes"),
Chris@288 2423 tr("No changes"),
Chris@288 2424 output));
Chris@288 2425 } else {
Chris@288 2426 QMessageBox::information(this, tr("Change summary"),
Chris@288 2427 format3(tr("Summary of changes"),
Chris@288 2428 "",
Chris@288 2429 output));
Chris@288 2430 }
Chris@288 2431 break;
Chris@289 2432 }
Chris@288 2433
Chris@109 2434 case ACT_FOLDERDIFF:
Chris@109 2435 case ACT_CHGSETDIFF:
Chris@109 2436 case ACT_SERVE:
Chris@109 2437 case ACT_HG_IGNORE:
Chris@284 2438 m_shouldHgStat = true;
Chris@109 2439 break;
Chris@109 2440
Chris@109 2441 case ACT_UPDATE:
Chris@162 2442 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output)));
Chris@284 2443 m_shouldHgStat = true;
Chris@109 2444 break;
Chris@109 2445
Chris@109 2446 case ACT_MERGE:
Chris@294 2447 MoreInformationDialog::information
Chris@294 2448 (this, tr("Merge"), tr("Merge successful"),
Chris@302 2449 tr("Remember to test and commit the result before making any further changes."),
Chris@294 2450 output);
Chris@284 2451 m_shouldHgStat = true;
Chris@284 2452 m_justMerged = true;
Chris@109 2453 break;
Chris@109 2454
Chris@109 2455 case ACT_RETRY_MERGE:
Chris@163 2456 QMessageBox::information(this, tr("Resolved"),
Chris@302 2457 tr("<qt><h3>Merge resolved</h3><p>Merge resolved successfully.<br>Remember to test and commit the result before making any further changes.</p>"));
Chris@284 2458 m_shouldHgStat = true;
Chris@284 2459 m_justMerged = true;
Chris@109 2460 break;
Chris@109 2461
Chris@109 2462 default:
Chris@109 2463 break;
Chris@109 2464 }
Chris@108 2465
Chris@121 2466 // Sequence when no full log required:
Chris@520 2467 // paths -> branch -> stat -> resolve-list -> heads ->
Chris@150 2468 // incremental-log (only if heads changed) -> parents
Chris@150 2469 //
Chris@121 2470 // Sequence when full log required:
Chris@520 2471 // paths -> branch -> stat -> resolve-list -> heads ->
Chris@519 2472 // parents -> log
Chris@150 2473 //
Chris@150 2474 // Note we want to call enableDisableActions only once, at the end
Chris@150 2475 // of whichever sequence is in use.
Chris@150 2476
Chris@156 2477 bool noMore = false;
Chris@156 2478
Chris@150 2479 switch (action) {
Chris@175 2480
Chris@175 2481 case ACT_TEST_HG:
Chris@248 2482 {
Chris@248 2483 QSettings settings;
Chris@248 2484 if (settings.value("useextension", true).toBool()) {
Chris@248 2485 hgTestExtension();
Chris@284 2486 } else if (m_workFolderPath == "") {
Chris@248 2487 open();
Chris@248 2488 } else {
Chris@248 2489 hgQueryPaths();
Chris@248 2490 }
Chris@200 2491 break;
Chris@248 2492 }
Chris@200 2493
Chris@200 2494 case ACT_TEST_HG_EXT:
Chris@284 2495 if (m_workFolderPath == "") {
Chris@248 2496 open();
Chris@248 2497 } else{
Chris@248 2498 hgQueryPaths();
Chris@248 2499 }
Chris@175 2500 break;
Chris@150 2501
Chris@150 2502 case ACT_QUERY_PATHS:
Chris@519 2503 // NB this call is duplicated in hgQueryPaths
Chris@109 2504 hgQueryBranch();
Chris@150 2505 break;
Chris@150 2506
Chris@150 2507 case ACT_QUERY_BRANCH:
Chris@519 2508 // NB this call is duplicated in hgQueryBranch
Chris@109 2509 hgStat();
Chris@150 2510 break;
Chris@150 2511
Chris@150 2512 case ACT_STAT:
Chris@163 2513 hgResolveList();
Chris@163 2514 break;
Chris@519 2515
Chris@163 2516 case ACT_RESOLVE_LIST:
Chris@506 2517 hgQueryHeadsActive();
Chris@506 2518 break;
Chris@506 2519
Chris@506 2520 case ACT_QUERY_HEADS_ACTIVE:
Chris@150 2521 hgQueryHeads();
Chris@150 2522 break;
Chris@150 2523
Chris@150 2524 case ACT_QUERY_HEADS:
Chris@284 2525 if (headsChanged && !m_needNewLog) {
Chris@150 2526 hgLogIncremental(oldHeadIds);
Chris@121 2527 } else {
Chris@150 2528 hgQueryParents();
Chris@121 2529 }
Chris@150 2530 break;
Chris@150 2531
Chris@150 2532 case ACT_LOG_INCREMENTAL:
Chris@109 2533 hgQueryParents();
Chris@150 2534 break;
Chris@150 2535
Chris@150 2536 case ACT_QUERY_PARENTS:
Chris@284 2537 if (m_needNewLog) {
Chris@120 2538 hgLog();
Chris@150 2539 } else {
Chris@150 2540 // we're done
Chris@156 2541 noMore = true;
Chris@120 2542 }
Chris@150 2543 break;
Chris@150 2544
Chris@150 2545 case ACT_LOG:
Chris@150 2546 // we're done
Chris@156 2547 noMore = true;
Chris@198 2548 break;
Chris@150 2549
Chris@150 2550 default:
Chris@284 2551 if (m_shouldHgStat) {
Chris@284 2552 m_shouldHgStat = false;
Chris@109 2553 hgQueryPaths();
Chris@150 2554 } else {
Chris@156 2555 noMore = true;
jtkorhonen@0 2556 }
Chris@150 2557 break;
Chris@150 2558 }
Chris@156 2559
Chris@156 2560 if (noMore) {
Chris@540 2561 m_commandSequenceInProgress = false;
Chris@284 2562 m_stateUnknown = false;
Chris@156 2563 enableDisableActions();
Chris@284 2564 m_hgTabs->updateHistory();
Chris@359 2565 updateRecentMenu();
Chris@541 2566 checkFilesystem();
Chris@156 2567 }
jtkorhonen@0 2568 }
jtkorhonen@0 2569
Chris@564 2570 void MainWindow::commandCancelled(HgAction cancelledAction)
Chris@564 2571 {
Chris@564 2572 // Originally I had this checking whether the cancelled action was
Chris@564 2573 // a network one and, if so, calling hgQueryPaths to update the
Chris@564 2574 // local view in case it had changed anything. But that doesn't
Chris@564 2575 // work properly -- because at this point, although the command
Chris@564 2576 // has been cancelled and a kill signal sent, it hasn't actually
Chris@564 2577 // exited yet. If we request another command now, it will go on
Chris@564 2578 // the stack and be associated with the failed exit forthcoming
Chris@564 2579 // from the cancelled command -- giving the user a disturbing
Chris@564 2580 // command-failed dialog
Chris@564 2581 }
Chris@564 2582
jtkorhonen@0 2583 void MainWindow::connectActions()
jtkorhonen@0 2584 {
Chris@284 2585 connect(m_exitAct, SIGNAL(triggered()), this, SLOT(close()));
Chris@284 2586 connect(m_aboutAct, SIGNAL(triggered()), this, SLOT(about()));
Chris@494 2587 connect(m_helpAct, SIGNAL(triggered()), this, SLOT(help()));
Chris@273 2588
Chris@284 2589 connect(m_hgRefreshAct, SIGNAL(triggered()), this, SLOT(hgRefresh()));
Chris@284 2590 connect(m_hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
Chris@284 2591 connect(m_hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
Chris@284 2592 connect(m_hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
Chris@425 2593 connect(m_hgIgnoreAct, SIGNAL(triggered()), this, SLOT(hgIgnore()));
Chris@425 2594 connect(m_hgEditIgnoreAct, SIGNAL(triggered()), this, SLOT(hgEditIgnore()));
Chris@284 2595 connect(m_hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
Chris@284 2596 connect(m_hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
Chris@284 2597 connect(m_hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
Chris@284 2598 connect(m_hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
Chris@273 2599
Chris@284 2600 connect(m_settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
Chris@284 2601 connect(m_openAct, SIGNAL(triggered()), this, SLOT(open()));
Chris@284 2602 connect(m_changeRemoteRepoAct, SIGNAL(triggered()), this, SLOT(changeRemoteRepo()));
Chris@273 2603
Chris@284 2604 connect(m_hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
Chris@284 2605 connect(m_hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
Chris@284 2606 connect(m_hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
Chris@273 2607
Chris@284 2608 connect(m_hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
jtkorhonen@0 2609 }
Chris@141 2610
Chris@141 2611 void MainWindow::connectTabsSignals()
Chris@141 2612 {
Chris@327 2613 connect(m_hgTabs, SIGNAL(currentChanged(int)),
Chris@327 2614 this, SLOT(enableDisableActions()));
Chris@327 2615
Chris@284 2616 connect(m_hgTabs, SIGNAL(commit()),
Chris@141 2617 this, SLOT(hgCommit()));
Chris@141 2618
Chris@284 2619 connect(m_hgTabs, SIGNAL(revert()),
Chris@141 2620 this, SLOT(hgRevert()));
Chris@141 2621
Chris@284 2622 connect(m_hgTabs, SIGNAL(diffWorkingFolder()),
Chris@141 2623 this, SLOT(hgFolderDiff()));
Chris@168 2624
Chris@284 2625 connect(m_hgTabs, SIGNAL(showSummary()),
Chris@168 2626 this, SLOT(hgShowSummary()));
Chris@311 2627
Chris@311 2628 connect(m_hgTabs, SIGNAL(newBranch()),
Chris@311 2629 this, SLOT(hgNewBranch()));
Chris@311 2630
Chris@311 2631 connect(m_hgTabs, SIGNAL(noBranch()),
Chris@311 2632 this, SLOT(hgNoBranch()));
Chris@148 2633
Chris@284 2634 connect(m_hgTabs, SIGNAL(updateTo(QString)),
Chris@148 2635 this, SLOT(hgUpdateToRev(QString)));
Chris@141 2636
Chris@284 2637 connect(m_hgTabs, SIGNAL(diffToCurrent(QString)),
Chris@148 2638 this, SLOT(hgDiffToCurrent(QString)));
Chris@141 2639
Chris@284 2640 connect(m_hgTabs, SIGNAL(diffToParent(QString, QString)),
Chris@148 2641 this, SLOT(hgDiffToParent(QString, QString)));
Chris@141 2642
Chris@289 2643 connect(m_hgTabs, SIGNAL(showSummary(Changeset *)),
Chris@289 2644 this, SLOT(hgShowSummaryFor(Changeset *)));
Chris@288 2645
Chris@284 2646 connect(m_hgTabs, SIGNAL(mergeFrom(QString)),
Chris@148 2647 this, SLOT(hgMergeFrom(QString)));
Chris@164 2648
Chris@307 2649 connect(m_hgTabs, SIGNAL(newBranch(QString)),
Chris@311 2650 this, SLOT(hgNewBranch()));
Chris@278 2651
Chris@514 2652 connect(m_hgTabs, SIGNAL(closeBranch(QString)),
Chris@514 2653 this, SLOT(hgCloseBranch()));
Chris@514 2654
Chris@284 2655 connect(m_hgTabs, SIGNAL(tag(QString)),
Chris@148 2656 this, SLOT(hgTag(QString)));
Chris@326 2657
Chris@326 2658 connect(m_hgTabs, SIGNAL(annotateFiles(QStringList)),
Chris@326 2659 this, SLOT(hgAnnotateFiles(QStringList)));
Chris@326 2660
Chris@326 2661 connect(m_hgTabs, SIGNAL(diffFiles(QStringList)),
Chris@326 2662 this, SLOT(hgDiffFiles(QStringList)));
Chris@326 2663
Chris@326 2664 connect(m_hgTabs, SIGNAL(commitFiles(QStringList)),
Chris@326 2665 this, SLOT(hgCommitFiles(QStringList)));
Chris@326 2666
Chris@326 2667 connect(m_hgTabs, SIGNAL(revertFiles(QStringList)),
Chris@326 2668 this, SLOT(hgRevertFiles(QStringList)));
Chris@326 2669
Chris@361 2670 connect(m_hgTabs, SIGNAL(renameFiles(QStringList)),
Chris@361 2671 this, SLOT(hgRenameFiles(QStringList)));
Chris@361 2672
Chris@361 2673 connect(m_hgTabs, SIGNAL(copyFiles(QStringList)),
Chris@361 2674 this, SLOT(hgCopyFiles(QStringList)));
Chris@361 2675
Chris@326 2676 connect(m_hgTabs, SIGNAL(addFiles(QStringList)),
Chris@326 2677 this, SLOT(hgAddFiles(QStringList)));
Chris@326 2678
Chris@326 2679 connect(m_hgTabs, SIGNAL(removeFiles(QStringList)),
Chris@326 2680 this, SLOT(hgRemoveFiles(QStringList)));
Chris@326 2681
Chris@326 2682 connect(m_hgTabs, SIGNAL(redoFileMerges(QStringList)),
Chris@326 2683 this, SLOT(hgRedoFileMerges(QStringList)));
Chris@326 2684
Chris@326 2685 connect(m_hgTabs, SIGNAL(markFilesResolved(QStringList)),
Chris@326 2686 this, SLOT(hgMarkFilesResolved(QStringList)));
Chris@326 2687
Chris@326 2688 connect(m_hgTabs, SIGNAL(ignoreFiles(QStringList)),
Chris@326 2689 this, SLOT(hgIgnoreFiles(QStringList)));
Chris@326 2690
Chris@326 2691 connect(m_hgTabs, SIGNAL(unIgnoreFiles(QStringList)),
Chris@326 2692 this, SLOT(hgUnIgnoreFiles(QStringList)));
sam@624 2693
sam@624 2694 connect(m_hgTabs, SIGNAL(showIn(QStringList)),
sam@624 2695 this, SLOT(hgShowIn(QStringList)));
Chris@141 2696 }
Chris@141 2697
jtkorhonen@0 2698 void MainWindow::enableDisableActions()
jtkorhonen@0 2699 {
Chris@90 2700 DEBUG << "MainWindow::enableDisableActions" << endl;
Chris@90 2701
Chris@284 2702 QString dirname = QDir(m_workFolderPath).dirName();
Chris@340 2703
Chris@340 2704 if (m_workFolderPath != "") { // dirname of "" is ".", so test path instead
Chris@202 2705 setWindowTitle(tr("EasyMercurial: %1").arg(dirname));
Chris@202 2706 } else {
Chris@202 2707 setWindowTitle(tr("EasyMercurial"));
Chris@202 2708 }
Chris@202 2709
Chris@115 2710 //!!! should also do things like set the status texts for the
Chris@115 2711 //!!! actions appropriately by context
Chris@115 2712
jtkorhonen@0 2713 QDir localRepoDir;
jtkorhonen@0 2714 QDir workFolderDir;
jtkorhonen@0 2715
Chris@284 2716 m_remoteRepoActionsEnabled = true;
Chris@284 2717 if (m_remoteRepoPath.isEmpty()) {
Chris@284 2718 m_remoteRepoActionsEnabled = false;
jtkorhonen@0 2719 }
jtkorhonen@0 2720
Chris@284 2721 m_localRepoActionsEnabled = true;
Chris@284 2722 if (m_workFolderPath.isEmpty()) {
Chris@284 2723 m_localRepoActionsEnabled = false;
jtkorhonen@0 2724 }
jtkorhonen@0 2725
Chris@284 2726 if (m_workFolderPath == "" || !workFolderDir.exists(m_workFolderPath)) {
Chris@284 2727 m_localRepoActionsEnabled = false;
jtkorhonen@0 2728 }
jtkorhonen@0 2729
Chris@284 2730 if (!localRepoDir.exists(m_workFolderPath + "/.hg")) {
Chris@284 2731 m_localRepoActionsEnabled = false;
jtkorhonen@0 2732 }
jtkorhonen@0 2733
Chris@179 2734 bool haveDiff = false;
Chris@179 2735 QSettings settings;
Chris@179 2736 settings.beginGroup("Locations");
Chris@179 2737 if (settings.value("extdiffbinary", "").toString() != "") {
Chris@179 2738 haveDiff = true;
Chris@179 2739 }
Chris@179 2740 settings.endGroup();
Chris@112 2741
Chris@505 2742 m_hgTabs->setHaveMerge(m_currentParents.size() == 2);
Chris@505 2743
Chris@365 2744 m_hgRefreshAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2745 m_hgFolderDiffAct->setEnabled(m_localRepoActionsEnabled && haveDiff);
Chris@365 2746 m_hgRevertAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2747 m_hgAddAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2748 m_hgRemoveAct->setEnabled(m_localRepoActionsEnabled);
Chris@425 2749 m_hgIgnoreAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2750 m_hgUpdateAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2751 m_hgCommitAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2752 m_hgMergeAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2753 m_hgServeAct->setEnabled(m_localRepoActionsEnabled);
Chris@413 2754 m_hgEditIgnoreAct->setEnabled(m_localRepoActionsEnabled);
Chris@273 2755
Chris@284 2756 DEBUG << "m_localRepoActionsEnabled = " << m_localRepoActionsEnabled << endl;
Chris@284 2757 DEBUG << "canCommit = " << m_hgTabs->canCommit() << endl;
Chris@273 2758
Chris@284 2759 m_hgAddAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canAdd());
Chris@284 2760 m_hgRemoveAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canRemove());
Chris@284 2761 m_hgCommitAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canCommit());
Chris@284 2762 m_hgRevertAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canRevert());
Chris@284 2763 m_hgFolderDiffAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canDiff());
Chris@425 2764 m_hgIgnoreAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canIgnore());
Chris@90 2765
Chris@108 2766 // A default merge makes sense if:
Chris@108 2767 // * there is only one parent (if there are two, we have an uncommitted merge) and
Chris@108 2768 // * there are exactly two heads that have the same branch as the current branch and
Chris@108 2769 // * our parent is one of those heads
Chris@108 2770 //
Chris@108 2771 // A default update makes sense if:
Chris@108 2772 // * there is only one parent and
Chris@108 2773 // * the parent is not one of the current heads
Chris@156 2774
Chris@108 2775 bool canMerge = false;
Chris@108 2776 bool canUpdate = false;
Chris@156 2777 bool haveMerge = false;
Chris@162 2778 bool emptyRepo = false;
Chris@225 2779 bool noWorkingCopy = false;
Chris@235 2780 bool newBranch = false;
Chris@506 2781 bool closedBranch = false;
Chris@506 2782 int currentBranchActiveHeads = 0;
Chris@273 2783
Chris@284 2784 if (m_currentParents.size() == 1) {
Chris@156 2785 bool parentIsHead = false;
Chris@506 2786 bool parentIsActiveHead = false;
Chris@284 2787 Changeset *parent = m_currentParents[0];
Chris@506 2788 foreach (Changeset *head, m_activeHeads) {
Chris@284 2789 if (head->isOnBranch(m_currentBranch)) {
Chris@506 2790 ++currentBranchActiveHeads;
Chris@235 2791 }
Chris@235 2792 if (parent->id() == head->id()) {
Chris@506 2793 parentIsActiveHead = parentIsHead = true;
Chris@108 2794 }
Chris@108 2795 }
Chris@506 2796 if (!parentIsActiveHead) {
Chris@506 2797 foreach (Changeset *head, m_currentHeads) {
Chris@506 2798 if (parent->id() == head->id()) {
Chris@506 2799 parentIsHead = true;
Chris@506 2800 }
Chris@506 2801 }
Chris@506 2802 }
Chris@506 2803 if (currentBranchActiveHeads == 2 && parentIsActiveHead) {
Chris@108 2804 canMerge = true;
Chris@108 2805 }
Chris@506 2806 if (currentBranchActiveHeads == 0 && parentIsActiveHead) {
Chris@235 2807 // Just created a new branch
Chris@235 2808 newBranch = true;
Chris@235 2809 }
Chris@108 2810 if (!parentIsHead) {
Chris@108 2811 canUpdate = true;
Chris@108 2812 DEBUG << "parent id = " << parent->id() << endl;
Chris@108 2813 DEBUG << " head ids "<<endl;
Chris@284 2814 foreach (Changeset *h, m_currentHeads) {
Chris@108 2815 DEBUG << "head id = " << h->id() << endl;
Chris@108 2816 }
Chris@506 2817 } else if (!parentIsActiveHead) {
Chris@506 2818 closedBranch = true;
Chris@108 2819 }
Chris@284 2820 m_justMerged = false;
Chris@284 2821 } else if (m_currentParents.size() == 0) {
Chris@284 2822 if (m_currentHeads.size() == 0) {
Chris@225 2823 // No heads -> empty repo
Chris@225 2824 emptyRepo = true;
Chris@225 2825 } else {
Chris@225 2826 // Heads, but no parents -> no working copy, e.g. we have
Chris@225 2827 // just converted this repo but haven't updated in it yet.
Chris@225 2828 // Uncommon but confusing; probably merits a special case
Chris@225 2829 noWorkingCopy = true;
Chris@225 2830 canUpdate = true;
Chris@225 2831 }
Chris@284 2832 m_justMerged = false;
Chris@156 2833 } else {
Chris@156 2834 haveMerge = true;
Chris@284 2835 m_justMerged = true;
Chris@108 2836 }
Chris@505 2837
Chris@363 2838 m_hgIncomingAct->setEnabled(m_remoteRepoActionsEnabled);
Chris@363 2839 m_hgPullAct->setEnabled(m_remoteRepoActionsEnabled);
Chris@363 2840 // permit push even if no remote yet; we'll ask for one
Chris@363 2841 m_hgPushAct->setEnabled(m_localRepoActionsEnabled && !emptyRepo);
Chris@363 2842
Chris@284 2843 m_hgMergeAct->setEnabled(m_localRepoActionsEnabled &&
Chris@506 2844 (canMerge || m_hgTabs->canResolve()));
Chris@284 2845 m_hgUpdateAct->setEnabled(m_localRepoActionsEnabled &&
Chris@506 2846 (canUpdate && !m_hgTabs->haveChangesToCommit()));
Chris@115 2847
Chris@115 2848 // Set the state field on the file status widget
Chris@115 2849
Chris@115 2850 QString branchText;
Chris@284 2851 if (m_currentBranch == "" || m_currentBranch == "default") {
Chris@115 2852 branchText = tr("the default branch");
Chris@115 2853 } else {
Chris@284 2854 branchText = tr("branch \"%1\"").arg(m_currentBranch);
Chris@115 2855 }
Chris@156 2856
Chris@284 2857 if (m_stateUnknown) {
Chris@284 2858 if (m_workFolderPath == "") {
Chris@287 2859 m_workStatus->setState(tr("No repository open"));
Chris@248 2860 } else {
Chris@287 2861 m_workStatus->setState(tr("(Examining repository)"));
Chris@248 2862 }
Chris@173 2863 } else if (emptyRepo) {
Chris@287 2864 m_workStatus->setState(tr("Nothing committed to this repository yet"));
Chris@225 2865 } else if (noWorkingCopy) {
Chris@287 2866 m_workStatus->setState(tr("No working copy yet: consider updating"));
Chris@162 2867 } else if (canMerge) {
Chris@287 2868 m_workStatus->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
Chris@284 2869 } else if (!m_hgTabs->getAllUnresolvedFiles().empty()) {
Chris@287 2870 m_workStatus->setState(tr("Have unresolved files following merge on %1").arg(branchText));
Chris@156 2871 } else if (haveMerge) {
Chris@287 2872 m_workStatus->setState(tr("Have merged but not yet committed on %1").arg(branchText));
Chris@235 2873 } else if (newBranch) {
Chris@287 2874 m_workStatus->setState(tr("On %1. New branch: has not yet been committed").arg(branchText));
Chris@506 2875 } else if (closedBranch) {
Chris@506 2876 if (canUpdate) {
Chris@506 2877 m_workStatus->setState(tr("On a closed branch. Not at the head of the branch"));
Chris@506 2878 } else {
Chris@506 2879 m_workStatus->setState(tr("At the head of a closed branch"));
Chris@506 2880 }
Chris@156 2881 } else if (canUpdate) {
Chris@284 2882 if (m_hgTabs->haveChangesToCommit()) {
Chris@163 2883 // have uncommitted changes
Chris@287 2884 m_workStatus->setState(tr("On %1. Not at the head of the branch").arg(branchText));
Chris@163 2885 } else {
Chris@163 2886 // no uncommitted changes
Chris@287 2887 m_workStatus->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));
Chris@163 2888 }
Chris@506 2889 } else if (currentBranchActiveHeads > 1) {
Chris@506 2890 m_workStatus->setState(tr("At one of %n heads of %1", "", currentBranchActiveHeads).arg(branchText));
Chris@115 2891 } else {
Chris@287 2892 m_workStatus->setState(tr("At the head of %1").arg(branchText));
Chris@115 2893 }
jtkorhonen@0 2894 }
jtkorhonen@0 2895
Chris@359 2896
Chris@506 2897 void MainWindow::updateClosedHeads()
Chris@506 2898 {
Chris@506 2899 m_closedHeadIds.clear();
Chris@506 2900 QSet<QString> activeIds;
Chris@506 2901 foreach (Changeset *cs, m_activeHeads) {
Chris@506 2902 activeIds.insert(cs->id());
Chris@506 2903 }
Chris@506 2904 foreach (Changeset *cs, m_currentHeads) {
Chris@506 2905 if (!activeIds.contains(cs->id())) {
Chris@506 2906 m_closedHeadIds.insert(cs->id());
Chris@506 2907 }
Chris@506 2908 }
Chris@506 2909 m_hgTabs->setClosedHeadIds(m_closedHeadIds);
Chris@506 2910 }
Chris@506 2911
Chris@359 2912 void MainWindow::updateRecentMenu()
Chris@359 2913 {
Chris@359 2914 m_recentMenu->clear();
Chris@359 2915 RecentFiles rf("Recent-local");
Chris@359 2916 QStringList recent = rf.getRecent();
Chris@359 2917 if (recent.empty()) {
Chris@359 2918 QLabel *label = new QLabel(tr("No recent local repositories"));
Chris@359 2919 QWidgetAction *wa = new QWidgetAction(m_recentMenu);
Chris@359 2920 wa->setDefaultWidget(label);
Chris@359 2921 return;
Chris@359 2922 }
Chris@359 2923 foreach (QString r, recent) {
Chris@359 2924 QAction *a = m_recentMenu->addAction(r);
Chris@611 2925 connect(a, SIGNAL(triggered()), this, SLOT(recentMenuActivated()));
Chris@359 2926 }
Chris@359 2927 }
Chris@359 2928
jtkorhonen@0 2929 void MainWindow::createActions()
jtkorhonen@0 2930 {
jtkorhonen@0 2931 //File actions
Chris@365 2932 m_openAct = new QAction(QIcon(":/images/fileopen.png"), tr("&Open..."), this);
Chris@609 2933 m_openAct->setStatusTip(tr("Open a remote repository or an existing local folder"));
Chris@365 2934 m_openAct->setShortcut(tr("Ctrl+O"));
Chris@365 2935
Chris@609 2936 m_changeRemoteRepoAct = new QAction(tr("Set Push and Pull &Location..."), this);
Chris@609 2937 m_changeRemoteRepoAct->setStatusTip(tr("Set or change the default URL for pull and push actions from this repository"));
Chris@273 2938
Chris@365 2939 m_settingsAct = new QAction(QIcon(":/images/settings.png"), tr("&Settings..."), this);
Chris@365 2940 m_settingsAct->setStatusTip(tr("View and change application settings"));
Chris@273 2941
Chris@343 2942 #ifdef Q_OS_WIN32
Chris@365 2943 m_exitAct = new QAction(QIcon(":/images/exit.png"), tr("E&xit"), this);
Chris@343 2944 #else
Chris@365 2945 m_exitAct = new QAction(QIcon(":/images/exit.png"), tr("&Quit"), this);
Chris@343 2946 #endif
Chris@284 2947 m_exitAct->setShortcuts(QKeySequence::Quit);
Chris@365 2948 m_exitAct->setStatusTip(tr("Exit EasyMercurial"));
jtkorhonen@0 2949
jtkorhonen@0 2950 //Repository actions
Chris@544 2951 m_hgRefreshAct = new QAction(QIcon(":/images/status.png"), tr("&Re-Read Working Folder"), this);
Chris@365 2952 m_hgRefreshAct->setShortcut(tr("Ctrl+R"));
Chris@284 2953 m_hgRefreshAct->setStatusTip(tr("Refresh the window to show the current state of the working folder"));
Chris@273 2954
Chris@365 2955 m_hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("Pre&view Incoming Changes"), this);
Chris@365 2956 m_hgIncomingAct->setIconText(tr("Preview"));
Chris@365 2957 m_hgIncomingAct->setStatusTip(tr("See what changes are available in the remote repository waiting to be pulled"));
Chris@365 2958
Chris@365 2959 m_hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pu&ll from Remote Repository"), this);
Chris@365 2960 m_hgPullAct->setIconText(tr("Pull"));
Chris@365 2961 m_hgPullAct->setShortcut(tr("Ctrl+L"));
Chris@365 2962 m_hgPullAct->setStatusTip(tr("Pull changes from the remote repository to the local repository"));
Chris@365 2963
Chris@365 2964 m_hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Pus&h to Remote Repository"), this);
Chris@365 2965 m_hgPushAct->setIconText(tr("Push"));
Chris@365 2966 m_hgPushAct->setShortcut(tr("Ctrl+H"));
Chris@284 2967 m_hgPushAct->setStatusTip(tr("Push changes from the local repository to the remote repository"));
jtkorhonen@0 2968
jtkorhonen@0 2969 //Workfolder actions
Chris@365 2970 m_hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("&Diff"), this);
Chris@365 2971 m_hgFolderDiffAct->setIconText(tr("Diff"));
Chris@365 2972 m_hgFolderDiffAct->setShortcut(tr("Ctrl+D"));
Chris@284 2973 m_hgFolderDiffAct->setStatusTip(tr("See what has changed in the working folder compared with the last committed state"));
Chris@273 2974
Chris@365 2975 m_hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Re&vert"), this);
Chris@284 2976 m_hgRevertAct->setStatusTip(tr("Throw away your changes and return to the last committed state"));
Chris@273 2977
Chris@365 2978 m_hgAddAct = new QAction(QIcon(":/images/add.png"), tr("&Add Files"), this);
Chris@365 2979 m_hgAddAct->setIconText(tr("Add"));
Chris@365 2980 m_hgAddAct->setShortcut(tr("+"));
Chris@365 2981 m_hgAddAct->setStatusTip(tr("Mark the selected files to be added on the next commit"));
Chris@365 2982
Chris@365 2983 m_hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("&Remove Files"), this);
Chris@365 2984 m_hgRemoveAct->setIconText(tr("Remove"));
Chris@365 2985 m_hgRemoveAct->setShortcut(tr("Del"));
Chris@365 2986 m_hgRemoveAct->setStatusTip(tr("Mark the selected files to be removed from version control on the next commit"));
Chris@365 2987
Chris@425 2988 m_hgIgnoreAct = new QAction(tr("&Ignore Files..."), this);
Chris@425 2989 m_hgIgnoreAct->setStatusTip(tr("Add the selected filenames to the ignored list, of files that should never be tracked in this repository"));
Chris@425 2990
Chris@425 2991 m_hgEditIgnoreAct = new QAction(tr("Edit Ignored List"), this);
Chris@425 2992 m_hgEditIgnoreAct->setStatusTip(tr("Edit the .hgignore file, containing the names of files that should be ignored by Mercurial"));
Chris@425 2993
Chris@365 2994 m_hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("&Update to Branch Head"), this);
Chris@365 2995 m_hgUpdateAct->setIconText(tr("Update"));
Chris@365 2996 m_hgUpdateAct->setShortcut(tr("Ctrl+U"));
Chris@284 2997 m_hgUpdateAct->setStatusTip(tr("Update the working folder to the head of the current repository branch"));
jtkorhonen@0 2998
Chris@365 2999 m_hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("&Commit..."), this);
Chris@365 3000 m_hgCommitAct->setShortcut(tr("Ctrl+Return"));
Chris@284 3001 m_hgCommitAct->setStatusTip(tr("Commit your changes to the local repository"));
Chris@273 3002
Chris@365 3003 m_hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("&Merge"), this);
Chris@365 3004 m_hgMergeAct->setShortcut(tr("Ctrl+M"));
Chris@284 3005 m_hgMergeAct->setStatusTip(tr("Merge the two independent sets of changes in the local repository into the working folder"));
jtkorhonen@0 3006
Chris@425 3007 m_hgServeAct = new QAction(tr("Share Repository"), this);
Chris@425 3008 m_hgServeAct->setStatusTip(tr("Serve local repository temporarily via HTTP for workgroup access"));
jtkorhonen@11 3009
jtkorhonen@0 3010 //Help actions
Chris@494 3011 #ifdef Q_OS_MAC
Chris@494 3012 m_helpAct = new QAction(tr("EasyMercurial Help"), this);
Chris@494 3013 #else
Chris@494 3014 m_helpAct = new QAction(tr("Help Topics"), this);
Chris@494 3015 #endif
Chris@494 3016 m_helpAct->setShortcuts(QKeySequence::HelpContents);
Chris@284 3017 m_aboutAct = new QAction(tr("About EasyMercurial"), this);
Chris@94 3018
Chris@94 3019 // Miscellaneous
Chris@199 3020 QShortcut *clearSelectionsShortcut = new QShortcut(Qt::Key_Escape, this);
Chris@199 3021 connect(clearSelectionsShortcut, SIGNAL(activated()),
Chris@199 3022 this, SLOT(clearSelections()));
jtkorhonen@0 3023 }
jtkorhonen@0 3024
jtkorhonen@0 3025 void MainWindow::createMenus()
jtkorhonen@0 3026 {
Chris@365 3027 m_fileMenu = menuBar()->addMenu(tr("&File"));
Chris@365 3028
Chris@365 3029 m_fileMenu->addAction(m_openAct);
Chris@365 3030 m_recentMenu = m_fileMenu->addMenu(tr("Open Re&cent"));
Chris@365 3031 m_fileMenu->addAction(m_hgRefreshAct);
Chris@365 3032 m_fileMenu->addSeparator();
Chris@425 3033 m_fileMenu->addAction(m_hgServeAct);
Chris@425 3034 m_fileMenu->addSeparator();
Chris@365 3035 m_fileMenu->addAction(m_settingsAct);
Chris@365 3036 m_fileMenu->addSeparator();
Chris@365 3037 m_fileMenu->addAction(m_exitAct);
Chris@365 3038
Chris@365 3039 QMenu *workMenu;
Chris@365 3040 workMenu = menuBar()->addMenu(tr("&Work"));
Chris@365 3041 workMenu->addAction(m_hgFolderDiffAct);
Chris@365 3042 workMenu->addSeparator();
Chris@365 3043 workMenu->addAction(m_hgUpdateAct);
Chris@365 3044 workMenu->addAction(m_hgCommitAct);
Chris@365 3045 workMenu->addAction(m_hgMergeAct);
Chris@365 3046 workMenu->addSeparator();
Chris@365 3047 workMenu->addAction(m_hgAddAct);
Chris@365 3048 workMenu->addAction(m_hgRemoveAct);
Chris@365 3049 workMenu->addSeparator();
Chris@425 3050 workMenu->addAction(m_hgIgnoreAct);
Chris@425 3051 workMenu->addAction(m_hgEditIgnoreAct);
Chris@425 3052 workMenu->addSeparator();
Chris@365 3053 workMenu->addAction(m_hgRevertAct);
Chris@365 3054
Chris@365 3055 QMenu *remoteMenu;
Chris@365 3056 remoteMenu = menuBar()->addMenu(tr("&Remote"));
Chris@365 3057 remoteMenu->addAction(m_hgIncomingAct);
Chris@365 3058 remoteMenu->addSeparator();
Chris@609 3059 remoteMenu->addAction(m_changeRemoteRepoAct);
Chris@365 3060 remoteMenu->addAction(m_hgPullAct);
Chris@365 3061 remoteMenu->addAction(m_hgPushAct);
Chris@273 3062
Chris@378 3063 m_helpMenu = menuBar()->addMenu(tr("&Help"));
Chris@494 3064 m_helpMenu->addAction(m_helpAct);
Chris@284 3065 m_helpMenu->addAction(m_aboutAct);
jtkorhonen@0 3066 }
jtkorhonen@0 3067
jtkorhonen@0 3068 void MainWindow::createToolBars()
jtkorhonen@0 3069 {
Chris@442 3070 int sz = 32;
Chris@442 3071
Chris@543 3072 bool spacingReqd = false;
chris@550 3073 QString spacer = "";
Chris@543 3074 #ifndef Q_OS_MAC
Chris@543 3075 spacingReqd = true;
chris@550 3076 spacer = " ";
chris@550 3077 #ifdef Q_OS_WIN32
chris@550 3078 spacer = " ";
chris@550 3079 #endif
Chris@543 3080 #endif
Chris@273 3081
Chris@594 3082 m_workFolderToolBar = new QToolBar(tr("Work"));
Chris@284 3083 addToolBar(Qt::LeftToolBarArea, m_workFolderToolBar);
Chris@442 3084 m_workFolderToolBar->setIconSize(QSize(sz, sz));
Chris@543 3085 if (spacingReqd) {
Chris@543 3086 QWidget *w = new QWidget;
Chris@543 3087 w->setFixedHeight(6);
Chris@543 3088 m_workFolderToolBar->addWidget(w);
Chris@543 3089 }
Chris@284 3090 m_workFolderToolBar->addAction(m_hgFolderDiffAct);
Chris@284 3091 m_workFolderToolBar->addSeparator();
Chris@284 3092 m_workFolderToolBar->addAction(m_hgRevertAct);
Chris@284 3093 m_workFolderToolBar->addAction(m_hgUpdateAct);
Chris@284 3094 m_workFolderToolBar->addAction(m_hgCommitAct);
Chris@284 3095 m_workFolderToolBar->addAction(m_hgMergeAct);
Chris@284 3096 m_workFolderToolBar->addSeparator();
Chris@284 3097 m_workFolderToolBar->addAction(m_hgAddAct);
Chris@284 3098 m_workFolderToolBar->addAction(m_hgRemoveAct);
Chris@365 3099 m_workFolderToolBar->setMovable(false);
Chris@61 3100
Chris@543 3101 m_repoToolBar = addToolBar(tr("Remote"));
Chris@543 3102 m_repoToolBar->setIconSize(QSize(sz, sz));
Chris@572 3103 if (spacingReqd) {
Chris@572 3104 m_repoToolBar->addWidget(new QLabel(spacer));
Chris@572 3105 }
Chris@543 3106 m_repoToolBar->addAction(m_openAct);
Chris@572 3107 if (spacingReqd) {
Chris@572 3108 m_repoToolBar->addWidget(new QLabel(spacer));
Chris@572 3109 }
Chris@543 3110 m_repoToolBar->addSeparator();
Chris@543 3111 m_repoToolBar->addAction(m_hgIncomingAct);
Chris@543 3112 m_repoToolBar->addAction(m_hgPullAct);
Chris@543 3113 m_repoToolBar->addAction(m_hgPushAct);
Chris@543 3114 m_repoToolBar->setMovable(false);
Chris@543 3115
Chris@230 3116 updateToolBarStyle();
jtkorhonen@0 3117 }
jtkorhonen@0 3118
Chris@230 3119 void MainWindow::updateToolBarStyle()
Chris@230 3120 {
Chris@230 3121 QSettings settings;
Chris@230 3122 settings.beginGroup("Presentation");
Chris@230 3123 bool showText = settings.value("showiconlabels", true).toBool();
Chris@230 3124 settings.endGroup();
Chris@230 3125
Chris@230 3126 foreach (QToolButton *tb, findChildren<QToolButton *>()) {
Chris@230 3127 tb->setToolButtonStyle(showText ?
Chris@230 3128 Qt::ToolButtonTextUnderIcon :
Chris@230 3129 Qt::ToolButtonIconOnly);
Chris@230 3130 }
Chris@230 3131 }
jtkorhonen@0 3132
Chris@287 3133 void MainWindow::updateWorkFolderAndRepoNames()
Chris@287 3134 {
Chris@287 3135 m_hgTabs->setLocalPath(m_workFolderPath);
Chris@287 3136
Chris@287 3137 m_workStatus->setLocalPath(m_workFolderPath);
Chris@287 3138 m_workStatus->setRemoteURL(m_remoteRepoPath);
Chris@287 3139 }
Chris@287 3140
jtkorhonen@0 3141 void MainWindow::createStatusBar()
jtkorhonen@0 3142 {
jtkorhonen@0 3143 statusBar()->showMessage(tr("Ready"));
jtkorhonen@0 3144 }
jtkorhonen@0 3145
jtkorhonen@0 3146 void MainWindow::readSettings()
jtkorhonen@0 3147 {
jtkorhonen@0 3148 QDir workFolder;
jtkorhonen@0 3149
Chris@61 3150 QSettings settings;
jtkorhonen@0 3151
Chris@284 3152 m_workFolderPath = settings.value("workfolderpath", "").toString();
Chris@553 3153 if (!workFolder.exists(m_workFolderPath)) {
Chris@284 3154 m_workFolderPath = "";
jtkorhonen@0 3155 }
jtkorhonen@0 3156
jtkorhonen@0 3157 QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
Chris@340 3158 QSize size = settings.value("size", QSize(550, 550)).toSize();
Chris@284 3159 m_firstStart = settings.value("firststart", QVariant(true)).toBool();
jtkorhonen@0 3160
jtkorhonen@0 3161 resize(size);
jtkorhonen@0 3162 move(pos);
jtkorhonen@0 3163 }
jtkorhonen@0 3164
jtkorhonen@0 3165 void MainWindow::writeSettings()
jtkorhonen@0 3166 {
Chris@61 3167 QSettings settings;
jtkorhonen@0 3168 settings.setValue("pos", pos());
jtkorhonen@0 3169 settings.setValue("size", size());
Chris@284 3170 settings.setValue("remoterepopath", m_remoteRepoPath);
Chris@284 3171 settings.setValue("workfolderpath", m_workFolderPath);
Chris@284 3172 settings.setValue("firststart", m_firstStart);
jtkorhonen@0 3173 }
jtkorhonen@0 3174
Chris@491 3175 void MainWindow::newerVersionAvailable(QString version)
Chris@491 3176 {
Chris@491 3177 QSettings settings;
Chris@491 3178 settings.beginGroup("NewerVersionWarning");
Chris@491 3179 QString tag = QString("version-%1-available-show").arg(version);
Chris@491 3180 if (settings.value(tag, true).toBool()) {
Chris@491 3181 QString title(tr("Newer version available"));
Chris@491 3182 QString text(tr("<h3>Newer version available</h3><p>You are using version %1 of EasyMercurial, but version %3 is now available.</p><p>Please see the <a href=\"http://easymercurial.org/\">EasyMercurial website</a> for more information.</p>").arg(EASYHG_VERSION).arg(version));
Chris@491 3183 QMessageBox::information(this, title, text);
Chris@491 3184 settings.setValue(tag, false);
Chris@491 3185 }
Chris@491 3186 settings.endGroup();
Chris@491 3187 }
Chris@491 3188
Chris@494 3189 void MainWindow::help()
Chris@494 3190 {
Chris@494 3191 if (!m_helpDialog) {
Chris@494 3192 m_helpDialog = new QDialog;
Chris@494 3193 QGridLayout *layout = new QGridLayout;
Chris@494 3194 m_helpDialog->setLayout(layout);
Chris@498 3195 QPushButton *home = new QPushButton;
Chris@498 3196 home->setIcon(QIcon(":images/home.png"));
Chris@498 3197 layout->addWidget(home, 0, 0);
Chris@498 3198 QPushButton *back = new QPushButton;
Chris@498 3199 back->setIcon(QIcon(":images/back.png"));
Chris@498 3200 layout->addWidget(back, 0, 1);
Chris@498 3201 QPushButton *fwd = new QPushButton;
Chris@498 3202 fwd->setIcon(QIcon(":images/forward.png"));
Chris@498 3203 layout->addWidget(fwd, 0, 2);
Chris@494 3204 QTextBrowser *text = new QTextBrowser;
Chris@494 3205 text->setOpenExternalLinks(true);
Chris@498 3206 layout->addWidget(text, 1, 0, 1, 4);
Chris@494 3207 text->setSource(QUrl("qrc:help/topics.html"));
Chris@494 3208 QDialogButtonBox *bb = new QDialogButtonBox(QDialogButtonBox::Close);
Chris@494 3209 connect(bb, SIGNAL(rejected()), m_helpDialog, SLOT(hide()));
Chris@498 3210 connect(text, SIGNAL(backwardAvailable(bool)),
Chris@498 3211 back, SLOT(setEnabled(bool)));
Chris@498 3212 connect(text, SIGNAL(forwardAvailable(bool)),
Chris@498 3213 fwd, SLOT(setEnabled(bool)));
Chris@498 3214 connect(home, SIGNAL(clicked()), text, SLOT(home()));
Chris@498 3215 connect(back, SIGNAL(clicked()), text, SLOT(backward()));
Chris@498 3216 connect(fwd, SIGNAL(clicked()), text, SLOT(forward()));
Chris@498 3217 back->setEnabled(false);
Chris@498 3218 fwd->setEnabled(false);
Chris@498 3219 layout->addWidget(bb, 2, 0, 1, 4);
Chris@498 3220 layout->setColumnStretch(3, 20);
Chris@494 3221 m_helpDialog->resize(450, 500);
Chris@494 3222 }
Chris@494 3223 QTextBrowser *tb = m_helpDialog->findChild<QTextBrowser *>();
Chris@494 3224 if (tb) tb->home();
Chris@494 3225 m_helpDialog->show();
Chris@494 3226 m_helpDialog->raise();
Chris@494 3227 }
Chris@494 3228