annotate src/mainwindow.cpp @ 606:372b191247da

Add carriage return to hgignore file before new material, if it didn't end with one before
author Chris Cannam
date Tue, 03 Jul 2012 11:39:03 +0100
parents 10ef94e51f44
children d35ed7488ccd
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@109 1218 //!!! report error
Chris@109 1219 return;
Chris@104 1220 }
Chris@109 1221 }
Chris@104 1222
Chris@284 1223 params << "clone" << m_remoteRepoPath << m_workFolderPath;
Chris@109 1224
Chris@287 1225 updateWorkFolderAndRepoNames();
Chris@284 1226 m_hgTabs->updateWorkFolderFileList("");
Chris@273 1227
Chris@284 1228 m_runner->requestAction(HgAction(ACT_CLONEFROMREMOTE, m_workFolderPath, params));
jtkorhonen@0 1229 }
jtkorhonen@0 1230
jtkorhonen@0 1231 void MainWindow::hgInit()
jtkorhonen@0 1232 {
Chris@109 1233 QStringList params;
jtkorhonen@0 1234
Chris@109 1235 params << "init";
Chris@284 1236 params << m_workFolderPath;
Chris@273 1237
Chris@284 1238 m_runner->requestAction(HgAction(ACT_INIT, m_workFolderPath, params));
jtkorhonen@0 1239 }
jtkorhonen@0 1240
jtkorhonen@0 1241 void MainWindow::hgIncoming()
jtkorhonen@0 1242 {
Chris@109 1243 QStringList params;
jtkorhonen@0 1244
Chris@284 1245 params << "incoming" << "--newest-first" << m_remoteRepoPath;
Chris@125 1246 params << "--template" << Changeset::getLogTemplate();
jtkorhonen@0 1247
Chris@284 1248 m_runner->requestAction(HgAction(ACT_INCOMING, m_workFolderPath, params));
jtkorhonen@0 1249 }
jtkorhonen@0 1250
jtkorhonen@0 1251 void MainWindow::hgPull()
jtkorhonen@0 1252 {
Chris@193 1253 if (ConfirmCommentDialog::confirm
Chris@126 1254 (this, tr("Confirm pull"),
Chris@299 1255 tr("<qt><h3>Pull from remote repository?</h3></qt>"),
Chris@299 1256 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 1257 tr("&Pull"))) {
jtkorhonen@0 1258
Chris@126 1259 QStringList params;
Chris@284 1260 params << "pull" << m_remoteRepoPath;
Chris@284 1261 m_runner->requestAction(HgAction(ACT_PULL, m_workFolderPath, params));
Chris@126 1262 }
jtkorhonen@0 1263 }
jtkorhonen@0 1264
jtkorhonen@0 1265 void MainWindow::hgPush()
jtkorhonen@0 1266 {
Chris@363 1267 if (m_remoteRepoPath.isEmpty()) {
Chris@363 1268 changeRemoteRepo(true);
Chris@363 1269 if (m_remoteRepoPath.isEmpty()) return;
Chris@363 1270 }
Chris@363 1271
Chris@356 1272 QString uncommittedNote;
Chris@356 1273 if (m_hgTabs->canCommit()) {
Chris@356 1274 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 1275 }
Chris@356 1276
Chris@193 1277 if (ConfirmCommentDialog::confirm
Chris@126 1278 (this, tr("Confirm push"),
Chris@299 1279 tr("<qt><h3>Push to remote repository?</h3></qt>"),
Chris@356 1280 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 1281 tr("&Push"))) {
jtkorhonen@0 1282
Chris@126 1283 QStringList params;
Chris@284 1284 params << "push" << "--new-branch" << m_remoteRepoPath;
Chris@284 1285 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params));
Chris@126 1286 }
jtkorhonen@0 1287 }
jtkorhonen@0 1288
Chris@182 1289 QStringList MainWindow::listAllUpIpV4Addresses()
jtkorhonen@26 1290 {
Chris@182 1291 QStringList ret;
jtkorhonen@26 1292 QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
jtkorhonen@26 1293
Chris@182 1294 for (int i = 0; i < ifaces.count(); i++) {
jtkorhonen@26 1295 QNetworkInterface iface = ifaces.at(i);
Chris@182 1296 if (iface.flags().testFlag(QNetworkInterface::IsUp)
Chris@182 1297 && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
Chris@182 1298 for (int j=0; j<iface.addressEntries().count(); j++) {
jtkorhonen@28 1299 QHostAddress tmp = iface.addressEntries().at(j).ip();
Chris@182 1300 if (QAbstractSocket::IPv4Protocol == tmp.protocol()) {
Chris@182 1301 ret.push_back(tmp.toString());
jtkorhonen@24 1302 }
jtkorhonen@24 1303 }
jtkorhonen@22 1304 }
jtkorhonen@17 1305 }
jtkorhonen@28 1306 return ret;
jtkorhonen@28 1307 }
jtkorhonen@17 1308
Chris@120 1309 void MainWindow::clearState()
Chris@120 1310 {
Chris@305 1311 DEBUG << "MainWindow::clearState" << endl;
Chris@284 1312 foreach (Changeset *cs, m_currentParents) delete cs;
Chris@284 1313 m_currentParents.clear();
Chris@284 1314 foreach (Changeset *cs, m_currentHeads) delete cs;
Chris@284 1315 m_currentHeads.clear();
Chris@506 1316 m_closedHeadIds.clear();
Chris@284 1317 m_currentBranch = "";
Chris@284 1318 m_lastStatOutput = "";
Chris@284 1319 m_lastRevertedFiles.clear();
Chris@284 1320 m_mergeTargetRevision = "";
Chris@284 1321 m_mergeCommitComment = "";
Chris@284 1322 m_stateUnknown = true;
Chris@284 1323 m_needNewLog = true;
Chris@120 1324 }
jtkorhonen@17 1325
jtkorhonen@11 1326 void MainWindow::hgServe()
jtkorhonen@11 1327 {
Chris@109 1328 QStringList params;
Chris@109 1329 QString msg;
jtkorhonen@11 1330
Chris@182 1331 QStringList addrs = listAllUpIpV4Addresses();
Chris@182 1332
Chris@182 1333 if (addrs.empty()) {
Chris@182 1334 QMessageBox::critical
Chris@182 1335 (this, tr("Serve"), tr("Failed to identify an active IPv4 address"));
Chris@182 1336 return;
Chris@182 1337 }
Chris@182 1338
Chris@526 1339 // See #202. We really want to display the port that the server
Chris@526 1340 // ends up using -- but we don't get that information until after
Chris@526 1341 // it has exited! However, we can improve the likelihood of
Chris@526 1342 // showing the right port by at least checking whether a port is
Chris@526 1343 // defined in the hgrc file.
Chris@526 1344
Chris@526 1345 QFileInfo hgrc(QDir::homePath() + "/.hgrc");
Chris@526 1346 QString path;
Chris@526 1347 int port = 8000; // the default
Chris@526 1348 if (hgrc.exists()) {
Chris@526 1349 QSettings s(hgrc.canonicalFilePath(), QSettings::IniFormat);
Chris@526 1350 s.beginGroup("web");
Chris@527 1351 int p = s.value("port").toInt();
Chris@527 1352 if (p) port = p;
Chris@526 1353 }
Chris@182 1354
Chris@182 1355 QTextStream ts(&msg);
Chris@429 1356 ts << QString("<qt><h3>%1</h3><p>%2</p>")
Chris@425 1357 .arg(tr("Sharing Repository"))
Chris@429 1358 .arg(tr("Your local repository is now being made temporarily available via HTTP for workgroup access."));
Chris@429 1359 if (addrs.size() > 1) {
Chris@429 1360 ts << QString("<p>%3</p>")
Chris@429 1361 .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 1362 } else {
Chris@429 1363 ts << QString("<p>%3</p>")
Chris@429 1364 .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 1365 }
Chris@182 1366 foreach (QString addr, addrs) {
Chris@526 1367 ts << QString("<pre>&nbsp;&nbsp;http://%1:%2</pre>").arg(xmlEncode(addr)).arg(port);
Chris@182 1368 }
Chris@425 1369 ts << tr("<p>Press Close to terminate this server, end remote access, and return.</p>");
Chris@182 1370 ts.flush();
Chris@182 1371
Chris@109 1372 params << "serve";
jtkorhonen@11 1373
Chris@284 1374 m_runner->requestAction(HgAction(ACT_SERVE, m_workFolderPath, params));
Chris@109 1375
Chris@425 1376 QMessageBox::information(this, tr("Share Repository"), msg, QMessageBox::Close);
Chris@182 1377
Chris@284 1378 m_runner->killCurrentActions();
jtkorhonen@11 1379 }
jtkorhonen@11 1380
Chris@64 1381 void MainWindow::startupDialog()
Chris@64 1382 {
Chris@64 1383 StartupDialog *dlg = new StartupDialog(this);
Chris@284 1384 if (dlg->exec()) m_firstStart = false;
Chris@344 1385 else exit(0);
Chris@64 1386 }
jtkorhonen@11 1387
Chris@69 1388 void MainWindow::open()
Chris@69 1389 {
Chris@86 1390 bool done = false;
Chris@69 1391
Chris@86 1392 while (!done) {
Chris@69 1393
Chris@86 1394 MultiChoiceDialog *d = new MultiChoiceDialog
Chris@86 1395 (tr("Open Repository"),
Chris@86 1396 tr("<qt><big>What would you like to open?</big></qt>"),
Chris@86 1397 this);
Chris@69 1398
Chris@345 1399 d->addChoice("remote",
Chris@345 1400 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
Chris@345 1401 tr("Open a remote Mercurial repository, by cloning from its URL into a local folder."),
Chris@345 1402 MultiChoiceDialog::UrlToDirectoryArg);
Chris@345 1403
Chris@339 1404 d->addChoice("local",
Chris@339 1405 tr("<qt><center><img src=\":images/hglogo-64.png\"><br>Local repository</center></qt>"),
Chris@339 1406 tr("Open an existing local Mercurial repository."),
Chris@339 1407 MultiChoiceDialog::DirectoryArg);
Chris@339 1408
Chris@339 1409 d->addChoice("init",
Chris@339 1410 tr("<qt><center><img src=\":images/hdd_unmount-64.png\"><br>File folder</center></qt>"),
Chris@339 1411 tr("Open a local folder, by creating a Mercurial repository in it."),
Chris@339 1412 MultiChoiceDialog::DirectoryArg);
Chris@339 1413
Chris@248 1414 QSettings settings;
Chris@484 1415 settings.beginGroup("");
Chris@359 1416 QString lastChoice = settings.value("lastopentype", "remote").toString();
Chris@248 1417 if (lastChoice != "local" &&
Chris@248 1418 lastChoice != "remote" &&
Chris@248 1419 lastChoice != "init") {
Chris@359 1420 lastChoice = "remote";
Chris@248 1421 }
Chris@248 1422
Chris@248 1423 d->setCurrentChoice(lastChoice);
Chris@86 1424
Chris@86 1425 if (d->exec() == QDialog::Accepted) {
Chris@86 1426
Chris@86 1427 QString choice = d->getCurrentChoice();
Chris@248 1428 settings.setValue("lastopentype", choice);
Chris@248 1429
Chris@86 1430 QString arg = d->getArgument().trimmed();
Chris@86 1431
Chris@86 1432 bool result = false;
Chris@86 1433
Chris@86 1434 if (choice == "local") {
Chris@86 1435 result = openLocal(arg);
Chris@86 1436 } else if (choice == "remote") {
Chris@86 1437 result = openRemote(arg, d->getAdditionalArgument().trimmed());
Chris@86 1438 } else if (choice == "init") {
Chris@86 1439 result = openInit(arg);
Chris@86 1440 }
Chris@86 1441
Chris@86 1442 if (result) {
Chris@86 1443 enableDisableActions();
Chris@120 1444 clearState();
Chris@109 1445 hgQueryPaths();
Chris@91 1446 done = true;
Chris@91 1447 }
Chris@86 1448
Chris@86 1449 } else {
Chris@86 1450
Chris@86 1451 // cancelled
Chris@86 1452 done = true;
Chris@69 1453 }
Chris@79 1454
Chris@86 1455 delete d;
Chris@69 1456 }
Chris@69 1457 }
Chris@69 1458
Chris@359 1459 void MainWindow::recentMenuActivated()
Chris@359 1460 {
Chris@359 1461 QAction *a = qobject_cast<QAction *>(sender());
Chris@359 1462 if (!a) return;
Chris@359 1463 QString local = a->text();
Chris@359 1464 open(local);
Chris@359 1465 }
Chris@359 1466
Chris@182 1467 void MainWindow::changeRemoteRepo()
Chris@182 1468 {
Chris@363 1469 changeRemoteRepo(false);
Chris@363 1470 }
Chris@363 1471
Chris@363 1472 void MainWindow::changeRemoteRepo(bool initial)
Chris@363 1473 {
Chris@183 1474 // This will involve rewriting the local .hgrc
Chris@183 1475
Chris@284 1476 QDir hgDir(m_workFolderPath + "/.hg");
Chris@184 1477 if (!hgDir.exists()) {
Chris@184 1478 //!!! visible error!
Chris@184 1479 return;
Chris@184 1480 }
Chris@184 1481
Chris@284 1482 QFileInfo hgrc(m_workFolderPath + "/.hg/hgrc");
Chris@184 1483 if (hgrc.exists() && !hgrc.isWritable()) {
Chris@183 1484 //!!! visible error!
Chris@183 1485 return;
Chris@183 1486 }
Chris@183 1487
Chris@183 1488 MultiChoiceDialog *d = new MultiChoiceDialog
Chris@363 1489 (tr("Set Remote Location"),
Chris@363 1490 tr("<qt><big>Set the remote location</big></qt>"),
Chris@183 1491 this);
Chris@183 1492
Chris@363 1493 QString explanation;
Chris@363 1494 if (initial) {
Chris@363 1495 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 1496 } else {
Chris@363 1497 explanation = tr("Provide a new URL to use for push and pull actions from the current local repository.");
Chris@363 1498 }
Chris@363 1499
Chris@183 1500 d->addChoice("remote",
Chris@183 1501 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
Chris@363 1502 explanation,
Chris@553 1503 MultiChoiceDialog::UrlArg,
Chris@553 1504 true); // default empty
Chris@183 1505
Chris@183 1506 if (d->exec() == QDialog::Accepted) {
Chris@210 1507
Chris@210 1508 // New block to ensure QSettings is deleted before
Chris@210 1509 // hgQueryPaths called. NB use of absoluteFilePath instead of
Chris@210 1510 // canonicalFilePath, which would fail if the file did not yet
Chris@210 1511 // exist
Chris@210 1512
Chris@210 1513 {
Chris@210 1514 QSettings s(hgrc.absoluteFilePath(), QSettings::IniFormat);
Chris@210 1515 s.beginGroup("paths");
Chris@210 1516 s.setValue("default", d->getArgument());
Chris@210 1517 }
Chris@210 1518
Chris@284 1519 m_stateUnknown = true;
Chris@183 1520 hgQueryPaths();
Chris@183 1521 }
Chris@183 1522
Chris@183 1523 delete d;
Chris@182 1524 }
Chris@182 1525
Chris@145 1526 void MainWindow::open(QString local)
Chris@145 1527 {
Chris@145 1528 if (openLocal(local)) {
Chris@145 1529 enableDisableActions();
Chris@145 1530 clearState();
Chris@145 1531 hgQueryPaths();
Chris@145 1532 }
Chris@145 1533 }
Chris@145 1534
Chris@79 1535 bool MainWindow::complainAboutFilePath(QString arg)
Chris@79 1536 {
Chris@79 1537 QMessageBox::critical
Chris@79 1538 (this, tr("File chosen"),
Chris@84 1539 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 1540 return false;
Chris@79 1541 }
Chris@79 1542
Chris@248 1543 bool MainWindow::askAboutUnknownFolder(QString arg)
Chris@248 1544 {
Chris@248 1545 bool result = (QMessageBox::question
Chris@248 1546 (this, tr("Path does not exist"),
Chris@248 1547 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 1548 QMessageBox::Ok | QMessageBox::Cancel,
Chris@248 1549 QMessageBox::Cancel)
Chris@248 1550 == QMessageBox::Ok);
Chris@248 1551 if (result) {
Chris@248 1552 QDir dir(arg);
Chris@248 1553 dir.cdUp();
Chris@248 1554 if (!dir.mkpath(dir.absolutePath())) {
Chris@248 1555 QMessageBox::critical
Chris@248 1556 (this, tr("Failed to create folder"),
Chris@248 1557 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 1558 return false;
Chris@248 1559 }
Chris@248 1560 return true;
Chris@248 1561 }
Chris@248 1562 return false;
Chris@248 1563 }
Chris@248 1564
Chris@79 1565 bool MainWindow::complainAboutUnknownFolder(QString arg)
Chris@79 1566 {
Chris@79 1567 QMessageBox::critical
Chris@79 1568 (this, tr("Folder does not exist"),
Chris@84 1569 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 1570 return false;
Chris@84 1571 }
Chris@84 1572
Chris@84 1573 bool MainWindow::complainAboutInitInRepo(QString arg)
Chris@84 1574 {
Chris@84 1575 QMessageBox::critical
Chris@84 1576 (this, tr("Path is in existing repository"),
Chris@84 1577 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 1578 return false;
Chris@84 1579 }
Chris@84 1580
Chris@84 1581 bool MainWindow::complainAboutInitFile(QString arg)
Chris@84 1582 {
Chris@84 1583 QMessageBox::critical
Chris@84 1584 (this, tr("Path is a file"),
Chris@84 1585 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 1586 return false;
Chris@84 1587 }
Chris@84 1588
Chris@84 1589 bool MainWindow::complainAboutCloneToExisting(QString arg)
Chris@84 1590 {
Chris@84 1591 QMessageBox::critical
Chris@84 1592 (this, tr("Path is in existing repository"),
Chris@237 1593 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 1594 return false;
Chris@84 1595 }
Chris@84 1596
Chris@84 1597 bool MainWindow::complainAboutCloneToFile(QString arg)
Chris@84 1598 {
Chris@84 1599 QMessageBox::critical
Chris@84 1600 (this, tr("Path is a file"),
Chris@84 1601 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 1602 return false;
Chris@84 1603 }
Chris@84 1604
Chris@237 1605 QString MainWindow::complainAboutCloneToExistingFolder(QString arg, QString remote)
Chris@84 1606 {
Chris@348 1607 // If the directory "arg" exists but is empty, then we accept it.
Chris@348 1608
Chris@348 1609 // If the directory "arg" exists and is non-empty, but "arg" plus
Chris@348 1610 // the last path component of "remote" does not exist, then offer
Chris@348 1611 // the latter as an alternative path.
Chris@237 1612
Chris@237 1613 QString offer;
Chris@237 1614
Chris@237 1615 QDir d(arg);
Chris@348 1616
Chris@237 1617 if (d.exists()) {
Chris@348 1618
Chris@348 1619 if (d.entryList(QDir::Dirs | QDir::Files |
Chris@348 1620 QDir::NoDotAndDotDot |
Chris@348 1621 QDir::Hidden | QDir::System).empty()) {
Chris@348 1622 // directory is empty; accept it
Chris@348 1623 return arg;
Chris@348 1624 }
Chris@348 1625
Chris@237 1626 if (QRegExp("^\\w+://").indexIn(remote) >= 0) {
Chris@237 1627 QString rpath = QUrl(remote).path();
Chris@237 1628 if (rpath != "") {
Chris@237 1629 rpath = QDir(rpath).dirName();
Chris@237 1630 if (rpath != "" && !d.exists(rpath)) {
Chris@237 1631 offer = d.filePath(rpath);
Chris@237 1632 }
Chris@237 1633 }
Chris@237 1634 }
Chris@237 1635 }
Chris@237 1636
Chris@237 1637 if (offer != "") {
Chris@237 1638 bool result = (QMessageBox::question
Chris@237 1639 (this, tr("Folder exists"),
Chris@237 1640 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 1641 .arg(xmlEncode(arg)).arg(xmlEncode(offer)),
Chris@237 1642 QMessageBox::Ok | QMessageBox::Cancel,
Chris@237 1643 QMessageBox::Cancel)
Chris@237 1644 == QMessageBox::Ok);
Chris@237 1645 if (result) return offer;
Chris@237 1646 else return "";
Chris@237 1647 }
Chris@237 1648
Chris@84 1649 QMessageBox::critical
Chris@84 1650 (this, tr("Folder exists"),
Chris@237 1651 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 1652 return "";
Chris@79 1653 }
Chris@79 1654
Chris@79 1655 bool MainWindow::askToOpenParentRepo(QString arg, QString parent)
Chris@79 1656 {
Chris@79 1657 return (QMessageBox::question
Chris@84 1658 (this, tr("Path is inside a repository"),
Chris@86 1659 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 1660 .arg(xmlEncode(arg)).arg(xmlEncode(parent)),
Chris@79 1661 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1662 QMessageBox::Ok)
Chris@79 1663 == QMessageBox::Ok);
Chris@79 1664 }
Chris@79 1665
Chris@79 1666 bool MainWindow::askToInitExisting(QString arg)
Chris@79 1667 {
Chris@79 1668 return (QMessageBox::question
Chris@84 1669 (this, tr("Folder has no repository"),
Chris@359 1670 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 1671 .arg(xmlEncode(arg)),
Chris@79 1672 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1673 QMessageBox::Ok)
Chris@79 1674 == QMessageBox::Ok);
Chris@79 1675 }
Chris@79 1676
Chris@79 1677 bool MainWindow::askToInitNew(QString arg)
Chris@79 1678 {
Chris@79 1679 return (QMessageBox::question
Chris@84 1680 (this, tr("Folder does not exist"),
Chris@84 1681 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 1682 .arg(xmlEncode(arg)),
Chris@84 1683 QMessageBox::Ok | QMessageBox::Cancel,
Chris@84 1684 QMessageBox::Ok)
Chris@84 1685 == QMessageBox::Ok);
Chris@84 1686 }
Chris@84 1687
Chris@84 1688 bool MainWindow::askToOpenInsteadOfInit(QString arg)
Chris@84 1689 {
Chris@84 1690 return (QMessageBox::question
Chris@84 1691 (this, tr("Repository exists"),
Chris@84 1692 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 1693 .arg(xmlEncode(arg)),
Chris@79 1694 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1695 QMessageBox::Ok)
Chris@79 1696 == QMessageBox::Ok);
Chris@79 1697 }
Chris@79 1698
Chris@79 1699 bool MainWindow::openLocal(QString local)
Chris@79 1700 {
Chris@79 1701 DEBUG << "open " << local << endl;
Chris@79 1702
Chris@79 1703 FolderStatus status = getFolderStatus(local);
Chris@79 1704 QString containing = getContainingRepoFolder(local);
Chris@79 1705
Chris@79 1706 switch (status) {
Chris@79 1707
Chris@79 1708 case FolderHasRepo:
Chris@79 1709 // fine
Chris@79 1710 break;
Chris@79 1711
Chris@79 1712 case FolderExists:
Chris@79 1713 if (containing != "") {
Chris@79 1714 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1715 local = containing;
Chris@79 1716 } else {
Chris@86 1717 //!!! No -- this is likely to happen far more by accident
Chris@86 1718 // than because the user actually wanted to init something.
Chris@86 1719 // Don't ask, just politely reject.
Chris@79 1720 if (!askToInitExisting(local)) return false;
Chris@79 1721 return openInit(local);
Chris@79 1722 }
Chris@79 1723 break;
Chris@79 1724
Chris@79 1725 case FolderParentExists:
Chris@79 1726 if (containing != "") {
Chris@79 1727 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1728 local = containing;
Chris@79 1729 } else {
Chris@79 1730 if (!askToInitNew(local)) return false;
Chris@79 1731 return openInit(local);
Chris@79 1732 }
Chris@79 1733 break;
Chris@79 1734
Chris@79 1735 case FolderUnknown:
Chris@84 1736 if (containing != "") {
Chris@84 1737 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1738 local = containing;
Chris@84 1739 } else {
Chris@84 1740 return complainAboutUnknownFolder(local);
Chris@84 1741 }
Chris@84 1742 break;
Chris@79 1743
Chris@79 1744 case FolderIsFile:
Chris@79 1745 return complainAboutFilePath(local);
Chris@79 1746 }
Chris@79 1747
Chris@284 1748 m_workFolderPath = local;
Chris@284 1749 m_remoteRepoPath = "";
Chris@79 1750 return true;
Chris@79 1751 }
Chris@79 1752
Chris@79 1753 bool MainWindow::openRemote(QString remote, QString local)
Chris@79 1754 {
Chris@79 1755 DEBUG << "clone " << remote << " to " << local << endl;
Chris@84 1756
Chris@84 1757 FolderStatus status = getFolderStatus(local);
Chris@84 1758 QString containing = getContainingRepoFolder(local);
Chris@84 1759
Chris@84 1760 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 1761
Chris@84 1762 if (status == FolderHasRepo || containing != "") {
Chris@84 1763 return complainAboutCloneToExisting(local);
Chris@84 1764 }
Chris@84 1765
Chris@84 1766 if (status == FolderIsFile) {
Chris@84 1767 return complainAboutCloneToFile(local);
Chris@84 1768 }
Chris@84 1769
Chris@84 1770 if (status == FolderUnknown) {
Chris@248 1771 if (!askAboutUnknownFolder(local)) {
Chris@248 1772 return false;
Chris@248 1773 }
Chris@84 1774 }
Chris@84 1775
Chris@84 1776 if (status == FolderExists) {
Chris@237 1777 local = complainAboutCloneToExistingFolder(local, remote);
Chris@237 1778 if (local == "") return false;
Chris@84 1779 }
Chris@84 1780
Chris@284 1781 m_workFolderPath = local;
Chris@284 1782 m_remoteRepoPath = remote;
Chris@84 1783 hgCloneFromRemote();
Chris@84 1784
Chris@79 1785 return true;
Chris@79 1786 }
Chris@79 1787
Chris@84 1788 bool MainWindow::openInit(QString local)
Chris@79 1789 {
Chris@84 1790 DEBUG << "openInit " << local << endl;
Chris@84 1791
Chris@84 1792 FolderStatus status = getFolderStatus(local);
Chris@84 1793 QString containing = getContainingRepoFolder(local);
Chris@84 1794
Chris@84 1795 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 1796
Chris@84 1797 if (status == FolderHasRepo) {
Chris@84 1798 if (!askToOpenInsteadOfInit(local)) return false;
Chris@552 1799 return openLocal(local);
Chris@84 1800 }
Chris@84 1801
Chris@84 1802 if (containing != "") {
Chris@84 1803 return complainAboutInitInRepo(local);
Chris@84 1804 }
Chris@84 1805
Chris@84 1806 if (status == FolderIsFile) {
Chris@84 1807 return complainAboutInitFile(local);
Chris@84 1808 }
Chris@84 1809
Chris@84 1810 if (status == FolderUnknown) {
Chris@84 1811 return complainAboutUnknownFolder(local);
Chris@84 1812 }
Chris@84 1813
Chris@284 1814 m_workFolderPath = local;
Chris@284 1815 m_remoteRepoPath = "";
Chris@84 1816 hgInit();
Chris@79 1817 return true;
Chris@79 1818 }
Chris@79 1819
jtkorhonen@0 1820 void MainWindow::settings()
jtkorhonen@0 1821 {
Chris@472 1822 settings(SettingsDialog::PersonalDetailsTab);
Chris@472 1823 }
Chris@472 1824
Chris@472 1825 void MainWindow::settings(SettingsDialog::Tab tab)
Chris@472 1826 {
jtkorhonen@0 1827 SettingsDialog *settingsDlg = new SettingsDialog(this);
Chris@472 1828 settingsDlg->setCurrentTab(tab);
jtkorhonen@0 1829 settingsDlg->exec();
Chris@230 1830
Chris@230 1831 if (settingsDlg->presentationChanged()) {
Chris@284 1832 m_hgTabs->updateFileStates();
Chris@230 1833 updateToolBarStyle();
Chris@273 1834 hgRefresh();
Chris@230 1835 }
jtkorhonen@0 1836 }
jtkorhonen@0 1837
Chris@541 1838 void MainWindow::updateFsWatcher()
Chris@541 1839 {
Chris@541 1840 m_fsWatcher->setWorkDirPath(m_workFolderPath);
Chris@541 1841 m_fsWatcher->setTrackedFilePaths(m_hgTabs->getFileStates().trackedFiles());
Chris@541 1842 }
Chris@541 1843
Chris@238 1844 void MainWindow::checkFilesystem()
Chris@238 1845 {
Chris@238 1846 DEBUG << "MainWindow::checkFilesystem" << endl;
Chris@541 1847 if (!m_commandSequenceInProgress) {
Chris@541 1848 if (!m_fsWatcher->getChangedPaths(m_fsWatcherToken).empty()) {
Chris@541 1849 hgRefresh();
Chris@541 1850 return;
Chris@541 1851 }
Chris@549 1852 updateFsWatcher();
Chris@541 1853 }
Chris@90 1854 }
Chris@90 1855
Chris@275 1856 QString MainWindow::format1(QString head)
Chris@275 1857 {
Chris@275 1858 return QString("<qt><h3>%1</h3></qt>").arg(head);
Chris@275 1859 }
Chris@275 1860
Chris@125 1861 QString MainWindow::format3(QString head, QString intro, QString code)
Chris@125 1862 {
Chris@196 1863 code = xmlEncode(code).replace("\n", "<br>")
Chris@196 1864 #ifndef Q_OS_WIN32
Chris@196 1865 // The hard hyphen comes out funny on Windows
Chris@196 1866 .replace("-", "&#8209;")
Chris@196 1867 #endif
Chris@196 1868 .replace(" ", "&nbsp;");
Chris@125 1869 if (intro == "") {
Chris@168 1870 return QString("<qt><h3>%1</h3><p><code>%2</code></p>")
Chris@168 1871 .arg(head).arg(code);
Chris@126 1872 } else if (code == "") {
Chris@126 1873 return QString("<qt><h3>%1</h3><p>%2</p>")
Chris@126 1874 .arg(head).arg(intro);
Chris@125 1875 } else {
Chris@168 1876 return QString("<qt><h3>%1</h3><p>%2</p><p><code>%3</code></p>")
Chris@168 1877 .arg(head).arg(intro).arg(code);
Chris@125 1878 }
Chris@125 1879 }
Chris@125 1880
Chris@120 1881 void MainWindow::showIncoming(QString output)
Chris@120 1882 {
Chris@284 1883 m_runner->hide();
Chris@125 1884 IncomingDialog *d = new IncomingDialog(this, output);
Chris@125 1885 d->exec();
Chris@125 1886 delete d;
Chris@125 1887 }
Chris@125 1888
Chris@125 1889 int MainWindow::extractChangeCount(QString text)
Chris@125 1890 {
Chris@125 1891 QRegExp re("added (\\d+) ch\\w+ with (\\d+) ch\\w+ to (\\d+) f\\w+");
Chris@125 1892 if (re.indexIn(text) >= 0) {
Chris@125 1893 return re.cap(1).toInt();
Chris@125 1894 } else if (text.contains("no changes")) {
Chris@125 1895 return 0;
Chris@125 1896 } else {
Chris@125 1897 return -1; // unknown
Chris@125 1898 }
Chris@120 1899 }
Chris@120 1900
Chris@120 1901 void MainWindow::showPushResult(QString output)
Chris@120 1902 {
Chris@291 1903 QString head;
Chris@125 1904 QString report;
Chris@125 1905 int n = extractChangeCount(output);
Chris@125 1906 if (n > 0) {
Chris@291 1907 head = tr("Pushed %n changeset(s)", "", n);
Chris@300 1908 report = tr("<qt>Successfully pushed to the remote repository at <code>%1</code>.</qt>").arg(xmlEncode(m_remoteRepoPath));
Chris@125 1909 } else if (n == 0) {
Chris@291 1910 head = tr("No changes to push");
Chris@291 1911 report = tr("The remote repository already contains all changes that have been committed locally.");
Chris@294 1912 if (m_hgTabs->canCommit()) {
Chris@291 1913 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 1914 }
Chris@125 1915 } else {
Chris@291 1916 head = tr("Push complete");
Chris@125 1917 }
Chris@284 1918 m_runner->hide();
Chris@291 1919
Chris@291 1920 MoreInformationDialog::information(this, tr("Push complete"),
Chris@291 1921 head, report, output);
Chris@120 1922 }
Chris@120 1923
Chris@120 1924 void MainWindow::showPullResult(QString output)
Chris@120 1925 {
Chris@291 1926 QString head;
Chris@125 1927 QString report;
Chris@125 1928 int n = extractChangeCount(output);
Chris@125 1929 if (n > 0) {
Chris@291 1930 head = tr("Pulled %n changeset(s)", "", n);
Chris@322 1931 report = tr("New changes will be highlighted in yellow in the history.");
Chris@125 1932 } else if (n == 0) {
Chris@291 1933 head = tr("No changes to pull");
Chris@291 1934 report = tr("Your local repository already contains all changes found in the remote repository.");
Chris@125 1935 } else {
Chris@291 1936 head = tr("Pull complete");
Chris@125 1937 }
Chris@284 1938 m_runner->hide();
Chris@275 1939
Chris@275 1940 MoreInformationDialog::information(this, tr("Pull complete"),
Chris@291 1941 head, report, output);
Chris@120 1942 }
Chris@120 1943
Chris@174 1944 void MainWindow::reportNewRemoteHeads(QString output)
Chris@174 1945 {
Chris@174 1946 bool headsAreLocal = false;
Chris@174 1947
Chris@284 1948 if (m_currentParents.size() == 1) {
Chris@506 1949 int currentBranchActiveHeads = 0;
Chris@174 1950 bool parentIsHead = false;
Chris@284 1951 Changeset *parent = m_currentParents[0];
Chris@506 1952 foreach (Changeset *head, m_activeHeads) {
Chris@284 1953 if (head->isOnBranch(m_currentBranch)) {
Chris@506 1954 ++currentBranchActiveHeads;
Chris@174 1955 }
Chris@174 1956 if (parent->id() == head->id()) {
Chris@174 1957 parentIsHead = true;
Chris@174 1958 }
Chris@174 1959 }
Chris@506 1960 if (currentBranchActiveHeads == 2 && parentIsHead) {
Chris@174 1961 headsAreLocal = true;
Chris@174 1962 }
Chris@174 1963 }
Chris@174 1964
Chris@174 1965 if (headsAreLocal) {
Chris@291 1966 MoreInformationDialog::warning
Chris@291 1967 (this,
Chris@291 1968 tr("Push failed"),
Chris@291 1969 tr("Push failed"),
Chris@291 1970 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 1971 output);
Chris@318 1972 } else if (m_hgTabs->canCommit() && m_currentParents.size() > 1) {
Chris@318 1973 MoreInformationDialog::warning
Chris@318 1974 (this,
Chris@318 1975 tr("Push failed"),
Chris@318 1976 tr("Push failed"),
Chris@318 1977 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 1978 output);
Chris@174 1979 } else {
Chris@291 1980 MoreInformationDialog::warning
Chris@291 1981 (this,
Chris@291 1982 tr("Push failed"),
Chris@291 1983 tr("Push failed"),
Chris@291 1984 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 1985 output);
Chris@174 1986 }
Chris@174 1987 }
Chris@174 1988
Chris@353 1989 void MainWindow::reportAuthFailed(QString output)
Chris@353 1990 {
Chris@353 1991 MoreInformationDialog::warning
Chris@353 1992 (this,
Chris@353 1993 tr("Authorization failed"),
Chris@353 1994 tr("Authorization failed"),
Chris@353 1995 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 1996 output);
Chris@353 1997 }
Chris@353 1998
Chris@238 1999 void MainWindow::commandStarting(HgAction action)
Chris@238 2000 {
Chris@540 2001 m_commandSequenceInProgress = true;
Chris@238 2002 }
Chris@238 2003
Chris@546 2004 void MainWindow::commandFailed(HgAction action, QString stdErr, QString stdOut)
Chris@62 2005 {
Chris@62 2006 DEBUG << "MainWindow::commandFailed" << endl;
Chris@540 2007
Chris@540 2008 m_commandSequenceInProgress = false;
Chris@74 2009
Chris@210 2010 QString setstr;
Chris@210 2011 #ifdef Q_OS_MAC
Chris@210 2012 setstr = tr("Preferences");
Chris@210 2013 #else
Chris@210 2014 setstr = tr("Settings");
Chris@210 2015 #endif
Chris@210 2016
Chris@353 2017 // Some commands we just have to ignore bad return values from,
Chris@353 2018 // and some output gets special treatment.
Chris@353 2019
Chris@353 2020 // Note our fallback case should always be to report a
Chris@353 2021 // non-specific error and show the text -- in case output scraping
Chris@353 2022 // fails (as it surely will). Note also that we must force the
Chris@353 2023 // locale in order to ensure the output is scrapable; this happens
Chris@353 2024 // in HgRunner and may break some system encodings.
Chris@113 2025
Chris@113 2026 switch(action.action) {
Chris@113 2027 case ACT_NONE:
Chris@113 2028 // uh huh
Chris@113 2029 return;
Chris@175 2030 case ACT_TEST_HG:
Chris@291 2031 MoreInformationDialog::warning
Chris@291 2032 (this,
Chris@291 2033 tr("Failed to run Mercurial"),
Chris@291 2034 tr("Failed to run Mercurial"),
Chris@483 2035 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 2036 stdErr);
Chris@472 2037 settings(SettingsDialog::PathsTab);
Chris@200 2038 return;
Chris@200 2039 case ACT_TEST_HG_EXT:
Chris@309 2040 MoreInformationDialog::warning
Chris@291 2041 (this,
Chris@291 2042 tr("Failed to run Mercurial"),
Chris@291 2043 tr("Failed to run Mercurial with extension enabled"),
Chris@310 2044 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 2045 stdErr);
Chris@472 2046 settings(SettingsDialog::PathsTab);
Chris@175 2047 return;
Chris@252 2048 case ACT_CLONEFROMREMOTE:
Chris@252 2049 // if clone fails, we have no repo
Chris@284 2050 m_workFolderPath = "";
Chris@252 2051 enableDisableActions();
Chris@330 2052 break; // go on to default report
Chris@113 2053 case ACT_INCOMING:
Chris@545 2054 if (stdErr.contains("authorization failed")) {
Chris@545 2055 reportAuthFailed(stdErr);
Chris@353 2056 return;
Chris@545 2057 } else if (stdErr.contains("entry cancelled")) {
Chris@358 2058 // ignore this, user cancelled username or password dialog
Chris@358 2059 return;
Chris@353 2060 } else {
Chris@545 2061 // Incoming returns non-zero code and no stdErr if the
Chris@353 2062 // check was successful but there are no changes
Chris@353 2063 // pending. This is the only case where we need to remove
Chris@353 2064 // warning messages, because it's the only case where a
Chris@353 2065 // non-zero code can be returned even though the command
Chris@353 2066 // has for our purposes succeeded
Chris@545 2067 QString replaced = stdErr;
Chris@352 2068 while (1) {
Chris@352 2069 QString r1 = replaced;
Chris@352 2070 r1.replace(QRegExp("warning: [^\\n]*"), "");
Chris@352 2071 if (r1 == replaced) break;
Chris@352 2072 replaced = r1.trimmed();
Chris@352 2073 }
Chris@352 2074 if (replaced == "") {
Chris@352 2075 showIncoming("");
Chris@352 2076 return;
Chris@352 2077 }
Chris@211 2078 }
Chris@330 2079 break; // go on to default report
Chris@353 2080 case ACT_PULL:
Chris@545 2081 if (stdErr.contains("authorization failed")) {
Chris@545 2082 reportAuthFailed(stdErr);
Chris@353 2083 return;
Chris@545 2084 } else if (stdErr.contains("entry cancelled")) {
Chris@358 2085 // ignore this, user cancelled username or password dialog
Chris@358 2086 return;
Chris@546 2087 } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
Chris@537 2088 // success: hg 2.1 starts returning failure code for empty pull/push
Chris@540 2089 m_commandSequenceInProgress = true; // there may be further commands
Chris@546 2090 commandCompleted(action, stdOut);
Chris@537 2091 return;
Chris@353 2092 }
Chris@353 2093 break; // go on to default report
Chris@353 2094 case ACT_PUSH:
Chris@545 2095 if (stdErr.contains("creates new remote head")) {
Chris@545 2096 reportNewRemoteHeads(stdErr);
Chris@353 2097 return;
Chris@545 2098 } else if (stdErr.contains("authorization failed")) {
Chris@545 2099 reportAuthFailed(stdErr);
Chris@353 2100 return;
Chris@545 2101 } else if (stdErr.contains("entry cancelled")) {
Chris@358 2102 // ignore this, user cancelled username or password dialog
Chris@358 2103 return;
Chris@546 2104 } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
Chris@537 2105 // success: hg 2.1 starts returning failure code for empty pull/push
Chris@540 2106 m_commandSequenceInProgress = true; // there may be further commands
Chris@546 2107 commandCompleted(action, stdOut);
Chris@537 2108 return;
Chris@353 2109 }
Chris@353 2110 break; // go on to default report
Chris@506 2111 case ACT_QUERY_HEADS_ACTIVE:
Chris@162 2112 case ACT_QUERY_HEADS:
Chris@162 2113 // fails if repo is empty; we don't care (if there's a genuine
Chris@202 2114 // problem, something else will fail too). Pretend it
Chris@202 2115 // succeeded, so that any further actions that are contingent
Chris@202 2116 // on the success of the heads query get carried out properly.
Chris@540 2117 m_commandSequenceInProgress = true; // there may be further commands
Chris@202 2118 commandCompleted(action, "");
Chris@162 2119 return;
Chris@113 2120 case ACT_FOLDERDIFF:
Chris@113 2121 case ACT_CHGSETDIFF:
Chris@545 2122 // external program, unlikely to be anything useful in stdErr
Chris@113 2123 // and some return with failure codes when something as basic
Chris@113 2124 // as the user closing the window via the wm happens
Chris@113 2125 return;
Chris@328 2126 case ACT_MERGE:
Chris@545 2127 if (stdErr.contains("working directory ancestor")) {
Chris@530 2128 // arguably we should prevent this upfront, but that's
Chris@530 2129 // trickier!
Chris@530 2130 MoreInformationDialog::information
Chris@530 2131 (this, tr("Merge"), tr("Merge has no effect"),
Chris@530 2132 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 2133 stdErr);
Chris@530 2134 return;
Chris@530 2135 }
Chris@530 2136 // else fall through
Chris@328 2137 case ACT_RETRY_MERGE:
Chris@328 2138 MoreInformationDialog::information
Chris@328 2139 (this, tr("Merge"), tr("Merge failed"),
Chris@328 2140 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 2141 stdErr);
Chris@378 2142 m_mergeCommitComment = "";
Chris@603 2143 hgQueryPaths();
Chris@328 2144 return;
Chris@199 2145 case ACT_STAT:
Chris@330 2146 break; // go on to default report
Chris@113 2147 default:
Chris@114 2148 break;
Chris@113 2149 }
Chris@113 2150
Chris@113 2151 QString command = action.executable;
Chris@113 2152 if (command == "") command = "hg";
Chris@113 2153 foreach (QString arg, action.params) {
Chris@113 2154 command += " " + arg;
Chris@113 2155 }
Chris@113 2156
Chris@309 2157 MoreInformationDialog::warning
Chris@309 2158 (this,
Chris@309 2159 tr("Command failed"),
Chris@309 2160 tr("Command failed"),
Chris@545 2161 (stdErr == "" ?
Chris@483 2162 tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.") :
Chris@483 2163 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 2164 stdErr);
Chris@62 2165 }
Chris@62 2166
Chris@109 2167 void MainWindow::commandCompleted(HgAction completedAction, QString output)
jtkorhonen@0 2168 {
Chris@521 2169 // std::cerr << "commandCompleted: " << completedAction.action << std::endl;
Chris@519 2170
Chris@109 2171 HGACTIONS action = completedAction.action;
Chris@109 2172
Chris@109 2173 if (action == ACT_NONE) return;
Chris@109 2174
Chris@519 2175 output.replace("\r\n", "\n");
Chris@519 2176
Chris@150 2177 bool headsChanged = false;
Chris@150 2178 QStringList oldHeadIds;
Chris@150 2179
Chris@150 2180 switch (action) {
Chris@109 2181
Chris@175 2182 case ACT_TEST_HG:
Chris@377 2183 {
Chris@377 2184 QRegExp versionRE("^Mercurial.*version ([\\d+])\\.([\\d+])");
Chris@377 2185 int pos = versionRE.indexIn(output);
Chris@377 2186 if (pos >= 0) {
Chris@377 2187 int major = versionRE.cap(1).toInt();
Chris@377 2188 int minor = versionRE.cap(2).toInt();
Chris@377 2189 // We need v1.7 or newer
Chris@377 2190 if (major < 1 || (major == 1 && minor < 7)) {
Chris@377 2191 MoreInformationDialog::warning
Chris@377 2192 (this,
Chris@377 2193 tr("Newer Mercurial version required"),
Chris@377 2194 tr("Newer Mercurial version required"),
Chris@377 2195 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 2196 output);
Chris@377 2197 }
Chris@377 2198 }
Chris@175 2199 break;
Chris@377 2200 }
Chris@175 2201
Chris@200 2202 case ACT_TEST_HG_EXT:
Chris@200 2203 break;
Chris@200 2204
Chris@109 2205 case ACT_QUERY_PATHS:
jtkorhonen@0 2206 {
Chris@109 2207 DEBUG << "stdout is " << output << endl;
Chris@109 2208 LogParser lp(output, "=");
Chris@109 2209 LogList ll = lp.parse();
Chris@109 2210 DEBUG << ll.size() << " results" << endl;
Chris@109 2211 if (!ll.empty()) {
Chris@284 2212 m_remoteRepoPath = lp.parse()[0]["default"].trimmed();
Chris@284 2213 DEBUG << "Set remote path to " << m_remoteRepoPath << endl;
Chris@210 2214 } else {
Chris@284 2215 m_remoteRepoPath = "";
Chris@109 2216 }
Chris@284 2217 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 2218 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@287 2219 updateWorkFolderAndRepoNames();
Chris@109 2220 break;
Chris@109 2221 }
jtkorhonen@0 2222
Chris@109 2223 case ACT_QUERY_BRANCH:
Chris@284 2224 m_currentBranch = output.trimmed();
Chris@109 2225 break;
jtkorhonen@0 2226
Chris@109 2227 case ACT_STAT:
Chris@284 2228 m_lastStatOutput = output;
Chris@109 2229 break;
Chris@163 2230
Chris@163 2231 case ACT_RESOLVE_LIST:
Chris@505 2232 // This happens on every update, after the stat (above)
Chris@163 2233 if (output != "") {
Chris@163 2234 // Remove lines beginning with R (they are resolved,
Chris@163 2235 // and the file stat parser treats R as removed)
Chris@163 2236 QStringList outList = output.split('\n');
Chris@163 2237 QStringList winnowed;
Chris@163 2238 foreach (QString line, outList) {
Chris@163 2239 if (!line.startsWith("R ")) winnowed.push_back(line);
Chris@163 2240 }
Chris@163 2241 output = winnowed.join("\n");
Chris@163 2242 }
Chris@284 2243 DEBUG << "m_lastStatOutput = " << m_lastStatOutput << endl;
Chris@199 2244 DEBUG << "resolve output = " << output << endl;
Chris@284 2245 m_hgTabs->updateWorkFolderFileList(m_lastStatOutput + output);
Chris@163 2246 break;
Chris@163 2247
Chris@163 2248 case ACT_RESOLVE_MARK:
Chris@284 2249 m_shouldHgStat = true;
Chris@163 2250 break;
Chris@109 2251
Chris@109 2252 case ACT_INCOMING:
Chris@120 2253 showIncoming(output);
Chris@120 2254 break;
Chris@120 2255
Chris@109 2256 case ACT_ANNOTATE:
Chris@331 2257 {
Chris@331 2258 AnnotateDialog dialog(this, output);
Chris@331 2259 dialog.exec();
Chris@284 2260 m_shouldHgStat = true;
Chris@109 2261 break;
Chris@331 2262 }
Chris@109 2263
Chris@109 2264 case ACT_PULL:
Chris@120 2265 showPullResult(output);
Chris@284 2266 m_shouldHgStat = true;
Chris@109 2267 break;
Chris@109 2268
Chris@109 2269 case ACT_PUSH:
Chris@120 2270 showPushResult(output);
Chris@109 2271 break;
Chris@109 2272
Chris@109 2273 case ACT_INIT:
Chris@284 2274 MultiChoiceDialog::addRecentArgument("init", m_workFolderPath);
Chris@284 2275 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@109 2276 enableDisableActions();
Chris@284 2277 m_shouldHgStat = true;
Chris@109 2278 break;
Chris@109 2279
Chris@109 2280 case ACT_CLONEFROMREMOTE:
Chris@284 2281 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 2282 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@284 2283 MultiChoiceDialog::addRecentArgument("remote", m_workFolderPath, true);
Chris@291 2284 MoreInformationDialog::information
Chris@291 2285 (this,
Chris@291 2286 tr("Clone"),
Chris@384 2287 tr("Open successful"),
Chris@295 2288 tr("The remote repository was successfully cloned to the local folder <code>%1</code>.").arg(xmlEncode(m_workFolderPath)),
Chris@291 2289 output);
Chris@109 2290 enableDisableActions();
Chris@284 2291 m_shouldHgStat = true;
Chris@109 2292 break;
Chris@109 2293
Chris@109 2294 case ACT_LOG:
Chris@284 2295 m_hgTabs->setNewLog(output);
Chris@284 2296 m_needNewLog = false;
Chris@120 2297 break;
Chris@120 2298
Chris@120 2299 case ACT_LOG_INCREMENTAL:
Chris@284 2300 m_hgTabs->addIncrementalLog(output);
Chris@109 2301 break;
Chris@109 2302
Chris@109 2303 case ACT_QUERY_PARENTS:
Chris@152 2304 {
Chris@284 2305 foreach (Changeset *cs, m_currentParents) delete cs;
Chris@284 2306 m_currentParents = Changeset::parseChangesets(output);
Chris@284 2307 QStringList parentIds = Changeset::getIds(m_currentParents);
Chris@284 2308 m_hgTabs->setCurrent(parentIds, m_currentBranch);
Chris@152 2309 }
Chris@109 2310 break;
Chris@109 2311
Chris@506 2312 case ACT_QUERY_HEADS_ACTIVE:
Chris@506 2313 foreach (Changeset *cs, m_activeHeads) delete cs;
Chris@506 2314 m_activeHeads = Changeset::parseChangesets(output);
Chris@506 2315 break;
Chris@506 2316
Chris@109 2317 case ACT_QUERY_HEADS:
Chris@150 2318 {
Chris@284 2319 oldHeadIds = Changeset::getIds(m_currentHeads);
Chris@150 2320 Changesets newHeads = Changeset::parseChangesets(output);
Chris@150 2321 QStringList newHeadIds = Changeset::getIds(newHeads);
Chris@150 2322 if (oldHeadIds != newHeadIds) {
Chris@150 2323 DEBUG << "Heads changed, will prompt an incremental log if appropriate" << endl;
Chris@305 2324 DEBUG << "Old heads: " << oldHeadIds.join(",") << endl;
Chris@305 2325 DEBUG << "New heads: " << newHeadIds.join(",") << endl;
Chris@150 2326 headsChanged = true;
Chris@284 2327 foreach (Changeset *cs, m_currentHeads) delete cs;
Chris@284 2328 m_currentHeads = newHeads;
Chris@506 2329 updateClosedHeads();
Chris@150 2330 }
Chris@150 2331 }
Chris@109 2332 break;
Chris@130 2333
Chris@130 2334 case ACT_COMMIT:
Chris@347 2335 if (m_currentParents.empty()) {
Chris@347 2336 // first commit to empty repo
Chris@347 2337 m_needNewLog = true;
Chris@347 2338 }
Chris@284 2339 m_hgTabs->clearSelections();
Chris@284 2340 m_justMerged = false;
Chris@284 2341 m_shouldHgStat = true;
Chris@130 2342 break;
Chris@163 2343
Chris@514 2344 case ACT_CLOSE_BRANCH:
Chris@514 2345 m_hgTabs->clearSelections();
Chris@514 2346 m_justMerged = false;
Chris@514 2347 m_shouldHgStat = true;
Chris@514 2348 break;
Chris@514 2349
Chris@163 2350 case ACT_REVERT:
Chris@326 2351 hgMarkFilesResolved(m_lastRevertedFiles);
Chris@284 2352 m_justMerged = false;
Chris@163 2353 break;
Chris@109 2354
Chris@109 2355 case ACT_REMOVE:
Chris@109 2356 case ACT_ADD:
Chris@284 2357 m_hgTabs->clearSelections();
Chris@284 2358 m_shouldHgStat = true;
Chris@116 2359 break;
Chris@116 2360
Chris@164 2361 case ACT_TAG:
Chris@284 2362 m_needNewLog = true;
Chris@284 2363 m_shouldHgStat = true;
Chris@164 2364 break;
Chris@164 2365
Chris@278 2366 case ACT_NEW_BRANCH:
Chris@307 2367 m_shouldHgStat = true;
Chris@278 2368 break;
Chris@278 2369
Chris@288 2370 case ACT_UNCOMMITTED_SUMMARY:
Chris@168 2371 QMessageBox::information(this, tr("Change summary"),
Chris@168 2372 format3(tr("Summary of uncommitted changes"),
Chris@168 2373 "",
Chris@168 2374 output));
Chris@168 2375 break;
Chris@168 2376
Chris@288 2377 case ACT_DIFF_SUMMARY:
Chris@289 2378 {
Chris@289 2379 // Output has log info first, diff following after a blank line
Chris@289 2380 QStringList olist = output.split("\n\n", QString::SkipEmptyParts);
Chris@289 2381 if (olist.size() > 1) output = olist[1];
Chris@289 2382
Chris@289 2383 Changeset *cs = (Changeset *)completedAction.extraData;
Chris@289 2384 if (cs) {
Chris@289 2385 QMessageBox::information
Chris@289 2386 (this, tr("Change summary"),
Chris@289 2387 format3(tr("Summary of changes"),
Chris@289 2388 cs->formatHtml(),
Chris@289 2389 output));
Chris@289 2390 } else if (output == "") {
Chris@289 2391 // Can happen, for a merge commit (depending on parent)
Chris@288 2392 QMessageBox::information(this, tr("Change summary"),
Chris@288 2393 format3(tr("Summary of changes"),
Chris@288 2394 tr("No changes"),
Chris@288 2395 output));
Chris@288 2396 } else {
Chris@288 2397 QMessageBox::information(this, tr("Change summary"),
Chris@288 2398 format3(tr("Summary of changes"),
Chris@288 2399 "",
Chris@288 2400 output));
Chris@288 2401 }
Chris@288 2402 break;
Chris@289 2403 }
Chris@288 2404
Chris@109 2405 case ACT_FOLDERDIFF:
Chris@109 2406 case ACT_CHGSETDIFF:
Chris@109 2407 case ACT_SERVE:
Chris@109 2408 case ACT_HG_IGNORE:
Chris@284 2409 m_shouldHgStat = true;
Chris@109 2410 break;
Chris@109 2411
Chris@109 2412 case ACT_UPDATE:
Chris@162 2413 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output)));
Chris@284 2414 m_shouldHgStat = true;
Chris@109 2415 break;
Chris@109 2416
Chris@109 2417 case ACT_MERGE:
Chris@294 2418 MoreInformationDialog::information
Chris@294 2419 (this, tr("Merge"), tr("Merge successful"),
Chris@302 2420 tr("Remember to test and commit the result before making any further changes."),
Chris@294 2421 output);
Chris@284 2422 m_shouldHgStat = true;
Chris@284 2423 m_justMerged = true;
Chris@109 2424 break;
Chris@109 2425
Chris@109 2426 case ACT_RETRY_MERGE:
Chris@163 2427 QMessageBox::information(this, tr("Resolved"),
Chris@302 2428 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 2429 m_shouldHgStat = true;
Chris@284 2430 m_justMerged = true;
Chris@109 2431 break;
Chris@109 2432
Chris@109 2433 default:
Chris@109 2434 break;
Chris@109 2435 }
Chris@108 2436
Chris@121 2437 // Sequence when no full log required:
Chris@520 2438 // paths -> branch -> stat -> resolve-list -> heads ->
Chris@150 2439 // incremental-log (only if heads changed) -> parents
Chris@150 2440 //
Chris@121 2441 // Sequence when full log required:
Chris@520 2442 // paths -> branch -> stat -> resolve-list -> heads ->
Chris@519 2443 // parents -> log
Chris@150 2444 //
Chris@150 2445 // Note we want to call enableDisableActions only once, at the end
Chris@150 2446 // of whichever sequence is in use.
Chris@150 2447
Chris@156 2448 bool noMore = false;
Chris@156 2449
Chris@150 2450 switch (action) {
Chris@175 2451
Chris@175 2452 case ACT_TEST_HG:
Chris@248 2453 {
Chris@248 2454 QSettings settings;
Chris@248 2455 if (settings.value("useextension", true).toBool()) {
Chris@248 2456 hgTestExtension();
Chris@284 2457 } else if (m_workFolderPath == "") {
Chris@248 2458 open();
Chris@248 2459 } else {
Chris@248 2460 hgQueryPaths();
Chris@248 2461 }
Chris@200 2462 break;
Chris@248 2463 }
Chris@200 2464
Chris@200 2465 case ACT_TEST_HG_EXT:
Chris@284 2466 if (m_workFolderPath == "") {
Chris@248 2467 open();
Chris@248 2468 } else{
Chris@248 2469 hgQueryPaths();
Chris@248 2470 }
Chris@175 2471 break;
Chris@150 2472
Chris@150 2473 case ACT_QUERY_PATHS:
Chris@519 2474 // NB this call is duplicated in hgQueryPaths
Chris@109 2475 hgQueryBranch();
Chris@150 2476 break;
Chris@150 2477
Chris@150 2478 case ACT_QUERY_BRANCH:
Chris@519 2479 // NB this call is duplicated in hgQueryBranch
Chris@109 2480 hgStat();
Chris@150 2481 break;
Chris@150 2482
Chris@150 2483 case ACT_STAT:
Chris@163 2484 hgResolveList();
Chris@163 2485 break;
Chris@519 2486
Chris@163 2487 case ACT_RESOLVE_LIST:
Chris@506 2488 hgQueryHeadsActive();
Chris@506 2489 break;
Chris@506 2490
Chris@506 2491 case ACT_QUERY_HEADS_ACTIVE:
Chris@150 2492 hgQueryHeads();
Chris@150 2493 break;
Chris@150 2494
Chris@150 2495 case ACT_QUERY_HEADS:
Chris@284 2496 if (headsChanged && !m_needNewLog) {
Chris@150 2497 hgLogIncremental(oldHeadIds);
Chris@121 2498 } else {
Chris@150 2499 hgQueryParents();
Chris@121 2500 }
Chris@150 2501 break;
Chris@150 2502
Chris@150 2503 case ACT_LOG_INCREMENTAL:
Chris@109 2504 hgQueryParents();
Chris@150 2505 break;
Chris@150 2506
Chris@150 2507 case ACT_QUERY_PARENTS:
Chris@284 2508 if (m_needNewLog) {
Chris@120 2509 hgLog();
Chris@150 2510 } else {
Chris@150 2511 // we're done
Chris@156 2512 noMore = true;
Chris@120 2513 }
Chris@150 2514 break;
Chris@150 2515
Chris@150 2516 case ACT_LOG:
Chris@150 2517 // we're done
Chris@156 2518 noMore = true;
Chris@198 2519 break;
Chris@150 2520
Chris@150 2521 default:
Chris@284 2522 if (m_shouldHgStat) {
Chris@284 2523 m_shouldHgStat = false;
Chris@109 2524 hgQueryPaths();
Chris@150 2525 } else {
Chris@156 2526 noMore = true;
jtkorhonen@0 2527 }
Chris@150 2528 break;
Chris@150 2529 }
Chris@156 2530
Chris@156 2531 if (noMore) {
Chris@540 2532 m_commandSequenceInProgress = false;
Chris@284 2533 m_stateUnknown = false;
Chris@156 2534 enableDisableActions();
Chris@284 2535 m_hgTabs->updateHistory();
Chris@359 2536 updateRecentMenu();
Chris@541 2537 checkFilesystem();
Chris@156 2538 }
jtkorhonen@0 2539 }
jtkorhonen@0 2540
Chris@564 2541 void MainWindow::commandCancelled(HgAction cancelledAction)
Chris@564 2542 {
Chris@564 2543 // Originally I had this checking whether the cancelled action was
Chris@564 2544 // a network one and, if so, calling hgQueryPaths to update the
Chris@564 2545 // local view in case it had changed anything. But that doesn't
Chris@564 2546 // work properly -- because at this point, although the command
Chris@564 2547 // has been cancelled and a kill signal sent, it hasn't actually
Chris@564 2548 // exited yet. If we request another command now, it will go on
Chris@564 2549 // the stack and be associated with the failed exit forthcoming
Chris@564 2550 // from the cancelled command -- giving the user a disturbing
Chris@564 2551 // command-failed dialog
Chris@564 2552 }
Chris@564 2553
jtkorhonen@0 2554 void MainWindow::connectActions()
jtkorhonen@0 2555 {
Chris@284 2556 connect(m_exitAct, SIGNAL(triggered()), this, SLOT(close()));
Chris@284 2557 connect(m_aboutAct, SIGNAL(triggered()), this, SLOT(about()));
Chris@494 2558 connect(m_helpAct, SIGNAL(triggered()), this, SLOT(help()));
Chris@273 2559
Chris@284 2560 connect(m_hgRefreshAct, SIGNAL(triggered()), this, SLOT(hgRefresh()));
Chris@284 2561 connect(m_hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
Chris@284 2562 connect(m_hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
Chris@284 2563 connect(m_hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
Chris@425 2564 connect(m_hgIgnoreAct, SIGNAL(triggered()), this, SLOT(hgIgnore()));
Chris@425 2565 connect(m_hgEditIgnoreAct, SIGNAL(triggered()), this, SLOT(hgEditIgnore()));
Chris@284 2566 connect(m_hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
Chris@284 2567 connect(m_hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
Chris@284 2568 connect(m_hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
Chris@284 2569 connect(m_hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
Chris@273 2570
Chris@284 2571 connect(m_settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
Chris@284 2572 connect(m_openAct, SIGNAL(triggered()), this, SLOT(open()));
Chris@284 2573 connect(m_changeRemoteRepoAct, SIGNAL(triggered()), this, SLOT(changeRemoteRepo()));
Chris@273 2574
Chris@284 2575 connect(m_hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
Chris@284 2576 connect(m_hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
Chris@284 2577 connect(m_hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
Chris@273 2578
Chris@284 2579 connect(m_hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
jtkorhonen@0 2580 }
Chris@141 2581
Chris@141 2582 void MainWindow::connectTabsSignals()
Chris@141 2583 {
Chris@327 2584 connect(m_hgTabs, SIGNAL(currentChanged(int)),
Chris@327 2585 this, SLOT(enableDisableActions()));
Chris@327 2586
Chris@284 2587 connect(m_hgTabs, SIGNAL(commit()),
Chris@141 2588 this, SLOT(hgCommit()));
Chris@141 2589
Chris@284 2590 connect(m_hgTabs, SIGNAL(revert()),
Chris@141 2591 this, SLOT(hgRevert()));
Chris@141 2592
Chris@284 2593 connect(m_hgTabs, SIGNAL(diffWorkingFolder()),
Chris@141 2594 this, SLOT(hgFolderDiff()));
Chris@168 2595
Chris@284 2596 connect(m_hgTabs, SIGNAL(showSummary()),
Chris@168 2597 this, SLOT(hgShowSummary()));
Chris@311 2598
Chris@311 2599 connect(m_hgTabs, SIGNAL(newBranch()),
Chris@311 2600 this, SLOT(hgNewBranch()));
Chris@311 2601
Chris@311 2602 connect(m_hgTabs, SIGNAL(noBranch()),
Chris@311 2603 this, SLOT(hgNoBranch()));
Chris@148 2604
Chris@284 2605 connect(m_hgTabs, SIGNAL(updateTo(QString)),
Chris@148 2606 this, SLOT(hgUpdateToRev(QString)));
Chris@141 2607
Chris@284 2608 connect(m_hgTabs, SIGNAL(diffToCurrent(QString)),
Chris@148 2609 this, SLOT(hgDiffToCurrent(QString)));
Chris@141 2610
Chris@284 2611 connect(m_hgTabs, SIGNAL(diffToParent(QString, QString)),
Chris@148 2612 this, SLOT(hgDiffToParent(QString, QString)));
Chris@141 2613
Chris@289 2614 connect(m_hgTabs, SIGNAL(showSummary(Changeset *)),
Chris@289 2615 this, SLOT(hgShowSummaryFor(Changeset *)));
Chris@288 2616
Chris@284 2617 connect(m_hgTabs, SIGNAL(mergeFrom(QString)),
Chris@148 2618 this, SLOT(hgMergeFrom(QString)));
Chris@164 2619
Chris@307 2620 connect(m_hgTabs, SIGNAL(newBranch(QString)),
Chris@311 2621 this, SLOT(hgNewBranch()));
Chris@278 2622
Chris@514 2623 connect(m_hgTabs, SIGNAL(closeBranch(QString)),
Chris@514 2624 this, SLOT(hgCloseBranch()));
Chris@514 2625
Chris@284 2626 connect(m_hgTabs, SIGNAL(tag(QString)),
Chris@148 2627 this, SLOT(hgTag(QString)));
Chris@326 2628
Chris@326 2629 connect(m_hgTabs, SIGNAL(annotateFiles(QStringList)),
Chris@326 2630 this, SLOT(hgAnnotateFiles(QStringList)));
Chris@326 2631
Chris@326 2632 connect(m_hgTabs, SIGNAL(diffFiles(QStringList)),
Chris@326 2633 this, SLOT(hgDiffFiles(QStringList)));
Chris@326 2634
Chris@326 2635 connect(m_hgTabs, SIGNAL(commitFiles(QStringList)),
Chris@326 2636 this, SLOT(hgCommitFiles(QStringList)));
Chris@326 2637
Chris@326 2638 connect(m_hgTabs, SIGNAL(revertFiles(QStringList)),
Chris@326 2639 this, SLOT(hgRevertFiles(QStringList)));
Chris@326 2640
Chris@361 2641 connect(m_hgTabs, SIGNAL(renameFiles(QStringList)),
Chris@361 2642 this, SLOT(hgRenameFiles(QStringList)));
Chris@361 2643
Chris@361 2644 connect(m_hgTabs, SIGNAL(copyFiles(QStringList)),
Chris@361 2645 this, SLOT(hgCopyFiles(QStringList)));
Chris@361 2646
Chris@326 2647 connect(m_hgTabs, SIGNAL(addFiles(QStringList)),
Chris@326 2648 this, SLOT(hgAddFiles(QStringList)));
Chris@326 2649
Chris@326 2650 connect(m_hgTabs, SIGNAL(removeFiles(QStringList)),
Chris@326 2651 this, SLOT(hgRemoveFiles(QStringList)));
Chris@326 2652
Chris@326 2653 connect(m_hgTabs, SIGNAL(redoFileMerges(QStringList)),
Chris@326 2654 this, SLOT(hgRedoFileMerges(QStringList)));
Chris@326 2655
Chris@326 2656 connect(m_hgTabs, SIGNAL(markFilesResolved(QStringList)),
Chris@326 2657 this, SLOT(hgMarkFilesResolved(QStringList)));
Chris@326 2658
Chris@326 2659 connect(m_hgTabs, SIGNAL(ignoreFiles(QStringList)),
Chris@326 2660 this, SLOT(hgIgnoreFiles(QStringList)));
Chris@326 2661
Chris@326 2662 connect(m_hgTabs, SIGNAL(unIgnoreFiles(QStringList)),
Chris@326 2663 this, SLOT(hgUnIgnoreFiles(QStringList)));
Chris@141 2664 }
Chris@141 2665
jtkorhonen@0 2666 void MainWindow::enableDisableActions()
jtkorhonen@0 2667 {
Chris@90 2668 DEBUG << "MainWindow::enableDisableActions" << endl;
Chris@90 2669
Chris@284 2670 QString dirname = QDir(m_workFolderPath).dirName();
Chris@340 2671
Chris@340 2672 if (m_workFolderPath != "") { // dirname of "" is ".", so test path instead
Chris@202 2673 setWindowTitle(tr("EasyMercurial: %1").arg(dirname));
Chris@202 2674 } else {
Chris@202 2675 setWindowTitle(tr("EasyMercurial"));
Chris@202 2676 }
Chris@202 2677
Chris@115 2678 //!!! should also do things like set the status texts for the
Chris@115 2679 //!!! actions appropriately by context
Chris@115 2680
jtkorhonen@0 2681 QDir localRepoDir;
jtkorhonen@0 2682 QDir workFolderDir;
jtkorhonen@0 2683
Chris@284 2684 m_remoteRepoActionsEnabled = true;
Chris@284 2685 if (m_remoteRepoPath.isEmpty()) {
Chris@284 2686 m_remoteRepoActionsEnabled = false;
jtkorhonen@0 2687 }
jtkorhonen@0 2688
Chris@284 2689 m_localRepoActionsEnabled = true;
Chris@284 2690 if (m_workFolderPath.isEmpty()) {
Chris@284 2691 m_localRepoActionsEnabled = false;
jtkorhonen@0 2692 }
jtkorhonen@0 2693
Chris@284 2694 if (m_workFolderPath == "" || !workFolderDir.exists(m_workFolderPath)) {
Chris@284 2695 m_localRepoActionsEnabled = false;
jtkorhonen@0 2696 }
jtkorhonen@0 2697
Chris@284 2698 if (!localRepoDir.exists(m_workFolderPath + "/.hg")) {
Chris@284 2699 m_localRepoActionsEnabled = false;
jtkorhonen@0 2700 }
jtkorhonen@0 2701
Chris@179 2702 bool haveDiff = false;
Chris@179 2703 QSettings settings;
Chris@179 2704 settings.beginGroup("Locations");
Chris@179 2705 if (settings.value("extdiffbinary", "").toString() != "") {
Chris@179 2706 haveDiff = true;
Chris@179 2707 }
Chris@179 2708 settings.endGroup();
Chris@112 2709
Chris@505 2710 m_hgTabs->setHaveMerge(m_currentParents.size() == 2);
Chris@505 2711
Chris@365 2712 m_hgRefreshAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2713 m_hgFolderDiffAct->setEnabled(m_localRepoActionsEnabled && haveDiff);
Chris@365 2714 m_hgRevertAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2715 m_hgAddAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2716 m_hgRemoveAct->setEnabled(m_localRepoActionsEnabled);
Chris@425 2717 m_hgIgnoreAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2718 m_hgUpdateAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2719 m_hgCommitAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2720 m_hgMergeAct->setEnabled(m_localRepoActionsEnabled);
Chris@365 2721 m_hgServeAct->setEnabled(m_localRepoActionsEnabled);
Chris@413 2722 m_hgEditIgnoreAct->setEnabled(m_localRepoActionsEnabled);
Chris@273 2723
Chris@284 2724 DEBUG << "m_localRepoActionsEnabled = " << m_localRepoActionsEnabled << endl;
Chris@284 2725 DEBUG << "canCommit = " << m_hgTabs->canCommit() << endl;
Chris@273 2726
Chris@284 2727 m_hgAddAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canAdd());
Chris@284 2728 m_hgRemoveAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canRemove());
Chris@284 2729 m_hgCommitAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canCommit());
Chris@284 2730 m_hgRevertAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canRevert());
Chris@284 2731 m_hgFolderDiffAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canDiff());
Chris@425 2732 m_hgIgnoreAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canIgnore());
Chris@90 2733
Chris@108 2734 // A default merge makes sense if:
Chris@108 2735 // * there is only one parent (if there are two, we have an uncommitted merge) and
Chris@108 2736 // * there are exactly two heads that have the same branch as the current branch and
Chris@108 2737 // * our parent is one of those heads
Chris@108 2738 //
Chris@108 2739 // A default update makes sense if:
Chris@108 2740 // * there is only one parent and
Chris@108 2741 // * the parent is not one of the current heads
Chris@156 2742
Chris@108 2743 bool canMerge = false;
Chris@108 2744 bool canUpdate = false;
Chris@156 2745 bool haveMerge = false;
Chris@162 2746 bool emptyRepo = false;
Chris@225 2747 bool noWorkingCopy = false;
Chris@235 2748 bool newBranch = false;
Chris@506 2749 bool closedBranch = false;
Chris@506 2750 int currentBranchActiveHeads = 0;
Chris@273 2751
Chris@284 2752 if (m_currentParents.size() == 1) {
Chris@156 2753 bool parentIsHead = false;
Chris@506 2754 bool parentIsActiveHead = false;
Chris@284 2755 Changeset *parent = m_currentParents[0];
Chris@506 2756 foreach (Changeset *head, m_activeHeads) {
Chris@284 2757 if (head->isOnBranch(m_currentBranch)) {
Chris@506 2758 ++currentBranchActiveHeads;
Chris@235 2759 }
Chris@235 2760 if (parent->id() == head->id()) {
Chris@506 2761 parentIsActiveHead = parentIsHead = true;
Chris@108 2762 }
Chris@108 2763 }
Chris@506 2764 if (!parentIsActiveHead) {
Chris@506 2765 foreach (Changeset *head, m_currentHeads) {
Chris@506 2766 if (parent->id() == head->id()) {
Chris@506 2767 parentIsHead = true;
Chris@506 2768 }
Chris@506 2769 }
Chris@506 2770 }
Chris@506 2771 if (currentBranchActiveHeads == 2 && parentIsActiveHead) {
Chris@108 2772 canMerge = true;
Chris@108 2773 }
Chris@506 2774 if (currentBranchActiveHeads == 0 && parentIsActiveHead) {
Chris@235 2775 // Just created a new branch
Chris@235 2776 newBranch = true;
Chris@235 2777 }
Chris@108 2778 if (!parentIsHead) {
Chris@108 2779 canUpdate = true;
Chris@108 2780 DEBUG << "parent id = " << parent->id() << endl;
Chris@108 2781 DEBUG << " head ids "<<endl;
Chris@284 2782 foreach (Changeset *h, m_currentHeads) {
Chris@108 2783 DEBUG << "head id = " << h->id() << endl;
Chris@108 2784 }
Chris@506 2785 } else if (!parentIsActiveHead) {
Chris@506 2786 closedBranch = true;
Chris@108 2787 }
Chris@284 2788 m_justMerged = false;
Chris@284 2789 } else if (m_currentParents.size() == 0) {
Chris@284 2790 if (m_currentHeads.size() == 0) {
Chris@225 2791 // No heads -> empty repo
Chris@225 2792 emptyRepo = true;
Chris@225 2793 } else {
Chris@225 2794 // Heads, but no parents -> no working copy, e.g. we have
Chris@225 2795 // just converted this repo but haven't updated in it yet.
Chris@225 2796 // Uncommon but confusing; probably merits a special case
Chris@225 2797 noWorkingCopy = true;
Chris@225 2798 canUpdate = true;
Chris@225 2799 }
Chris@284 2800 m_justMerged = false;
Chris@156 2801 } else {
Chris@156 2802 haveMerge = true;
Chris@284 2803 m_justMerged = true;
Chris@108 2804 }
Chris@505 2805
Chris@363 2806 m_hgIncomingAct->setEnabled(m_remoteRepoActionsEnabled);
Chris@363 2807 m_hgPullAct->setEnabled(m_remoteRepoActionsEnabled);
Chris@363 2808 // permit push even if no remote yet; we'll ask for one
Chris@363 2809 m_hgPushAct->setEnabled(m_localRepoActionsEnabled && !emptyRepo);
Chris@363 2810
Chris@284 2811 m_hgMergeAct->setEnabled(m_localRepoActionsEnabled &&
Chris@506 2812 (canMerge || m_hgTabs->canResolve()));
Chris@284 2813 m_hgUpdateAct->setEnabled(m_localRepoActionsEnabled &&
Chris@506 2814 (canUpdate && !m_hgTabs->haveChangesToCommit()));
Chris@115 2815
Chris@115 2816 // Set the state field on the file status widget
Chris@115 2817
Chris@115 2818 QString branchText;
Chris@284 2819 if (m_currentBranch == "" || m_currentBranch == "default") {
Chris@115 2820 branchText = tr("the default branch");
Chris@115 2821 } else {
Chris@284 2822 branchText = tr("branch \"%1\"").arg(m_currentBranch);
Chris@115 2823 }
Chris@156 2824
Chris@284 2825 if (m_stateUnknown) {
Chris@284 2826 if (m_workFolderPath == "") {
Chris@287 2827 m_workStatus->setState(tr("No repository open"));
Chris@248 2828 } else {
Chris@287 2829 m_workStatus->setState(tr("(Examining repository)"));
Chris@248 2830 }
Chris@173 2831 } else if (emptyRepo) {
Chris@287 2832 m_workStatus->setState(tr("Nothing committed to this repository yet"));
Chris@225 2833 } else if (noWorkingCopy) {
Chris@287 2834 m_workStatus->setState(tr("No working copy yet: consider updating"));
Chris@162 2835 } else if (canMerge) {
Chris@287 2836 m_workStatus->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
Chris@284 2837 } else if (!m_hgTabs->getAllUnresolvedFiles().empty()) {
Chris@287 2838 m_workStatus->setState(tr("Have unresolved files following merge on %1").arg(branchText));
Chris@156 2839 } else if (haveMerge) {
Chris@287 2840 m_workStatus->setState(tr("Have merged but not yet committed on %1").arg(branchText));
Chris@235 2841 } else if (newBranch) {
Chris@287 2842 m_workStatus->setState(tr("On %1. New branch: has not yet been committed").arg(branchText));
Chris@506 2843 } else if (closedBranch) {
Chris@506 2844 if (canUpdate) {
Chris@506 2845 m_workStatus->setState(tr("On a closed branch. Not at the head of the branch"));
Chris@506 2846 } else {
Chris@506 2847 m_workStatus->setState(tr("At the head of a closed branch"));
Chris@506 2848 }
Chris@156 2849 } else if (canUpdate) {
Chris@284 2850 if (m_hgTabs->haveChangesToCommit()) {
Chris@163 2851 // have uncommitted changes
Chris@287 2852 m_workStatus->setState(tr("On %1. Not at the head of the branch").arg(branchText));
Chris@163 2853 } else {
Chris@163 2854 // no uncommitted changes
Chris@287 2855 m_workStatus->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));
Chris@163 2856 }
Chris@506 2857 } else if (currentBranchActiveHeads > 1) {
Chris@506 2858 m_workStatus->setState(tr("At one of %n heads of %1", "", currentBranchActiveHeads).arg(branchText));
Chris@115 2859 } else {
Chris@287 2860 m_workStatus->setState(tr("At the head of %1").arg(branchText));
Chris@115 2861 }
jtkorhonen@0 2862 }
jtkorhonen@0 2863
Chris@359 2864
Chris@506 2865 void MainWindow::updateClosedHeads()
Chris@506 2866 {
Chris@506 2867 m_closedHeadIds.clear();
Chris@506 2868 QSet<QString> activeIds;
Chris@506 2869 foreach (Changeset *cs, m_activeHeads) {
Chris@506 2870 activeIds.insert(cs->id());
Chris@506 2871 }
Chris@506 2872 foreach (Changeset *cs, m_currentHeads) {
Chris@506 2873 if (!activeIds.contains(cs->id())) {
Chris@506 2874 m_closedHeadIds.insert(cs->id());
Chris@506 2875 }
Chris@506 2876 }
Chris@506 2877 m_hgTabs->setClosedHeadIds(m_closedHeadIds);
Chris@506 2878 }
Chris@506 2879
Chris@359 2880 void MainWindow::updateRecentMenu()
Chris@359 2881 {
Chris@359 2882 m_recentMenu->clear();
Chris@359 2883 RecentFiles rf("Recent-local");
Chris@359 2884 QStringList recent = rf.getRecent();
Chris@359 2885 if (recent.empty()) {
Chris@359 2886 QLabel *label = new QLabel(tr("No recent local repositories"));
Chris@359 2887 QWidgetAction *wa = new QWidgetAction(m_recentMenu);
Chris@359 2888 wa->setDefaultWidget(label);
Chris@359 2889 return;
Chris@359 2890 }
Chris@359 2891 foreach (QString r, recent) {
Chris@359 2892 QAction *a = m_recentMenu->addAction(r);
Chris@359 2893 connect(a, SIGNAL(activated()), this, SLOT(recentMenuActivated()));
Chris@359 2894 }
Chris@359 2895 }
Chris@359 2896
jtkorhonen@0 2897 void MainWindow::createActions()
jtkorhonen@0 2898 {
jtkorhonen@0 2899 //File actions
Chris@365 2900 m_openAct = new QAction(QIcon(":/images/fileopen.png"), tr("&Open..."), this);
Chris@365 2901 m_openAct->setStatusTip(tr("Open an existing repository or working folder"));
Chris@365 2902 m_openAct->setShortcut(tr("Ctrl+O"));
Chris@365 2903
Chris@365 2904 m_changeRemoteRepoAct = new QAction(tr("Set Remote &Location..."), this);
Chris@363 2905 m_changeRemoteRepoAct->setStatusTip(tr("Set or change the default remote repository for pull and push actions"));
Chris@273 2906
Chris@365 2907 m_settingsAct = new QAction(QIcon(":/images/settings.png"), tr("&Settings..."), this);
Chris@365 2908 m_settingsAct->setStatusTip(tr("View and change application settings"));
Chris@273 2909
Chris@343 2910 #ifdef Q_OS_WIN32
Chris@365 2911 m_exitAct = new QAction(QIcon(":/images/exit.png"), tr("E&xit"), this);
Chris@343 2912 #else
Chris@365 2913 m_exitAct = new QAction(QIcon(":/images/exit.png"), tr("&Quit"), this);
Chris@343 2914 #endif
Chris@284 2915 m_exitAct->setShortcuts(QKeySequence::Quit);
Chris@365 2916 m_exitAct->setStatusTip(tr("Exit EasyMercurial"));
jtkorhonen@0 2917
jtkorhonen@0 2918 //Repository actions
Chris@544 2919 m_hgRefreshAct = new QAction(QIcon(":/images/status.png"), tr("&Re-Read Working Folder"), this);
Chris@365 2920 m_hgRefreshAct->setShortcut(tr("Ctrl+R"));
Chris@284 2921 m_hgRefreshAct->setStatusTip(tr("Refresh the window to show the current state of the working folder"));
Chris@273 2922
Chris@365 2923 m_hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("Pre&view Incoming Changes"), this);
Chris@365 2924 m_hgIncomingAct->setIconText(tr("Preview"));
Chris@365 2925 m_hgIncomingAct->setStatusTip(tr("See what changes are available in the remote repository waiting to be pulled"));
Chris@365 2926
Chris@365 2927 m_hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pu&ll from Remote Repository"), this);
Chris@365 2928 m_hgPullAct->setIconText(tr("Pull"));
Chris@365 2929 m_hgPullAct->setShortcut(tr("Ctrl+L"));
Chris@365 2930 m_hgPullAct->setStatusTip(tr("Pull changes from the remote repository to the local repository"));
Chris@365 2931
Chris@365 2932 m_hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Pus&h to Remote Repository"), this);
Chris@365 2933 m_hgPushAct->setIconText(tr("Push"));
Chris@365 2934 m_hgPushAct->setShortcut(tr("Ctrl+H"));
Chris@284 2935 m_hgPushAct->setStatusTip(tr("Push changes from the local repository to the remote repository"));
jtkorhonen@0 2936
jtkorhonen@0 2937 //Workfolder actions
Chris@365 2938 m_hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("&Diff"), this);
Chris@365 2939 m_hgFolderDiffAct->setIconText(tr("Diff"));
Chris@365 2940 m_hgFolderDiffAct->setShortcut(tr("Ctrl+D"));
Chris@284 2941 m_hgFolderDiffAct->setStatusTip(tr("See what has changed in the working folder compared with the last committed state"));
Chris@273 2942
Chris@365 2943 m_hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Re&vert"), this);
Chris@284 2944 m_hgRevertAct->setStatusTip(tr("Throw away your changes and return to the last committed state"));
Chris@273 2945
Chris@365 2946 m_hgAddAct = new QAction(QIcon(":/images/add.png"), tr("&Add Files"), this);
Chris@365 2947 m_hgAddAct->setIconText(tr("Add"));
Chris@365 2948 m_hgAddAct->setShortcut(tr("+"));
Chris@365 2949 m_hgAddAct->setStatusTip(tr("Mark the selected files to be added on the next commit"));
Chris@365 2950
Chris@365 2951 m_hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("&Remove Files"), this);
Chris@365 2952 m_hgRemoveAct->setIconText(tr("Remove"));
Chris@365 2953 m_hgRemoveAct->setShortcut(tr("Del"));
Chris@365 2954 m_hgRemoveAct->setStatusTip(tr("Mark the selected files to be removed from version control on the next commit"));
Chris@365 2955
Chris@425 2956 m_hgIgnoreAct = new QAction(tr("&Ignore Files..."), this);
Chris@425 2957 m_hgIgnoreAct->setStatusTip(tr("Add the selected filenames to the ignored list, of files that should never be tracked in this repository"));
Chris@425 2958
Chris@425 2959 m_hgEditIgnoreAct = new QAction(tr("Edit Ignored List"), this);
Chris@425 2960 m_hgEditIgnoreAct->setStatusTip(tr("Edit the .hgignore file, containing the names of files that should be ignored by Mercurial"));
Chris@425 2961
Chris@365 2962 m_hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("&Update to Branch Head"), this);
Chris@365 2963 m_hgUpdateAct->setIconText(tr("Update"));
Chris@365 2964 m_hgUpdateAct->setShortcut(tr("Ctrl+U"));
Chris@284 2965 m_hgUpdateAct->setStatusTip(tr("Update the working folder to the head of the current repository branch"));
jtkorhonen@0 2966
Chris@365 2967 m_hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("&Commit..."), this);
Chris@365 2968 m_hgCommitAct->setShortcut(tr("Ctrl+Return"));
Chris@284 2969 m_hgCommitAct->setStatusTip(tr("Commit your changes to the local repository"));
Chris@273 2970
Chris@365 2971 m_hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("&Merge"), this);
Chris@365 2972 m_hgMergeAct->setShortcut(tr("Ctrl+M"));
Chris@284 2973 m_hgMergeAct->setStatusTip(tr("Merge the two independent sets of changes in the local repository into the working folder"));
jtkorhonen@0 2974
Chris@425 2975 m_hgServeAct = new QAction(tr("Share Repository"), this);
Chris@425 2976 m_hgServeAct->setStatusTip(tr("Serve local repository temporarily via HTTP for workgroup access"));
jtkorhonen@11 2977
jtkorhonen@0 2978 //Help actions
Chris@494 2979 #ifdef Q_OS_MAC
Chris@494 2980 m_helpAct = new QAction(tr("EasyMercurial Help"), this);
Chris@494 2981 #else
Chris@494 2982 m_helpAct = new QAction(tr("Help Topics"), this);
Chris@494 2983 #endif
Chris@494 2984 m_helpAct->setShortcuts(QKeySequence::HelpContents);
Chris@284 2985 m_aboutAct = new QAction(tr("About EasyMercurial"), this);
Chris@94 2986
Chris@94 2987 // Miscellaneous
Chris@199 2988 QShortcut *clearSelectionsShortcut = new QShortcut(Qt::Key_Escape, this);
Chris@199 2989 connect(clearSelectionsShortcut, SIGNAL(activated()),
Chris@199 2990 this, SLOT(clearSelections()));
jtkorhonen@0 2991 }
jtkorhonen@0 2992
jtkorhonen@0 2993 void MainWindow::createMenus()
jtkorhonen@0 2994 {
Chris@365 2995 m_fileMenu = menuBar()->addMenu(tr("&File"));
Chris@365 2996
Chris@365 2997 m_fileMenu->addAction(m_openAct);
Chris@365 2998 m_recentMenu = m_fileMenu->addMenu(tr("Open Re&cent"));
Chris@365 2999 m_fileMenu->addAction(m_hgRefreshAct);
Chris@365 3000 m_fileMenu->addSeparator();
Chris@425 3001 m_fileMenu->addAction(m_hgServeAct);
Chris@425 3002 m_fileMenu->addSeparator();
Chris@365 3003 m_fileMenu->addAction(m_settingsAct);
Chris@365 3004 m_fileMenu->addSeparator();
Chris@365 3005 m_fileMenu->addAction(m_exitAct);
Chris@365 3006
Chris@365 3007 QMenu *workMenu;
Chris@365 3008 workMenu = menuBar()->addMenu(tr("&Work"));
Chris@365 3009 workMenu->addAction(m_hgFolderDiffAct);
Chris@365 3010 workMenu->addSeparator();
Chris@365 3011 workMenu->addAction(m_hgUpdateAct);
Chris@365 3012 workMenu->addAction(m_hgCommitAct);
Chris@365 3013 workMenu->addAction(m_hgMergeAct);
Chris@365 3014 workMenu->addSeparator();
Chris@365 3015 workMenu->addAction(m_hgAddAct);
Chris@365 3016 workMenu->addAction(m_hgRemoveAct);
Chris@365 3017 workMenu->addSeparator();
Chris@425 3018 workMenu->addAction(m_hgIgnoreAct);
Chris@425 3019 workMenu->addAction(m_hgEditIgnoreAct);
Chris@425 3020 workMenu->addSeparator();
Chris@365 3021 workMenu->addAction(m_hgRevertAct);
Chris@365 3022
Chris@365 3023 QMenu *remoteMenu;
Chris@365 3024 remoteMenu = menuBar()->addMenu(tr("&Remote"));
Chris@425 3025 remoteMenu->addAction(m_changeRemoteRepoAct);
Chris@425 3026 remoteMenu->addSeparator();
Chris@365 3027 remoteMenu->addAction(m_hgIncomingAct);
Chris@365 3028 remoteMenu->addSeparator();
Chris@365 3029 remoteMenu->addAction(m_hgPullAct);
Chris@365 3030 remoteMenu->addAction(m_hgPushAct);
Chris@273 3031
Chris@378 3032 m_helpMenu = menuBar()->addMenu(tr("&Help"));
Chris@494 3033 m_helpMenu->addAction(m_helpAct);
Chris@284 3034 m_helpMenu->addAction(m_aboutAct);
jtkorhonen@0 3035 }
jtkorhonen@0 3036
jtkorhonen@0 3037 void MainWindow::createToolBars()
jtkorhonen@0 3038 {
Chris@442 3039 int sz = 32;
Chris@442 3040
Chris@543 3041 bool spacingReqd = false;
chris@550 3042 QString spacer = "";
Chris@543 3043 #ifndef Q_OS_MAC
Chris@543 3044 spacingReqd = true;
chris@550 3045 spacer = " ";
chris@550 3046 #ifdef Q_OS_WIN32
chris@550 3047 spacer = " ";
chris@550 3048 #endif
Chris@543 3049 #endif
Chris@273 3050
Chris@594 3051 m_workFolderToolBar = new QToolBar(tr("Work"));
Chris@284 3052 addToolBar(Qt::LeftToolBarArea, m_workFolderToolBar);
Chris@442 3053 m_workFolderToolBar->setIconSize(QSize(sz, sz));
Chris@543 3054 if (spacingReqd) {
Chris@543 3055 QWidget *w = new QWidget;
Chris@543 3056 w->setFixedHeight(6);
Chris@543 3057 m_workFolderToolBar->addWidget(w);
Chris@543 3058 }
Chris@284 3059 m_workFolderToolBar->addAction(m_hgFolderDiffAct);
Chris@284 3060 m_workFolderToolBar->addSeparator();
Chris@284 3061 m_workFolderToolBar->addAction(m_hgRevertAct);
Chris@284 3062 m_workFolderToolBar->addAction(m_hgUpdateAct);
Chris@284 3063 m_workFolderToolBar->addAction(m_hgCommitAct);
Chris@284 3064 m_workFolderToolBar->addAction(m_hgMergeAct);
Chris@284 3065 m_workFolderToolBar->addSeparator();
Chris@284 3066 m_workFolderToolBar->addAction(m_hgAddAct);
Chris@284 3067 m_workFolderToolBar->addAction(m_hgRemoveAct);
Chris@365 3068 m_workFolderToolBar->setMovable(false);
Chris@61 3069
Chris@543 3070 m_repoToolBar = addToolBar(tr("Remote"));
Chris@543 3071 m_repoToolBar->setIconSize(QSize(sz, sz));
Chris@572 3072 if (spacingReqd) {
Chris@572 3073 m_repoToolBar->addWidget(new QLabel(spacer));
Chris@572 3074 }
Chris@543 3075 m_repoToolBar->addAction(m_openAct);
Chris@572 3076 if (spacingReqd) {
Chris@572 3077 m_repoToolBar->addWidget(new QLabel(spacer));
Chris@572 3078 }
Chris@543 3079 m_repoToolBar->addSeparator();
Chris@543 3080 m_repoToolBar->addAction(m_hgIncomingAct);
Chris@543 3081 m_repoToolBar->addAction(m_hgPullAct);
Chris@543 3082 m_repoToolBar->addAction(m_hgPushAct);
Chris@543 3083 m_repoToolBar->setMovable(false);
Chris@543 3084
Chris@230 3085 updateToolBarStyle();
jtkorhonen@0 3086 }
jtkorhonen@0 3087
Chris@230 3088 void MainWindow::updateToolBarStyle()
Chris@230 3089 {
Chris@230 3090 QSettings settings;
Chris@230 3091 settings.beginGroup("Presentation");
Chris@230 3092 bool showText = settings.value("showiconlabels", true).toBool();
Chris@230 3093 settings.endGroup();
Chris@230 3094
Chris@230 3095 foreach (QToolButton *tb, findChildren<QToolButton *>()) {
Chris@230 3096 tb->setToolButtonStyle(showText ?
Chris@230 3097 Qt::ToolButtonTextUnderIcon :
Chris@230 3098 Qt::ToolButtonIconOnly);
Chris@230 3099 }
Chris@230 3100 }
jtkorhonen@0 3101
Chris@287 3102 void MainWindow::updateWorkFolderAndRepoNames()
Chris@287 3103 {
Chris@287 3104 m_hgTabs->setLocalPath(m_workFolderPath);
Chris@287 3105
Chris@287 3106 m_workStatus->setLocalPath(m_workFolderPath);
Chris@287 3107 m_workStatus->setRemoteURL(m_remoteRepoPath);
Chris@287 3108 }
Chris@287 3109
jtkorhonen@0 3110 void MainWindow::createStatusBar()
jtkorhonen@0 3111 {
jtkorhonen@0 3112 statusBar()->showMessage(tr("Ready"));
jtkorhonen@0 3113 }
jtkorhonen@0 3114
jtkorhonen@0 3115 void MainWindow::readSettings()
jtkorhonen@0 3116 {
jtkorhonen@0 3117 QDir workFolder;
jtkorhonen@0 3118
Chris@61 3119 QSettings settings;
jtkorhonen@0 3120
Chris@284 3121 m_workFolderPath = settings.value("workfolderpath", "").toString();
Chris@553 3122 if (!workFolder.exists(m_workFolderPath)) {
Chris@284 3123 m_workFolderPath = "";
jtkorhonen@0 3124 }
jtkorhonen@0 3125
jtkorhonen@0 3126 QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
Chris@340 3127 QSize size = settings.value("size", QSize(550, 550)).toSize();
Chris@284 3128 m_firstStart = settings.value("firststart", QVariant(true)).toBool();
jtkorhonen@0 3129
jtkorhonen@0 3130 resize(size);
jtkorhonen@0 3131 move(pos);
jtkorhonen@0 3132 }
jtkorhonen@0 3133
jtkorhonen@0 3134 void MainWindow::writeSettings()
jtkorhonen@0 3135 {
Chris@61 3136 QSettings settings;
jtkorhonen@0 3137 settings.setValue("pos", pos());
jtkorhonen@0 3138 settings.setValue("size", size());
Chris@284 3139 settings.setValue("remoterepopath", m_remoteRepoPath);
Chris@284 3140 settings.setValue("workfolderpath", m_workFolderPath);
Chris@284 3141 settings.setValue("firststart", m_firstStart);
jtkorhonen@0 3142 }
jtkorhonen@0 3143
Chris@491 3144 void MainWindow::newerVersionAvailable(QString version)
Chris@491 3145 {
Chris@491 3146 QSettings settings;
Chris@491 3147 settings.beginGroup("NewerVersionWarning");
Chris@491 3148 QString tag = QString("version-%1-available-show").arg(version);
Chris@491 3149 if (settings.value(tag, true).toBool()) {
Chris@491 3150 QString title(tr("Newer version available"));
Chris@491 3151 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 3152 QMessageBox::information(this, title, text);
Chris@491 3153 settings.setValue(tag, false);
Chris@491 3154 }
Chris@491 3155 settings.endGroup();
Chris@491 3156 }
Chris@491 3157
Chris@494 3158 void MainWindow::help()
Chris@494 3159 {
Chris@494 3160 if (!m_helpDialog) {
Chris@494 3161 m_helpDialog = new QDialog;
Chris@494 3162 QGridLayout *layout = new QGridLayout;
Chris@494 3163 m_helpDialog->setLayout(layout);
Chris@498 3164 QPushButton *home = new QPushButton;
Chris@498 3165 home->setIcon(QIcon(":images/home.png"));
Chris@498 3166 layout->addWidget(home, 0, 0);
Chris@498 3167 QPushButton *back = new QPushButton;
Chris@498 3168 back->setIcon(QIcon(":images/back.png"));
Chris@498 3169 layout->addWidget(back, 0, 1);
Chris@498 3170 QPushButton *fwd = new QPushButton;
Chris@498 3171 fwd->setIcon(QIcon(":images/forward.png"));
Chris@498 3172 layout->addWidget(fwd, 0, 2);
Chris@494 3173 QTextBrowser *text = new QTextBrowser;
Chris@494 3174 text->setOpenExternalLinks(true);
Chris@498 3175 layout->addWidget(text, 1, 0, 1, 4);
Chris@494 3176 text->setSource(QUrl("qrc:help/topics.html"));
Chris@494 3177 QDialogButtonBox *bb = new QDialogButtonBox(QDialogButtonBox::Close);
Chris@494 3178 connect(bb, SIGNAL(rejected()), m_helpDialog, SLOT(hide()));
Chris@498 3179 connect(text, SIGNAL(backwardAvailable(bool)),
Chris@498 3180 back, SLOT(setEnabled(bool)));
Chris@498 3181 connect(text, SIGNAL(forwardAvailable(bool)),
Chris@498 3182 fwd, SLOT(setEnabled(bool)));
Chris@498 3183 connect(home, SIGNAL(clicked()), text, SLOT(home()));
Chris@498 3184 connect(back, SIGNAL(clicked()), text, SLOT(backward()));
Chris@498 3185 connect(fwd, SIGNAL(clicked()), text, SLOT(forward()));
Chris@498 3186 back->setEnabled(false);
Chris@498 3187 fwd->setEnabled(false);
Chris@498 3188 layout->addWidget(bb, 2, 0, 1, 4);
Chris@498 3189 layout->setColumnStretch(3, 20);
Chris@494 3190 m_helpDialog->resize(450, 500);
Chris@494 3191 }
Chris@494 3192 QTextBrowser *tb = m_helpDialog->findChild<QTextBrowser *>();
Chris@494 3193 if (tb) tb->home();
Chris@494 3194 m_helpDialog->show();
Chris@494 3195 m_helpDialog->raise();
Chris@494 3196 }
Chris@494 3197