annotate src/mainwindow.cpp @ 608:6f90bb52eee6

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