annotate mainwindow.cpp @ 294:fc9d411ff6e7

Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
author Chris Cannam
date Mon, 21 Feb 2011 18:20:29 +0000
parents 7b4f42cfc596
children 01a471e9cbe3
rev   line source
Chris@57 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
jtkorhonen@0 2
Chris@57 3 /*
Chris@57 4 EasyMercurial
Chris@57 5
Chris@98 6 Based on hgExplorer by Jari Korhonen
Chris@57 7 Copyright (c) 2010 Jari Korhonen
Chris@244 8 Copyright (c) 2011 Chris Cannam
Chris@244 9 Copyright (c) 2011 Queen Mary, University of London
Chris@57 10
Chris@57 11 This program is free software; you can redistribute it and/or
Chris@57 12 modify it under the terms of the GNU General Public License as
Chris@57 13 published by the Free Software Foundation; either version 2 of the
Chris@57 14 License, or (at your option) any later version. See the file
Chris@57 15 COPYING included with this distribution for more information.
Chris@57 16 */
Chris@50 17
jtkorhonen@0 18 #include <QStringList>
jtkorhonen@0 19 #include <QDir>
jtkorhonen@24 20 #include <QNetworkInterface>
jtkorhonen@17 21 #include <QHostAddress>
jtkorhonen@17 22 #include <QHostInfo>
jtkorhonen@34 23 #include <QDesktopServices>
Chris@50 24 #include <QStatusBar>
Chris@50 25 #include <QMessageBox>
Chris@50 26 #include <QMenuBar>
Chris@50 27 #include <QApplication>
Chris@50 28 #include <QToolBar>
Chris@61 29 #include <QToolButton>
Chris@50 30 #include <QSettings>
Chris@90 31 #include <QInputDialog>
Chris@125 32 #include <QRegExp>
Chris@199 33 #include <QShortcut>
Chris@237 34 #include <QUrl>
Chris@238 35 #include <QTimer>
jtkorhonen@0 36
Chris@53 37 #include "mainwindow.h"
Chris@69 38 #include "multichoicedialog.h"
Chris@64 39 #include "startupdialog.h"
Chris@53 40 #include "colourset.h"
Chris@62 41 #include "debug.h"
Chris@74 42 #include "logparser.h"
Chris@103 43 #include "confirmcommentdialog.h"
Chris@125 44 #include "incomingdialog.h"
Chris@175 45 #include "settingsdialog.h"
Chris@275 46 #include "moreinformationdialog.h"
Chris@229 47 #include "version.h"
Chris@53 48
jtkorhonen@0 49
Chris@172 50 MainWindow::MainWindow(QString myDirPath) :
Chris@238 51 m_myDirPath(myDirPath),
Chris@238 52 m_fsWatcherGeneralTimer(0),
Chris@241 53 m_fsWatcherRestoreTimer(0),
Chris@241 54 m_fsWatcherSuspended(false)
jtkorhonen@0 55 {
Chris@197 56 setWindowIcon(QIcon(":images/easyhg-icon.png"));
Chris@197 57
jtkorhonen@0 58 QString wndTitle;
jtkorhonen@0 59
Chris@284 60 m_showAllFiles = false;
Chris@273 61
Chris@284 62 m_fsWatcher = 0;
Chris@284 63 m_commitsSincePush = 0;
Chris@284 64 m_shouldHgStat = true;
Chris@90 65
jtkorhonen@0 66 createActions();
jtkorhonen@0 67 createMenus();
jtkorhonen@0 68 createToolBars();
jtkorhonen@0 69 createStatusBar();
jtkorhonen@0 70
Chris@284 71 m_runner = new HgRunner(m_myDirPath, this);
Chris@284 72 connect(m_runner, SIGNAL(commandStarting(HgAction)),
Chris@241 73 this, SLOT(commandStarting(HgAction)));
Chris@284 74 connect(m_runner, SIGNAL(commandCompleted(HgAction, QString)),
Chris@109 75 this, SLOT(commandCompleted(HgAction, QString)));
Chris@284 76 connect(m_runner, SIGNAL(commandFailed(HgAction, QString)),
Chris@109 77 this, SLOT(commandFailed(HgAction, QString)));
Chris@284 78 statusBar()->addPermanentWidget(m_runner);
jtkorhonen@0 79
Chris@61 80 setWindowTitle(tr("EasyMercurial"));
jtkorhonen@0 81
Chris@284 82 m_remoteRepoPath = "";
Chris@284 83 m_workFolderPath = "";
jtkorhonen@0 84
jtkorhonen@0 85 readSettings();
jtkorhonen@0 86
Chris@284 87 m_justMerged = false;
Chris@210 88
Chris@210 89 QWidget *central = new QWidget(this);
Chris@210 90 setCentralWidget(central);
Chris@210 91
Chris@284 92 m_hgTabs = new HgTabWidget(central, m_remoteRepoPath, m_workFolderPath);
Chris@141 93 connectTabsSignals();
Chris@210 94
Chris@210 95 // Instead of setting the tab widget as our central widget
Chris@210 96 // directly, put it in a layout, so that we can have some space
Chris@210 97 // around it on the Mac where it looks very strange without
Chris@210 98
Chris@210 99 QGridLayout *cl = new QGridLayout(central);
Chris@284 100 cl->addWidget(m_hgTabs, 0, 0);
Chris@210 101
Chris@210 102 #ifndef Q_OS_MAC
Chris@210 103 cl->setMargin(0);
Chris@210 104 #endif
jtkorhonen@0 105
Chris@284 106 connect(m_hgTabs, SIGNAL(selectionChanged()),
Chris@95 107 this, SLOT(enableDisableActions()));
Chris@284 108 connect(m_hgTabs, SIGNAL(showAllChanged(bool)),
Chris@199 109 this, SLOT(showAllChanged(bool)));
Chris@95 110
jtkorhonen@0 111 setUnifiedTitleAndToolBarOnMac(true);
jtkorhonen@0 112 connectActions();
Chris@120 113 clearState();
jtkorhonen@0 114 enableDisableActions();
jtkorhonen@0 115
Chris@284 116 if (m_firstStart) {
Chris@64 117 startupDialog();
jtkorhonen@0 118 }
jtkorhonen@0 119
Chris@239 120 SettingsDialog::findDefaultLocations(m_myDirPath);
Chris@112 121
Chris@64 122 ColourSet *cs = ColourSet::instance();
Chris@64 123 cs->clearDefaultNames();
Chris@64 124 cs->addDefaultName("");
Chris@153 125 cs->addDefaultName("default");
Chris@64 126 cs->addDefaultName(getUserInfo());
Chris@62 127
Chris@175 128 hgTest();
jtkorhonen@0 129 }
jtkorhonen@0 130
jtkorhonen@0 131
jtkorhonen@0 132 void MainWindow::closeEvent(QCloseEvent *)
jtkorhonen@0 133 {
jtkorhonen@0 134 writeSettings();
Chris@284 135 delete m_fsWatcher;
jtkorhonen@0 136 }
jtkorhonen@0 137
jtkorhonen@0 138
Chris@64 139 QString MainWindow::getUserInfo() const
Chris@64 140 {
Chris@64 141 QSettings settings;
Chris@64 142 settings.beginGroup("User Information");
Chris@64 143 QString name = settings.value("name", getUserRealName()).toString();
Chris@64 144 QString email = settings.value("email", "").toString();
Chris@64 145
Chris@64 146 QString identifier;
Chris@64 147
Chris@64 148 if (email != "") {
Chris@64 149 identifier = QString("%1 <%2>").arg(name).arg(email);
Chris@64 150 } else {
Chris@64 151 identifier = name;
Chris@64 152 }
Chris@64 153
Chris@64 154 return identifier;
Chris@64 155 }
Chris@64 156
jtkorhonen@0 157 void MainWindow::about()
jtkorhonen@0 158 {
Chris@97 159 QMessageBox::about(this, tr("About EasyMercurial"),
Chris@229 160 tr("<qt><h2>EasyMercurial v%1</h2>"
Chris@228 161 #ifdef Q_OS_MAC
Chris@228 162 "<font size=-1>"
Chris@228 163 #endif
Chris@97 164 "<p>EasyMercurial is a simple user interface for the "
Chris@186 165 "Mercurial</a> version control system.</p>"
Chris@186 166 "<h4>Credits and Copyright</h4>"
Chris@186 167 "<p>Development carried out by Chris Cannam for "
Chris@186 168 "SoundSoftware.ac.uk at the Centre for Digital Music, "
Chris@186 169 "Queen Mary, University of London.</p>"
Chris@186 170 "<p>EasyMercurial is based on HgExplorer by "
Chris@186 171 "Jari Korhonen, with thanks.</p>"
Chris@186 172 "<p style=\"margin-left: 2em;\">"
Chris@244 173 "Copyright &copy; 2011 Queen Mary, University of London.<br>"
Chris@186 174 "Copyright &copy; 2010 Jari Korhonen.<br>"
Chris@244 175 "Copyright &copy; 2011 Chris Cannam."
Chris@186 176 "</p>"
Chris@186 177 "<p style=\"margin-left: 2em;\">"
Chris@186 178 "This program requires Mercurial, by Matt Mackall and others.<br>"
Chris@186 179 "This program uses Qt by Nokia.<br>"
Chris@186 180 "This program uses Nuvola icons by David Vignoni.<br>"
Chris@186 181 "This program may use KDiff3 by Joachim Eibl.<br>"
Chris@186 182 "This program may use PyQt by River Bank Computing.<br>"
Chris@186 183 "Packaging for Mercurial and other dependencies on Windows is derived from TortoiseHg by Steve Borho and others."
Chris@186 184 "</p>"
Chris@186 185 "<h4>License</h4>"
Chris@186 186 "<p>This program is free software; you can redistribute it and/or "
Chris@97 187 "modify it under the terms of the GNU General Public License as "
Chris@97 188 "published by the Free Software Foundation; either version 2 of the "
Chris@97 189 "License, or (at your option) any later version. See the file "
Chris@223 190 "COPYING included with this distribution for more information.</p>"
Chris@228 191 #ifdef Q_OS_MAC
Chris@228 192 "</font>"
Chris@228 193 #endif
Chris@229 194 ).arg(EASYHG_VERSION));
jtkorhonen@0 195 }
jtkorhonen@0 196
Chris@94 197 void MainWindow::clearSelections()
Chris@94 198 {
Chris@284 199 m_hgTabs->clearSelections();
Chris@94 200 }
jtkorhonen@0 201
Chris@199 202 void MainWindow::showAllChanged(bool s)
Chris@199 203 {
Chris@284 204 m_showAllFiles = s;
Chris@199 205 hgQueryPaths();
Chris@199 206 }
Chris@199 207
Chris@120 208 void MainWindow::hgRefresh()
Chris@120 209 {
Chris@120 210 clearState();
Chris@120 211 hgQueryPaths();
Chris@120 212 }
Chris@120 213
Chris@175 214 void MainWindow::hgTest()
Chris@175 215 {
Chris@175 216 QStringList params;
Chris@207 217 //!!! should we test version output? Really we want at least 1.7.x
Chris@207 218 //!!! for options such as merge --tool
Chris@175 219 params << "--version";
Chris@284 220 m_runner->requestAction(HgAction(ACT_TEST_HG, m_myDirPath, params));
Chris@175 221 }
Chris@175 222
Chris@200 223 void MainWindow::hgTestExtension()
Chris@200 224 {
Chris@200 225 QStringList params;
Chris@200 226 params << "--version";
Chris@284 227 m_runner->requestAction(HgAction(ACT_TEST_HG_EXT, m_myDirPath, params));
Chris@200 228 }
Chris@200 229
jtkorhonen@0 230 void MainWindow::hgStat()
jtkorhonen@0 231 {
Chris@109 232 QStringList params;
Chris@199 233
Chris@284 234 if (m_showAllFiles) {
Chris@199 235 params << "stat" << "-A";
Chris@199 236 } else {
Chris@199 237 params << "stat" << "-ardum";
Chris@199 238 }
Chris@153 239
Chris@284 240 m_lastStatOutput = "";
Chris@273 241
Chris@284 242 m_runner->requestAction(HgAction(ACT_STAT, m_workFolderPath, params));
jtkorhonen@0 243 }
jtkorhonen@0 244
Chris@109 245 void MainWindow::hgQueryPaths()
Chris@74 246 {
Chris@210 247 // Quickest is to just read the file
Chris@198 248
Chris@284 249 QFileInfo hgrc(m_workFolderPath + "/.hg/hgrc");
Chris@198 250
Chris@210 251 QString path;
Chris@210 252
Chris@198 253 if (hgrc.exists()) {
Chris@198 254 QSettings s(hgrc.canonicalFilePath(), QSettings::IniFormat);
Chris@198 255 s.beginGroup("paths");
Chris@210 256 path = s.value("default").toString();
Chris@210 257 }
Chris@198 258
Chris@284 259 m_remoteRepoPath = path;
Chris@198 260
Chris@210 261 // We have to do this here, because commandCompleted won't be called
Chris@284 262 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 263 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@284 264 m_hgTabs->setWorkFolderAndRepoNames(m_workFolderPath, m_remoteRepoPath);
Chris@210 265
Chris@210 266 hgQueryBranch();
Chris@210 267 return;
Chris@210 268
Chris@210 269 /* The classic method!
Chris@198 270
Chris@109 271 QStringList params;
Chris@109 272 params << "paths";
Chris@284 273 m_runner->requestAction(HgAction(ACT_QUERY_PATHS, m_workFolderPath, params));
Chris@210 274 */
Chris@74 275 }
Chris@74 276
Chris@109 277 void MainWindow::hgQueryBranch()
Chris@106 278 {
Chris@210 279 // Quickest is to just read the file
Chris@198 280
Chris@284 281 QFile hgbr(m_workFolderPath + "/.hg/branch");
Chris@198 282
Chris@210 283 QString br = "default";
Chris@210 284
Chris@198 285 if (hgbr.exists() && hgbr.open(QFile::ReadOnly)) {
Chris@210 286 QByteArray ba = hgbr.readLine();
Chris@210 287 br = QString::fromUtf8(ba).trimmed();
Chris@210 288 }
Chris@210 289
Chris@284 290 m_currentBranch = br;
Chris@210 291
Chris@210 292 // We have to do this here, because commandCompleted won't be called
Chris@210 293 hgStat();
Chris@210 294 return;
Chris@198 295
Chris@210 296 /* The classic method!
Chris@198 297
Chris@109 298 QStringList params;
Chris@109 299 params << "branch";
Chris@284 300 m_runner->requestAction(HgAction(ACT_QUERY_BRANCH, m_workFolderPath, params));
Chris@210 301 */
Chris@106 302 }
Chris@106 303
Chris@109 304 void MainWindow::hgQueryHeads()
jtkorhonen@0 305 {
Chris@109 306 QStringList params;
Chris@137 307 // On empty repos, "hg heads" will fail -- we don't care about
Chris@137 308 // that. Use --closed option so as to include closed branches;
Chris@137 309 // otherwise we'll be stuck if the user updates into one, and our
Chris@137 310 // incremental log will end up with spurious stuff in it because
Chris@137 311 // we won't be pruning at the ends of closed branches
Chris@137 312 params << "heads" << "--closed";
Chris@284 313 m_runner->requestAction(HgAction(ACT_QUERY_HEADS, m_workFolderPath, params));
jtkorhonen@0 314 }
jtkorhonen@0 315
jtkorhonen@0 316 void MainWindow::hgLog()
jtkorhonen@0 317 {
Chris@109 318 QStringList params;
Chris@109 319 params << "log";
Chris@109 320 params << "--template";
Chris@125 321 params << Changeset::getLogTemplate();
Chris@109 322
Chris@284 323 m_runner->requestAction(HgAction(ACT_LOG, m_workFolderPath, params));
Chris@109 324 }
Chris@109 325
Chris@150 326 void MainWindow::hgLogIncremental(QStringList prune)
Chris@120 327 {
Chris@120 328 QStringList params;
Chris@120 329 params << "log";
Chris@120 330
Chris@150 331 foreach (QString p, prune) {
Chris@153 332 params << "--prune" << Changeset::hashOf(p);
Chris@120 333 }
Chris@120 334
Chris@120 335 params << "--template";
Chris@125 336 params << Changeset::getLogTemplate();
Chris@120 337
Chris@284 338 m_runner->requestAction(HgAction(ACT_LOG_INCREMENTAL, m_workFolderPath, params));
Chris@120 339 }
Chris@109 340
Chris@109 341 void MainWindow::hgQueryParents()
Chris@109 342 {
Chris@109 343 QStringList params;
Chris@109 344 params << "parents";
Chris@284 345 m_runner->requestAction(HgAction(ACT_QUERY_PARENTS, m_workFolderPath, params));
Chris@109 346 }
Chris@109 347
Chris@109 348 void MainWindow::hgAnnotate()
Chris@109 349 {
Chris@109 350 QStringList params;
Chris@284 351 QString currentFile;//!!! = m_hgTabs -> getCurrentFileListLine();
Chris@109 352
Chris@109 353 if (!currentFile.isEmpty())
jtkorhonen@0 354 {
Chris@109 355 params << "annotate" << "--" << currentFile.mid(2); //Jump over status marker characters (e.g "M ")
jtkorhonen@0 356
Chris@284 357 m_runner->requestAction(HgAction(ACT_ANNOTATE, m_workFolderPath, params));
jtkorhonen@0 358 }
jtkorhonen@0 359 }
jtkorhonen@0 360
Chris@109 361 void MainWindow::hgResolveList()
Chris@109 362 {
Chris@109 363 QStringList params;
jtkorhonen@0 364
Chris@109 365 params << "resolve" << "--list";
Chris@284 366 m_runner->requestAction(HgAction(ACT_RESOLVE_LIST, m_workFolderPath, params));
Chris@109 367 }
Chris@109 368
Chris@109 369 void MainWindow::hgAdd()
jtkorhonen@0 370 {
Chris@109 371 QStringList params;
jtkorhonen@0 372
Chris@109 373 // hgExplorer permitted adding "all" files -- I'm not sure
Chris@109 374 // that one is a good idea, let's require the user to select
jtkorhonen@0 375
Chris@284 376 QStringList files = m_hgTabs->getSelectedAddableFiles();
Chris@109 377
Chris@109 378 if (!files.empty()) {
Chris@109 379 params << "add" << "--" << files;
Chris@284 380 m_runner->requestAction(HgAction(ACT_ADD, m_workFolderPath, params));
jtkorhonen@0 381 }
jtkorhonen@0 382 }
jtkorhonen@0 383
jtkorhonen@0 384
Chris@98 385 void MainWindow::hgRemove()
Chris@98 386 {
Chris@109 387 QStringList params;
Chris@98 388
Chris@284 389 QStringList files = m_hgTabs->getSelectedRemovableFiles();
Chris@98 390
Chris@109 391 if (!files.empty()) {
Chris@109 392 params << "remove" << "--after" << "--force" << "--" << files;
Chris@284 393 m_runner->requestAction(HgAction(ACT_REMOVE, m_workFolderPath, params));
Chris@109 394 }
jtkorhonen@0 395 }
jtkorhonen@0 396
jtkorhonen@0 397 void MainWindow::hgCommit()
jtkorhonen@0 398 {
Chris@109 399 QStringList params;
Chris@109 400 QString comment;
Chris@94 401
Chris@284 402 if (m_justMerged) {
Chris@284 403 comment = m_mergeCommitComment;
Chris@157 404 }
Chris@157 405
Chris@284 406 QStringList files = m_hgTabs->getSelectedCommittableFiles();
Chris@284 407 QStringList allFiles = m_hgTabs->getAllCommittableFiles();
Chris@127 408 QStringList reportFiles = files;
Chris@237 409 if (reportFiles.empty()) {
Chris@237 410 reportFiles = allFiles;
Chris@237 411 }
Chris@103 412
Chris@237 413 QString subsetNote;
Chris@237 414 if (reportFiles != allFiles) {
Chris@237 415 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 416 }
Chris@237 417
Chris@155 418 QString cf(tr("Commit files"));
Chris@155 419
Chris@109 420 if (ConfirmCommentDialog::confirmAndGetLongComment
Chris@109 421 (this,
Chris@155 422 cf,
Chris@237 423 tr("<h3>%1</h3><p>%2%3").arg(cf)
Chris@237 424 .arg(tr("You are about to commit the following files."))
Chris@237 425 .arg(subsetNote),
Chris@237 426 tr("<h3>%1</h3><p>%2%3").arg(cf)
Chris@237 427 .arg(tr("You are about to commit %n file(s).", "", reportFiles.size()))
Chris@237 428 .arg(subsetNote),
Chris@127 429 reportFiles,
Chris@193 430 comment,
Chris@193 431 tr("Commit"))) {
Chris@103 432
Chris@284 433 if (!m_justMerged && !files.empty()) {
Chris@157 434 // User wants to commit selected file(s) (and this is not
Chris@157 435 // merge commit, which would fail if we selected files)
Chris@157 436 params << "commit" << "--message" << comment
Chris@157 437 << "--user" << getUserInfo() << "--" << files;
Chris@109 438 } else {
Chris@109 439 // Commit all changes
Chris@157 440 params << "commit" << "--message" << comment
Chris@157 441 << "--user" << getUserInfo();
jtkorhonen@0 442 }
Chris@109 443
Chris@284 444 m_runner->requestAction(HgAction(ACT_COMMIT, m_workFolderPath, params));
Chris@284 445 m_mergeCommitComment = "";
jtkorhonen@0 446 }
jtkorhonen@0 447 }
jtkorhonen@0 448
jtkorhonen@34 449 QString MainWindow::filterTag(QString tag)
jtkorhonen@34 450 {
jtkorhonen@34 451 for(int i = 0; i < tag.size(); i++)
jtkorhonen@34 452 {
jtkorhonen@34 453 if (tag[i].isLower() || tag[i].isUpper() || tag[i].isDigit() || (tag[i] == QChar('.')))
jtkorhonen@34 454 {
jtkorhonen@34 455 //ok
jtkorhonen@34 456 }
jtkorhonen@34 457 else
jtkorhonen@34 458 {
jtkorhonen@34 459 tag[i] = QChar('_');
jtkorhonen@34 460 }
jtkorhonen@34 461 }
jtkorhonen@34 462 return tag;
jtkorhonen@34 463 }
jtkorhonen@34 464
jtkorhonen@34 465
Chris@164 466 void MainWindow::hgTag(QString id)
jtkorhonen@34 467 {
Chris@109 468 QStringList params;
Chris@109 469 QString tag;
jtkorhonen@34 470
Chris@109 471 if (ConfirmCommentDialog::confirmAndGetShortComment
Chris@109 472 (this,
Chris@109 473 tr("Tag"),
Chris@109 474 tr("Enter tag:"),
Chris@193 475 tag,
Chris@193 476 tr("Add Tag"))) {
Chris@164 477 if (!tag.isEmpty()) {//!!! do something better if it is empty
Chris@164 478
Chris@164 479 params << "tag" << "--user" << getUserInfo();
Chris@164 480 params << "--rev" << Changeset::hashOf(id) << filterTag(tag);
Chris@109 481
Chris@284 482 m_runner->requestAction(HgAction(ACT_TAG, m_workFolderPath, params));
jtkorhonen@34 483 }
jtkorhonen@34 484 }
jtkorhonen@34 485 }
jtkorhonen@34 486
jtkorhonen@34 487
jtkorhonen@34 488 void MainWindow::hgIgnore()
jtkorhonen@34 489 {
Chris@109 490 QString hgIgnorePath;
Chris@109 491 QStringList params;
Chris@178 492
Chris@284 493 hgIgnorePath = m_workFolderPath;
Chris@178 494 hgIgnorePath += "/.hgignore";
Chris@249 495
Chris@284 496 if (!QDir(m_workFolderPath).exists()) return;
Chris@249 497 QFile f(hgIgnorePath);
Chris@249 498 if (!f.exists()) {
Chris@249 499 f.open(QFile::WriteOnly);
Chris@249 500 QTextStream *ts = new QTextStream(&f);
Chris@249 501 *ts << "syntax: glob\n";
Chris@249 502 delete ts;
Chris@249 503 f.close();
Chris@249 504 }
Chris@109 505
Chris@109 506 params << hgIgnorePath;
Chris@179 507
Chris@239 508 QString editor = getEditorBinaryName();
Chris@112 509
Chris@179 510 if (editor == "") {
Chris@179 511 DEBUG << "Failed to find a text editor" << endl;
Chris@179 512 //!!! visible error!
Chris@179 513 return;
Chris@179 514 }
Chris@179 515
Chris@284 516 HgAction action(ACT_HG_IGNORE, m_workFolderPath, params);
Chris@179 517 action.executable = editor;
Chris@179 518
Chris@284 519 m_runner->requestAction(action);
Chris@179 520 }
Chris@179 521
Chris@239 522 QString MainWindow::getDiffBinaryName()
Chris@179 523 {
Chris@179 524 QSettings settings;
Chris@179 525 settings.beginGroup("Locations");
Chris@239 526 return settings.value("extdiffbinary", "").toString();
Chris@179 527 }
Chris@179 528
Chris@239 529 QString MainWindow::getMergeBinaryName()
Chris@179 530 {
Chris@179 531 QSettings settings;
Chris@179 532 settings.beginGroup("Locations");
Chris@239 533 return settings.value("mergebinary", "").toString();
Chris@179 534 }
Chris@179 535
Chris@239 536 QString MainWindow::getEditorBinaryName()
Chris@179 537 {
Chris@178 538 QSettings settings;
Chris@178 539 settings.beginGroup("Locations");
Chris@239 540 return settings.value("editorbinary", "").toString();
Chris@163 541 }
Chris@163 542
Chris@168 543 void MainWindow::hgShowSummary()
Chris@168 544 {
Chris@168 545 QStringList params;
Chris@168 546
Chris@168 547 params << "diff" << "--stat";
Chris@168 548
Chris@288 549 m_runner->requestAction(HgAction(ACT_UNCOMMITTED_SUMMARY, m_workFolderPath, params));
Chris@168 550 }
Chris@168 551
jtkorhonen@0 552 void MainWindow::hgFolderDiff()
jtkorhonen@0 553 {
Chris@239 554 QString diff = getDiffBinaryName();
Chris@179 555 if (diff == "") return;
Chris@112 556
Chris@109 557 QStringList params;
jtkorhonen@0 558
Chris@112 559 // Diff parent against working folder (folder diff)
Chris@112 560
Chris@148 561 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@179 562 params << "--program" << diff;
Chris@109 563
Chris@284 564 params << m_hgTabs->getSelectedCommittableFiles(); // may be none: whole dir
Chris@273 565
Chris@284 566 m_runner->requestAction(HgAction(ACT_FOLDERDIFF, m_workFolderPath, params));
jtkorhonen@0 567 }
jtkorhonen@0 568
jtkorhonen@0 569
Chris@148 570 void MainWindow::hgDiffToCurrent(QString id)
jtkorhonen@0 571 {
Chris@239 572 QString diff = getDiffBinaryName();
Chris@179 573 if (diff == "") return;
Chris@163 574
Chris@148 575 QStringList params;
jtkorhonen@0 576
Chris@148 577 // Diff given revision against working folder
jtkorhonen@0 578
Chris@148 579 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@179 580 params << "--program" << diff;
Chris@153 581 params << "--rev" << Changeset::hashOf(id);
Chris@148 582
Chris@284 583 m_runner->requestAction(HgAction(ACT_FOLDERDIFF, m_workFolderPath, params));
jtkorhonen@0 584 }
jtkorhonen@0 585
jtkorhonen@0 586
Chris@148 587 void MainWindow::hgDiffToParent(QString child, QString parent)
Chris@148 588 {
Chris@239 589 QString diff = getDiffBinaryName();
Chris@179 590 if (diff == "") return;
Chris@163 591
Chris@148 592 QStringList params;
Chris@148 593
Chris@281 594 // Diff given revision against parent revision
Chris@148 595
Chris@148 596 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@179 597 params << "--program" << diff;
Chris@153 598 params << "--rev" << Changeset::hashOf(parent)
Chris@153 599 << "--rev" << Changeset::hashOf(child);
Chris@148 600
Chris@284 601 m_runner->requestAction(HgAction(ACT_CHGSETDIFF, m_workFolderPath, params));
Chris@273 602 }
Chris@273 603
Chris@273 604
Chris@289 605 void MainWindow::hgShowSummaryFor(Changeset *cs)
Chris@288 606 {
Chris@288 607 QStringList params;
Chris@288 608
Chris@289 609 // This will pick a default parent if there is more than one
Chris@289 610 // (whereas with diff we need to supply one). But it does need a
Chris@289 611 // bit more parsing
Chris@289 612 params << "log" << "--stat" << "--rev" << Changeset::hashOf(cs->id());
Chris@289 613
Chris@289 614 m_runner->requestAction(HgAction(ACT_DIFF_SUMMARY, m_workFolderPath,
Chris@289 615 params, cs));
Chris@148 616 }
Chris@148 617
jtkorhonen@0 618
jtkorhonen@0 619 void MainWindow::hgUpdate()
jtkorhonen@0 620 {
Chris@109 621 QStringList params;
jtkorhonen@0 622
Chris@109 623 params << "update";
Chris@109 624
Chris@284 625 m_runner->requestAction(HgAction(ACT_UPDATE, m_workFolderPath, params));
jtkorhonen@0 626 }
jtkorhonen@0 627
jtkorhonen@0 628
Chris@148 629 void MainWindow::hgUpdateToRev(QString id)
jtkorhonen@0 630 {
Chris@148 631 QStringList params;
jtkorhonen@0 632
Chris@153 633 params << "update" << "--rev" << Changeset::hashOf(id) << "--check";
jtkorhonen@0 634
Chris@284 635 m_runner->requestAction(HgAction(ACT_UPDATE, m_workFolderPath, params));
jtkorhonen@0 636 }
jtkorhonen@0 637
jtkorhonen@0 638
jtkorhonen@0 639 void MainWindow::hgRevert()
jtkorhonen@0 640 {
Chris@109 641 QStringList params;
Chris@109 642 QString comment;
Chris@237 643 bool all = false;
Chris@98 644
Chris@284 645 QStringList files = m_hgTabs->getSelectedRevertableFiles();
Chris@284 646 QStringList allFiles = m_hgTabs->getAllRevertableFiles();
Chris@237 647 if (files.empty() || files == allFiles) {
Chris@237 648 files = allFiles;
Chris@237 649 all = true;
Chris@237 650 }
Chris@237 651
Chris@237 652 QString subsetNote;
Chris@237 653 if (!all) {
Chris@237 654 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 655 }
Chris@155 656
Chris@155 657 QString rf(tr("Revert files"));
Chris@237 658
Chris@237 659 // Set up params before asking for confirmation, because there is
Chris@237 660 // a failure case here that we would need to report on early
Chris@237 661
Chris@284 662 DEBUG << "hgRevert: m_justMerged = " << m_justMerged << ", m_mergeTargetRevision = " << m_mergeTargetRevision << endl;
Chris@273 663
Chris@284 664 if (m_justMerged) {
Chris@237 665
Chris@237 666 // This is a little fiddly. The proper way to "revert" the
Chris@237 667 // whole of an uncommitted merge is with "hg update --clean ."
Chris@237 668 // But if the user has selected only some files, we're sort of
Chris@237 669 // promising to revert only those, which means we need to
Chris@237 670 // specify which parent to revert to. We can only do that if
Chris@237 671 // we have a record of it, which we do if you just did the
Chris@237 672 // merge from within easyhg but don't if you've exited and
Chris@237 673 // restarted, or changed repository, since then. Hmmm.
Chris@237 674
Chris@237 675 if (all) {
Chris@237 676 params << "update" << "--clean" << ".";
Chris@237 677 } else {
Chris@284 678 if (m_mergeTargetRevision != "") {
Chris@237 679 params << "revert" << "--rev"
Chris@284 680 << Changeset::hashOf(m_mergeTargetRevision)
Chris@237 681 << "--" << files;
Chris@237 682 } else {
Chris@237 683 QMessageBox::information
Chris@237 684 (this, tr("Unable to revert"),
Chris@237 685 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 686 return;
Chris@237 687 }
Chris@237 688 }
Chris@237 689 } else {
Chris@237 690 params << "revert" << "--" << files;
Chris@237 691 }
Chris@237 692
Chris@109 693 if (ConfirmCommentDialog::confirmDangerousFilesAction
Chris@109 694 (this,
Chris@155 695 rf,
Chris@237 696 tr("<h3>%1</h3><p>%2%3").arg(rf)
Chris@237 697 .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 698 .arg(subsetNote),
Chris@237 699 tr("<h3>%1</h3><p>%2%3").arg(rf)
Chris@237 700 .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 701 .arg(subsetNote),
Chris@193 702 files,
Chris@193 703 tr("Revert"))) {
Chris@163 704
Chris@284 705 m_lastRevertedFiles = files;
Chris@109 706
Chris@284 707 m_runner->requestAction(HgAction(ACT_REVERT, m_workFolderPath, params));
jtkorhonen@0 708 }
jtkorhonen@0 709 }
jtkorhonen@0 710
Chris@163 711
Chris@163 712 void MainWindow::hgMarkResolved(QStringList files)
Chris@163 713 {
Chris@163 714 QStringList params;
Chris@163 715
Chris@163 716 params << "resolve" << "--mark";
Chris@163 717
Chris@163 718 if (files.empty()) {
Chris@163 719 params << "--all";
Chris@163 720 } else {
Chris@164 721 params << "--" << files;
Chris@163 722 }
Chris@163 723
Chris@284 724 m_runner->requestAction(HgAction(ACT_RESOLVE_MARK, m_workFolderPath, params));
Chris@163 725 }
Chris@163 726
Chris@163 727
jtkorhonen@33 728 void MainWindow::hgRetryMerge()
jtkorhonen@33 729 {
Chris@109 730 QStringList params;
jtkorhonen@33 731
Chris@163 732 params << "resolve";
Chris@163 733
Chris@239 734 QString merge = getMergeBinaryName();
Chris@179 735 if (merge != "") {
Chris@179 736 params << "--tool" << merge;
Chris@163 737 }
Chris@163 738
Chris@284 739 QStringList files = m_hgTabs->getSelectedUnresolvedFiles();
Chris@163 740 if (files.empty()) {
Chris@163 741 params << "--all";
Chris@163 742 } else {
Chris@164 743 params << "--" << files;
Chris@163 744 }
Chris@163 745
Chris@284 746 if (m_currentParents.size() == 1) {
Chris@284 747 m_mergeTargetRevision = m_currentParents[0]->id();
Chris@237 748 }
Chris@237 749
Chris@284 750 m_runner->requestAction(HgAction(ACT_RETRY_MERGE, m_workFolderPath, params));
Chris@273 751
Chris@284 752 m_mergeCommitComment = tr("Merge");
jtkorhonen@33 753 }
jtkorhonen@33 754
jtkorhonen@33 755
jtkorhonen@0 756 void MainWindow::hgMerge()
jtkorhonen@0 757 {
Chris@284 758 if (m_hgTabs->canResolve()) {
Chris@163 759 hgRetryMerge();
Chris@163 760 return;
Chris@163 761 }
Chris@163 762
Chris@109 763 QStringList params;
jtkorhonen@0 764
Chris@109 765 params << "merge";
Chris@163 766
Chris@239 767 QString merge = getMergeBinaryName();
Chris@179 768 if (merge != "") {
Chris@179 769 params << "--tool" << merge;
Chris@163 770 }
Chris@163 771
Chris@284 772 if (m_currentParents.size() == 1) {
Chris@284 773 m_mergeTargetRevision = m_currentParents[0]->id();
Chris@163 774 }
Chris@163 775
Chris@284 776 m_runner->requestAction(HgAction(ACT_MERGE, m_workFolderPath, params));
Chris@273 777
Chris@284 778 m_mergeCommitComment = tr("Merge");
jtkorhonen@0 779 }
jtkorhonen@0 780
jtkorhonen@0 781
Chris@148 782 void MainWindow::hgMergeFrom(QString id)
Chris@148 783 {
Chris@148 784 QStringList params;
Chris@148 785
Chris@148 786 params << "merge";
Chris@153 787 params << "--rev" << Changeset::hashOf(id);
Chris@163 788
Chris@239 789 QString merge = getMergeBinaryName();
Chris@179 790 if (merge != "") {
Chris@179 791 params << "--tool" << merge;
Chris@163 792 }
Chris@148 793
Chris@284 794 if (m_currentParents.size() == 1) {
Chris@284 795 m_mergeTargetRevision = m_currentParents[0]->id();
Chris@237 796 }
Chris@237 797
Chris@284 798 m_runner->requestAction(HgAction(ACT_MERGE, m_workFolderPath, params));
Chris@273 799
Chris@284 800 m_mergeCommitComment = "";
Chris@273 801
Chris@284 802 foreach (Changeset *cs, m_currentHeads) {
Chris@284 803 if (cs->id() == id && !cs->isOnBranch(m_currentBranch)) {
Chris@157 804 if (cs->branch() == "" || cs->branch() == "default") {
Chris@284 805 m_mergeCommitComment = tr("Merge from the default branch");
Chris@157 806 } else {
Chris@284 807 m_mergeCommitComment = tr("Merge from branch \"%1\"").arg(cs->branch());
Chris@157 808 }
Chris@157 809 }
Chris@157 810 }
Chris@157 811
Chris@284 812 if (m_mergeCommitComment == "") {
Chris@284 813 m_mergeCommitComment = tr("Merge from %1").arg(id);
Chris@157 814 }
Chris@148 815 }
Chris@148 816
Chris@148 817
jtkorhonen@0 818 void MainWindow::hgCloneFromRemote()
jtkorhonen@0 819 {
Chris@109 820 QStringList params;
jtkorhonen@0 821
Chris@284 822 if (!QDir(m_workFolderPath).exists()) {
Chris@284 823 if (!QDir().mkpath(m_workFolderPath)) {
Chris@109 824 DEBUG << "hgCloneFromRemote: Failed to create target path "
Chris@284 825 << m_workFolderPath << endl;
Chris@109 826 //!!! report error
Chris@109 827 return;
Chris@104 828 }
Chris@109 829 }
Chris@104 830
Chris@284 831 params << "clone" << m_remoteRepoPath << m_workFolderPath;
Chris@109 832
Chris@284 833 m_hgTabs->setWorkFolderAndRepoNames(m_workFolderPath, m_remoteRepoPath);
Chris@284 834 m_hgTabs->updateWorkFolderFileList("");
Chris@273 835
Chris@284 836 m_runner->requestAction(HgAction(ACT_CLONEFROMREMOTE, m_workFolderPath, params));
jtkorhonen@0 837 }
jtkorhonen@0 838
jtkorhonen@0 839 void MainWindow::hgInit()
jtkorhonen@0 840 {
Chris@109 841 QStringList params;
jtkorhonen@0 842
Chris@109 843 params << "init";
Chris@284 844 params << m_workFolderPath;
Chris@273 845
Chris@284 846 m_runner->requestAction(HgAction(ACT_INIT, m_workFolderPath, params));
jtkorhonen@0 847 }
jtkorhonen@0 848
jtkorhonen@0 849 void MainWindow::hgIncoming()
jtkorhonen@0 850 {
Chris@109 851 QStringList params;
jtkorhonen@0 852
Chris@284 853 params << "incoming" << "--newest-first" << m_remoteRepoPath;
Chris@125 854 params << "--template" << Changeset::getLogTemplate();
jtkorhonen@0 855
Chris@284 856 m_runner->requestAction(HgAction(ACT_INCOMING, m_workFolderPath, params));
jtkorhonen@0 857 }
jtkorhonen@0 858
jtkorhonen@0 859 void MainWindow::hgPull()
jtkorhonen@0 860 {
Chris@193 861 if (ConfirmCommentDialog::confirm
Chris@126 862 (this, tr("Confirm pull"),
Chris@291 863 format3(tr("Pull from remote repository?"),
Chris@192 864 tr("You are about to pull changes from the following remote repository:"),
Chris@284 865 m_remoteRepoPath),
Chris@194 866 tr("Pull"))) {
jtkorhonen@0 867
Chris@126 868 QStringList params;
Chris@284 869 params << "pull" << m_remoteRepoPath;
Chris@284 870 m_runner->requestAction(HgAction(ACT_PULL, m_workFolderPath, params));
Chris@126 871 }
jtkorhonen@0 872 }
jtkorhonen@0 873
jtkorhonen@0 874 void MainWindow::hgPush()
jtkorhonen@0 875 {
Chris@193 876 if (ConfirmCommentDialog::confirm
Chris@126 877 (this, tr("Confirm push"),
Chris@291 878 format3(tr("Push to remote repository?"),
Chris@192 879 tr("You are about to push your changes to the following remote repository:"),
Chris@284 880 m_remoteRepoPath),
Chris@194 881 tr("Push"))) {
jtkorhonen@0 882
Chris@126 883 QStringList params;
Chris@284 884 params << "push" << "--new-branch" << m_remoteRepoPath;
Chris@284 885 m_runner->requestAction(HgAction(ACT_PUSH, m_workFolderPath, params));
Chris@126 886 }
jtkorhonen@0 887 }
jtkorhonen@0 888
Chris@182 889 QStringList MainWindow::listAllUpIpV4Addresses()
jtkorhonen@26 890 {
Chris@182 891 QStringList ret;
jtkorhonen@26 892 QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
jtkorhonen@26 893
Chris@182 894 for (int i = 0; i < ifaces.count(); i++) {
jtkorhonen@26 895 QNetworkInterface iface = ifaces.at(i);
Chris@182 896 if (iface.flags().testFlag(QNetworkInterface::IsUp)
Chris@182 897 && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
Chris@182 898 for (int j=0; j<iface.addressEntries().count(); j++) {
jtkorhonen@28 899 QHostAddress tmp = iface.addressEntries().at(j).ip();
Chris@182 900 if (QAbstractSocket::IPv4Protocol == tmp.protocol()) {
Chris@182 901 ret.push_back(tmp.toString());
jtkorhonen@24 902 }
jtkorhonen@24 903 }
jtkorhonen@22 904 }
jtkorhonen@17 905 }
jtkorhonen@28 906 return ret;
jtkorhonen@28 907 }
jtkorhonen@17 908
Chris@120 909 void MainWindow::clearState()
Chris@120 910 {
Chris@284 911 foreach (Changeset *cs, m_currentParents) delete cs;
Chris@284 912 m_currentParents.clear();
Chris@284 913 foreach (Changeset *cs, m_currentHeads) delete cs;
Chris@284 914 m_currentHeads.clear();
Chris@284 915 m_currentBranch = "";
Chris@284 916 m_lastStatOutput = "";
Chris@284 917 m_lastRevertedFiles.clear();
Chris@284 918 m_mergeTargetRevision = "";
Chris@284 919 m_mergeCommitComment = "";
Chris@284 920 m_stateUnknown = true;
Chris@284 921 m_needNewLog = true;
Chris@284 922 if (m_fsWatcher) {
Chris@241 923 delete m_fsWatcherGeneralTimer;
Chris@241 924 m_fsWatcherGeneralTimer = 0;
Chris@241 925 delete m_fsWatcherRestoreTimer;
Chris@241 926 m_fsWatcherRestoreTimer = 0;
Chris@284 927 delete m_fsWatcher;
Chris@284 928 m_fsWatcher = 0;
Chris@199 929 }
Chris@120 930 }
jtkorhonen@17 931
jtkorhonen@11 932 void MainWindow::hgServe()
jtkorhonen@11 933 {
Chris@109 934 QStringList params;
Chris@109 935 QString msg;
jtkorhonen@11 936
Chris@182 937 QStringList addrs = listAllUpIpV4Addresses();
Chris@182 938
Chris@182 939 if (addrs.empty()) {
Chris@182 940 QMessageBox::critical
Chris@182 941 (this, tr("Serve"), tr("Failed to identify an active IPv4 address"));
Chris@182 942 return;
Chris@182 943 }
Chris@182 944
Chris@182 945 //!!! should find available port as well
Chris@182 946
Chris@182 947 QTextStream ts(&msg);
Chris@182 948 ts << QString("<qt><p>%1</p>")
Chris@182 949 .arg(tr("Running temporary server at %n address(es):", "", addrs.size()));
Chris@182 950 foreach (QString addr, addrs) {
Chris@182 951 ts << QString("<pre>&nbsp;&nbsp;http://%1:8000</pre>").arg(xmlEncode(addr));
Chris@182 952 }
Chris@182 953 ts << tr("<p>Press Close to stop the server and return.</p>");
Chris@182 954 ts.flush();
Chris@182 955
Chris@109 956 params << "serve";
jtkorhonen@11 957
Chris@284 958 m_runner->requestAction(HgAction(ACT_SERVE, m_workFolderPath, params));
Chris@109 959
Chris@182 960 QMessageBox::information(this, tr("Serve"), msg, QMessageBox::Close);
Chris@182 961
Chris@284 962 m_runner->killCurrentActions();
jtkorhonen@11 963 }
jtkorhonen@11 964
Chris@64 965 void MainWindow::startupDialog()
Chris@64 966 {
Chris@64 967 StartupDialog *dlg = new StartupDialog(this);
Chris@284 968 if (dlg->exec()) m_firstStart = false;
Chris@64 969 }
jtkorhonen@11 970
Chris@69 971 void MainWindow::open()
Chris@69 972 {
Chris@86 973 bool done = false;
Chris@69 974
Chris@86 975 while (!done) {
Chris@69 976
Chris@86 977 MultiChoiceDialog *d = new MultiChoiceDialog
Chris@86 978 (tr("Open Repository"),
Chris@86 979 tr("<qt><big>What would you like to open?</big></qt>"),
Chris@86 980 this);
Chris@69 981
Chris@86 982 d->addChoice("remote",
Chris@86 983 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
Chris@86 984 tr("Open a remote Mercurial repository, by cloning from its URL into a local folder."),
Chris@86 985 MultiChoiceDialog::UrlToDirectoryArg);
Chris@69 986
Chris@86 987 d->addChoice("local",
Chris@86 988 tr("<qt><center><img src=\":images/hglogo-64.png\"><br>Local repository</center></qt>"),
Chris@86 989 tr("Open an existing local Mercurial repository."),
Chris@86 990 MultiChoiceDialog::DirectoryArg);
Chris@69 991
Chris@86 992 d->addChoice("init",
Chris@86 993 tr("<qt><center><img src=\":images/hdd_unmount-64.png\"><br>File folder</center></qt>"),
Chris@86 994 tr("Open a local folder, by creating a Mercurial repository in it."),
Chris@86 995 MultiChoiceDialog::DirectoryArg);
Chris@79 996
Chris@248 997 QSettings settings;
Chris@248 998 settings.beginGroup("General");
Chris@248 999 QString lastChoice = settings.value("lastopentype", "local").toString();
Chris@248 1000 if (lastChoice != "local" &&
Chris@248 1001 lastChoice != "remote" &&
Chris@248 1002 lastChoice != "init") {
Chris@248 1003 lastChoice = "local";
Chris@248 1004 }
Chris@248 1005
Chris@248 1006 d->setCurrentChoice(lastChoice);
Chris@86 1007
Chris@86 1008 if (d->exec() == QDialog::Accepted) {
Chris@86 1009
Chris@86 1010 QString choice = d->getCurrentChoice();
Chris@248 1011 settings.setValue("lastopentype", choice);
Chris@248 1012
Chris@86 1013 QString arg = d->getArgument().trimmed();
Chris@86 1014
Chris@86 1015 bool result = false;
Chris@86 1016
Chris@86 1017 if (choice == "local") {
Chris@86 1018 result = openLocal(arg);
Chris@86 1019 } else if (choice == "remote") {
Chris@86 1020 result = openRemote(arg, d->getAdditionalArgument().trimmed());
Chris@86 1021 } else if (choice == "init") {
Chris@86 1022 result = openInit(arg);
Chris@86 1023 }
Chris@86 1024
Chris@86 1025 if (result) {
Chris@86 1026 enableDisableActions();
Chris@120 1027 clearState();
Chris@109 1028 hgQueryPaths();
Chris@91 1029 done = true;
Chris@91 1030 }
Chris@86 1031
Chris@86 1032 } else {
Chris@86 1033
Chris@86 1034 // cancelled
Chris@86 1035 done = true;
Chris@69 1036 }
Chris@79 1037
Chris@86 1038 delete d;
Chris@69 1039 }
Chris@69 1040 }
Chris@69 1041
Chris@182 1042 void MainWindow::changeRemoteRepo()
Chris@182 1043 {
Chris@183 1044 // This will involve rewriting the local .hgrc
Chris@183 1045
Chris@284 1046 QDir hgDir(m_workFolderPath + "/.hg");
Chris@184 1047 if (!hgDir.exists()) {
Chris@184 1048 //!!! visible error!
Chris@184 1049 return;
Chris@184 1050 }
Chris@184 1051
Chris@284 1052 QFileInfo hgrc(m_workFolderPath + "/.hg/hgrc");
Chris@184 1053 if (hgrc.exists() && !hgrc.isWritable()) {
Chris@183 1054 //!!! visible error!
Chris@183 1055 return;
Chris@183 1056 }
Chris@183 1057
Chris@183 1058 MultiChoiceDialog *d = new MultiChoiceDialog
Chris@183 1059 (tr("Change Remote Location"),
Chris@183 1060 tr("<qt><big>Change the remote location</big></qt>"),
Chris@183 1061 this);
Chris@183 1062
Chris@183 1063 d->addChoice("remote",
Chris@183 1064 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
Chris@183 1065 tr("Provide a new URL to use for push and pull actions from the current local repository."),
Chris@183 1066 MultiChoiceDialog::UrlArg);
Chris@183 1067
Chris@183 1068 if (d->exec() == QDialog::Accepted) {
Chris@210 1069
Chris@210 1070 // New block to ensure QSettings is deleted before
Chris@210 1071 // hgQueryPaths called. NB use of absoluteFilePath instead of
Chris@210 1072 // canonicalFilePath, which would fail if the file did not yet
Chris@210 1073 // exist
Chris@210 1074
Chris@210 1075 {
Chris@210 1076 QSettings s(hgrc.absoluteFilePath(), QSettings::IniFormat);
Chris@210 1077 s.beginGroup("paths");
Chris@210 1078 s.setValue("default", d->getArgument());
Chris@210 1079 }
Chris@210 1080
Chris@284 1081 m_stateUnknown = true;
Chris@183 1082 hgQueryPaths();
Chris@183 1083 }
Chris@183 1084
Chris@183 1085 delete d;
Chris@182 1086 }
Chris@182 1087
Chris@145 1088 void MainWindow::open(QString local)
Chris@145 1089 {
Chris@145 1090 if (openLocal(local)) {
Chris@145 1091 enableDisableActions();
Chris@145 1092 clearState();
Chris@145 1093 hgQueryPaths();
Chris@145 1094 }
Chris@145 1095 }
Chris@145 1096
Chris@79 1097 bool MainWindow::complainAboutFilePath(QString arg)
Chris@79 1098 {
Chris@79 1099 QMessageBox::critical
Chris@79 1100 (this, tr("File chosen"),
Chris@84 1101 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 1102 return false;
Chris@79 1103 }
Chris@79 1104
Chris@248 1105 bool MainWindow::askAboutUnknownFolder(QString arg)
Chris@248 1106 {
Chris@248 1107 bool result = (QMessageBox::question
Chris@248 1108 (this, tr("Path does not exist"),
Chris@248 1109 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 1110 QMessageBox::Ok | QMessageBox::Cancel,
Chris@248 1111 QMessageBox::Cancel)
Chris@248 1112 == QMessageBox::Ok);
Chris@248 1113 if (result) {
Chris@248 1114 QDir dir(arg);
Chris@248 1115 dir.cdUp();
Chris@248 1116 if (!dir.mkpath(dir.absolutePath())) {
Chris@248 1117 QMessageBox::critical
Chris@248 1118 (this, tr("Failed to create folder"),
Chris@248 1119 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 1120 return false;
Chris@248 1121 }
Chris@248 1122 return true;
Chris@248 1123 }
Chris@248 1124 return false;
Chris@248 1125 }
Chris@248 1126
Chris@79 1127 bool MainWindow::complainAboutUnknownFolder(QString arg)
Chris@79 1128 {
Chris@79 1129 QMessageBox::critical
Chris@79 1130 (this, tr("Folder does not exist"),
Chris@84 1131 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 1132 return false;
Chris@84 1133 }
Chris@84 1134
Chris@84 1135 bool MainWindow::complainAboutInitInRepo(QString arg)
Chris@84 1136 {
Chris@84 1137 QMessageBox::critical
Chris@84 1138 (this, tr("Path is in existing repository"),
Chris@84 1139 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 1140 return false;
Chris@84 1141 }
Chris@84 1142
Chris@84 1143 bool MainWindow::complainAboutInitFile(QString arg)
Chris@84 1144 {
Chris@84 1145 QMessageBox::critical
Chris@84 1146 (this, tr("Path is a file"),
Chris@84 1147 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 1148 return false;
Chris@84 1149 }
Chris@84 1150
Chris@84 1151 bool MainWindow::complainAboutCloneToExisting(QString arg)
Chris@84 1152 {
Chris@84 1153 QMessageBox::critical
Chris@84 1154 (this, tr("Path is in existing repository"),
Chris@237 1155 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 1156 return false;
Chris@84 1157 }
Chris@84 1158
Chris@84 1159 bool MainWindow::complainAboutCloneToFile(QString arg)
Chris@84 1160 {
Chris@84 1161 QMessageBox::critical
Chris@84 1162 (this, tr("Path is a file"),
Chris@84 1163 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 1164 return false;
Chris@84 1165 }
Chris@84 1166
Chris@237 1167 QString MainWindow::complainAboutCloneToExistingFolder(QString arg, QString remote)
Chris@84 1168 {
Chris@237 1169 // If the directory "arg" exists but "arg" plus the last path
Chris@237 1170 // component of "remote" does not, then offer the latter as an
Chris@237 1171 // alternative path
Chris@237 1172
Chris@237 1173 QString offer;
Chris@237 1174
Chris@237 1175 QDir d(arg);
Chris@237 1176 if (d.exists()) {
Chris@237 1177 if (QRegExp("^\\w+://").indexIn(remote) >= 0) {
Chris@237 1178 QString rpath = QUrl(remote).path();
Chris@237 1179 if (rpath != "") {
Chris@237 1180 rpath = QDir(rpath).dirName();
Chris@237 1181 if (rpath != "" && !d.exists(rpath)) {
Chris@237 1182 offer = d.filePath(rpath);
Chris@237 1183 }
Chris@237 1184 }
Chris@237 1185 }
Chris@237 1186 }
Chris@237 1187
Chris@237 1188 if (offer != "") {
Chris@237 1189 bool result = (QMessageBox::question
Chris@237 1190 (this, tr("Folder exists"),
Chris@237 1191 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 1192 .arg(xmlEncode(arg)).arg(xmlEncode(offer)),
Chris@237 1193 QMessageBox::Ok | QMessageBox::Cancel,
Chris@237 1194 QMessageBox::Cancel)
Chris@237 1195 == QMessageBox::Ok);
Chris@237 1196 if (result) return offer;
Chris@237 1197 else return "";
Chris@237 1198 }
Chris@237 1199
Chris@84 1200 QMessageBox::critical
Chris@84 1201 (this, tr("Folder exists"),
Chris@237 1202 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 1203 return "";
Chris@79 1204 }
Chris@79 1205
Chris@79 1206 bool MainWindow::askToOpenParentRepo(QString arg, QString parent)
Chris@79 1207 {
Chris@79 1208 return (QMessageBox::question
Chris@84 1209 (this, tr("Path is inside a repository"),
Chris@86 1210 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 1211 .arg(xmlEncode(arg)).arg(xmlEncode(parent)),
Chris@79 1212 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1213 QMessageBox::Ok)
Chris@79 1214 == QMessageBox::Ok);
Chris@79 1215 }
Chris@79 1216
Chris@79 1217 bool MainWindow::askToInitExisting(QString arg)
Chris@79 1218 {
Chris@79 1219 return (QMessageBox::question
Chris@84 1220 (this, tr("Folder has no repository"),
Chris@84 1221 tr("<qt><b>Initialise a repository here?</b><br><br>You asked to open \"%1\".<br>This folder does not contain a Mercurial repository.<br><br>Would you like to initialise a repository here?</qt>")
Chris@79 1222 .arg(xmlEncode(arg)),
Chris@79 1223 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1224 QMessageBox::Ok)
Chris@79 1225 == QMessageBox::Ok);
Chris@79 1226 }
Chris@79 1227
Chris@79 1228 bool MainWindow::askToInitNew(QString arg)
Chris@79 1229 {
Chris@79 1230 return (QMessageBox::question
Chris@84 1231 (this, tr("Folder does not exist"),
Chris@84 1232 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 1233 .arg(xmlEncode(arg)),
Chris@84 1234 QMessageBox::Ok | QMessageBox::Cancel,
Chris@84 1235 QMessageBox::Ok)
Chris@84 1236 == QMessageBox::Ok);
Chris@84 1237 }
Chris@84 1238
Chris@84 1239 bool MainWindow::askToOpenInsteadOfInit(QString arg)
Chris@84 1240 {
Chris@84 1241 return (QMessageBox::question
Chris@84 1242 (this, tr("Repository exists"),
Chris@84 1243 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 1244 .arg(xmlEncode(arg)),
Chris@79 1245 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 1246 QMessageBox::Ok)
Chris@79 1247 == QMessageBox::Ok);
Chris@79 1248 }
Chris@79 1249
Chris@79 1250 bool MainWindow::openLocal(QString local)
Chris@79 1251 {
Chris@79 1252 DEBUG << "open " << local << endl;
Chris@79 1253
Chris@79 1254 FolderStatus status = getFolderStatus(local);
Chris@79 1255 QString containing = getContainingRepoFolder(local);
Chris@79 1256
Chris@79 1257 switch (status) {
Chris@79 1258
Chris@79 1259 case FolderHasRepo:
Chris@79 1260 // fine
Chris@79 1261 break;
Chris@79 1262
Chris@79 1263 case FolderExists:
Chris@79 1264 if (containing != "") {
Chris@79 1265 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1266 local = containing;
Chris@79 1267 } else {
Chris@86 1268 //!!! No -- this is likely to happen far more by accident
Chris@86 1269 // than because the user actually wanted to init something.
Chris@86 1270 // Don't ask, just politely reject.
Chris@79 1271 if (!askToInitExisting(local)) return false;
Chris@79 1272 return openInit(local);
Chris@79 1273 }
Chris@79 1274 break;
Chris@79 1275
Chris@79 1276 case FolderParentExists:
Chris@79 1277 if (containing != "") {
Chris@79 1278 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1279 local = containing;
Chris@79 1280 } else {
Chris@79 1281 if (!askToInitNew(local)) return false;
Chris@79 1282 return openInit(local);
Chris@79 1283 }
Chris@79 1284 break;
Chris@79 1285
Chris@79 1286 case FolderUnknown:
Chris@84 1287 if (containing != "") {
Chris@84 1288 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 1289 local = containing;
Chris@84 1290 } else {
Chris@84 1291 return complainAboutUnknownFolder(local);
Chris@84 1292 }
Chris@84 1293 break;
Chris@79 1294
Chris@79 1295 case FolderIsFile:
Chris@79 1296 return complainAboutFilePath(local);
Chris@79 1297 }
Chris@79 1298
Chris@284 1299 m_workFolderPath = local;
Chris@284 1300 m_remoteRepoPath = "";
Chris@79 1301 return true;
Chris@79 1302 }
Chris@79 1303
Chris@79 1304 bool MainWindow::openRemote(QString remote, QString local)
Chris@79 1305 {
Chris@79 1306 DEBUG << "clone " << remote << " to " << local << endl;
Chris@84 1307
Chris@84 1308 FolderStatus status = getFolderStatus(local);
Chris@84 1309 QString containing = getContainingRepoFolder(local);
Chris@84 1310
Chris@84 1311 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 1312
Chris@84 1313 if (status == FolderHasRepo || containing != "") {
Chris@84 1314 return complainAboutCloneToExisting(local);
Chris@84 1315 }
Chris@84 1316
Chris@84 1317 if (status == FolderIsFile) {
Chris@84 1318 return complainAboutCloneToFile(local);
Chris@84 1319 }
Chris@84 1320
Chris@84 1321 if (status == FolderUnknown) {
Chris@248 1322 if (!askAboutUnknownFolder(local)) {
Chris@248 1323 return false;
Chris@248 1324 }
Chris@84 1325 }
Chris@84 1326
Chris@84 1327 if (status == FolderExists) {
Chris@237 1328 local = complainAboutCloneToExistingFolder(local, remote);
Chris@237 1329 if (local == "") return false;
Chris@84 1330 }
Chris@84 1331
Chris@284 1332 m_workFolderPath = local;
Chris@284 1333 m_remoteRepoPath = remote;
Chris@84 1334 hgCloneFromRemote();
Chris@84 1335
Chris@79 1336 return true;
Chris@79 1337 }
Chris@79 1338
Chris@84 1339 bool MainWindow::openInit(QString local)
Chris@79 1340 {
Chris@84 1341 DEBUG << "openInit " << local << endl;
Chris@84 1342
Chris@84 1343 FolderStatus status = getFolderStatus(local);
Chris@84 1344 QString containing = getContainingRepoFolder(local);
Chris@84 1345
Chris@84 1346 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 1347
Chris@84 1348 if (status == FolderHasRepo) {
Chris@84 1349 if (!askToOpenInsteadOfInit(local)) return false;
Chris@84 1350 }
Chris@84 1351
Chris@84 1352 if (containing != "") {
Chris@84 1353 return complainAboutInitInRepo(local);
Chris@84 1354 }
Chris@84 1355
Chris@84 1356 if (status == FolderIsFile) {
Chris@84 1357 return complainAboutInitFile(local);
Chris@84 1358 }
Chris@84 1359
Chris@84 1360 if (status == FolderUnknown) {
Chris@84 1361 return complainAboutUnknownFolder(local);
Chris@84 1362 }
Chris@84 1363
Chris@284 1364 m_workFolderPath = local;
Chris@284 1365 m_remoteRepoPath = "";
Chris@84 1366 hgInit();
Chris@79 1367 return true;
Chris@79 1368 }
Chris@79 1369
jtkorhonen@0 1370 void MainWindow::settings()
jtkorhonen@0 1371 {
jtkorhonen@0 1372 SettingsDialog *settingsDlg = new SettingsDialog(this);
jtkorhonen@0 1373 settingsDlg->exec();
Chris@230 1374
Chris@230 1375 if (settingsDlg->presentationChanged()) {
Chris@284 1376 m_hgTabs->updateFileStates();
Chris@230 1377 updateToolBarStyle();
Chris@273 1378 hgRefresh();
Chris@230 1379 }
jtkorhonen@0 1380 }
jtkorhonen@0 1381
jtkorhonen@2 1382 #define STDOUT_NEEDS_BIG_WINDOW 512
jtkorhonen@2 1383 #define SMALL_WND_W 500
jtkorhonen@2 1384 #define SMALL_WND_H 300
jtkorhonen@2 1385
jtkorhonen@2 1386 #define BIG_WND_W 1024
jtkorhonen@2 1387 #define BIG_WND_H 768
jtkorhonen@2 1388
jtkorhonen@2 1389
jtkorhonen@2 1390 void MainWindow::presentLongStdoutToUser(QString stdo)
jtkorhonen@0 1391 {
jtkorhonen@2 1392 if (!stdo.isEmpty())
jtkorhonen@2 1393 {
jtkorhonen@2 1394 QDialog dlg;
jtkorhonen@0 1395
jtkorhonen@2 1396 if (stdo.length() > STDOUT_NEEDS_BIG_WINDOW)
jtkorhonen@2 1397 {
jtkorhonen@2 1398 dlg.setMinimumWidth(BIG_WND_W);
jtkorhonen@2 1399 dlg.setMinimumHeight(BIG_WND_H);
jtkorhonen@2 1400 }
jtkorhonen@2 1401 else
jtkorhonen@2 1402 {
jtkorhonen@2 1403 dlg.setMinimumWidth(SMALL_WND_W);
jtkorhonen@2 1404 dlg.setMinimumHeight(SMALL_WND_H);
jtkorhonen@2 1405 }
jtkorhonen@0 1406
jtkorhonen@2 1407 QVBoxLayout *box = new QVBoxLayout;
jtkorhonen@2 1408 QListWidget *list = new QListWidget;
jtkorhonen@2 1409 list-> addItems(stdo.split("\n"));
jtkorhonen@2 1410 QPushButton *btn = new QPushButton(tr("Ok"));
jtkorhonen@2 1411 connect(btn, SIGNAL(clicked()), &dlg, SLOT(accept()));
jtkorhonen@0 1412
jtkorhonen@2 1413 box -> addWidget(list);
jtkorhonen@2 1414 box -> addWidget(btn);
jtkorhonen@2 1415 dlg.setLayout(box);
jtkorhonen@2 1416
jtkorhonen@2 1417 dlg.exec();
jtkorhonen@2 1418 }
jtkorhonen@2 1419 else
jtkorhonen@2 1420 {
Chris@98 1421 QMessageBox::information(this, tr("EasyMercurial"), tr("Mercurial command did not return any output."));
jtkorhonen@2 1422 }
jtkorhonen@0 1423 }
jtkorhonen@0 1424
Chris@90 1425 void MainWindow::updateFileSystemWatcher()
Chris@90 1426 {
Chris@199 1427 bool justCreated = false;
Chris@284 1428 if (!m_fsWatcher) {
Chris@284 1429 m_fsWatcher = new QFileSystemWatcher();
Chris@199 1430 justCreated = true;
Chris@199 1431 }
Chris@199 1432
Chris@199 1433 // QFileSystemWatcher will refuse to add a file or directory to
Chris@199 1434 // its watch list that it is already watching -- fine, that's what
Chris@199 1435 // we want -- but it prints a warning when this happens, which is
Chris@199 1436 // annoying because it would be the normal case for us. So we'll
Chris@199 1437 // check for duplicates ourselves.
Chris@199 1438 QSet<QString> alreadyWatched;
Chris@284 1439 QStringList dl(m_fsWatcher->directories());
Chris@199 1440 foreach (QString d, dl) alreadyWatched.insert(d);
Chris@199 1441
Chris@90 1442 std::deque<QString> pending;
Chris@284 1443 pending.push_back(m_workFolderPath);
Chris@199 1444
Chris@90 1445 while (!pending.empty()) {
Chris@199 1446
Chris@90 1447 QString path = pending.front();
Chris@90 1448 pending.pop_front();
Chris@199 1449 if (!alreadyWatched.contains(path)) {
Chris@284 1450 m_fsWatcher->addPath(path);
Chris@199 1451 DEBUG << "Added to file system watcher: " << path << endl;
Chris@199 1452 }
Chris@199 1453
Chris@90 1454 QDir d(path);
Chris@90 1455 if (d.exists()) {
Chris@199 1456 d.setFilter(QDir::Dirs | QDir::NoDotAndDotDot |
Chris@199 1457 QDir::Readable | QDir::NoSymLinks);
Chris@90 1458 foreach (QString entry, d.entryList()) {
Chris@199 1459 if (entry.startsWith('.')) continue;
Chris@90 1460 QString entryPath = d.absoluteFilePath(entry);
Chris@90 1461 pending.push_back(entryPath);
Chris@90 1462 }
Chris@90 1463 }
Chris@90 1464 }
Chris@199 1465
Chris@238 1466 // The general timer isn't really related to the fs watcher
Chris@238 1467 // object, it just does something similar -- every now and then we
Chris@238 1468 // do a refresh just to update the history dates etc
Chris@238 1469
Chris@238 1470 m_fsWatcherGeneralTimer = new QTimer(this);
Chris@238 1471 connect(m_fsWatcherGeneralTimer, SIGNAL(timeout()),
Chris@238 1472 this, SLOT(checkFilesystem()));
Chris@238 1473 m_fsWatcherGeneralTimer->setInterval(30 * 60 * 1000); // half an hour
Chris@238 1474 m_fsWatcherGeneralTimer->start();
Chris@238 1475
Chris@199 1476 if (justCreated) {
Chris@284 1477 connect(m_fsWatcher, SIGNAL(directoryChanged(QString)),
Chris@199 1478 this, SLOT(fsDirectoryChanged(QString)));
Chris@284 1479 connect(m_fsWatcher, SIGNAL(fileChanged(QString)),
Chris@199 1480 this, SLOT(fsFileChanged(QString)));
Chris@199 1481 }
Chris@90 1482 }
Chris@90 1483
Chris@238 1484 void MainWindow::suspendFileSystemWatcher()
Chris@238 1485 {
Chris@238 1486 DEBUG << "MainWindow::suspendFileSystemWatcher" << endl;
Chris@284 1487 if (m_fsWatcher) {
Chris@241 1488 m_fsWatcherSuspended = true;
Chris@241 1489 if (m_fsWatcherRestoreTimer) {
Chris@241 1490 delete m_fsWatcherRestoreTimer;
Chris@241 1491 m_fsWatcherRestoreTimer = 0;
Chris@241 1492 }
Chris@238 1493 m_fsWatcherGeneralTimer->stop();
Chris@238 1494 }
Chris@238 1495 }
Chris@238 1496
Chris@238 1497 void MainWindow::restoreFileSystemWatcher()
Chris@238 1498 {
Chris@238 1499 DEBUG << "MainWindow::restoreFileSystemWatcher" << endl;
Chris@238 1500 if (m_fsWatcherRestoreTimer) delete m_fsWatcherRestoreTimer;
Chris@238 1501
Chris@238 1502 // The restore timer is used to leave a polite interval between
Chris@238 1503 // being asked to restore the watcher and actually doing so. It's
Chris@238 1504 // a single shot timer each time it's used, but we don't use
Chris@238 1505 // QTimer::singleShot because we want to stop the previous one if
Chris@238 1506 // it's running (via deleting it)
Chris@238 1507
Chris@238 1508 m_fsWatcherRestoreTimer = new QTimer(this);
Chris@238 1509 connect(m_fsWatcherRestoreTimer, SIGNAL(timeout()),
Chris@238 1510 this, SLOT(actuallyRestoreFileSystemWatcher()));
Chris@238 1511 m_fsWatcherRestoreTimer->setInterval(1000);
Chris@238 1512 m_fsWatcherRestoreTimer->setSingleShot(true);
Chris@238 1513 m_fsWatcherRestoreTimer->start();
Chris@238 1514 }
Chris@238 1515
Chris@238 1516 void MainWindow::actuallyRestoreFileSystemWatcher()
Chris@238 1517 {
Chris@238 1518 DEBUG << "MainWindow::actuallyRestoreFileSystemWatcher" << endl;
Chris@284 1519 if (m_fsWatcher) {
Chris@241 1520 m_fsWatcherSuspended = false;
Chris@241 1521 m_fsWatcherGeneralTimer->start();
Chris@241 1522 }
Chris@238 1523 }
Chris@238 1524
Chris@238 1525 void MainWindow::checkFilesystem()
Chris@238 1526 {
Chris@238 1527 DEBUG << "MainWindow::checkFilesystem" << endl;
Chris@273 1528 hgRefresh();
Chris@238 1529 }
Chris@238 1530
Chris@122 1531 void MainWindow::fsDirectoryChanged(QString d)
Chris@90 1532 {
Chris@122 1533 DEBUG << "MainWindow::fsDirectoryChanged " << d << endl;
Chris@241 1534 if (!m_fsWatcherSuspended) {
Chris@241 1535 hgStat();
Chris@241 1536 }
Chris@90 1537 }
Chris@90 1538
Chris@122 1539 void MainWindow::fsFileChanged(QString f)
Chris@90 1540 {
Chris@122 1541 DEBUG << "MainWindow::fsFileChanged " << f << endl;
Chris@241 1542 if (!m_fsWatcherSuspended) {
Chris@241 1543 hgStat();
Chris@241 1544 }
Chris@90 1545 }
Chris@90 1546
Chris@275 1547 QString MainWindow::format1(QString head)
Chris@275 1548 {
Chris@275 1549 return QString("<qt><h3>%1</h3></qt>").arg(head);
Chris@275 1550 }
Chris@275 1551
Chris@125 1552 QString MainWindow::format3(QString head, QString intro, QString code)
Chris@125 1553 {
Chris@196 1554 code = xmlEncode(code).replace("\n", "<br>")
Chris@196 1555 #ifndef Q_OS_WIN32
Chris@196 1556 // The hard hyphen comes out funny on Windows
Chris@196 1557 .replace("-", "&#8209;")
Chris@196 1558 #endif
Chris@196 1559 .replace(" ", "&nbsp;");
Chris@125 1560 if (intro == "") {
Chris@168 1561 return QString("<qt><h3>%1</h3><p><code>%2</code></p>")
Chris@168 1562 .arg(head).arg(code);
Chris@126 1563 } else if (code == "") {
Chris@126 1564 return QString("<qt><h3>%1</h3><p>%2</p>")
Chris@126 1565 .arg(head).arg(intro);
Chris@125 1566 } else {
Chris@168 1567 return QString("<qt><h3>%1</h3><p>%2</p><p><code>%3</code></p>")
Chris@168 1568 .arg(head).arg(intro).arg(code);
Chris@125 1569 }
Chris@125 1570 }
Chris@125 1571
Chris@120 1572 void MainWindow::showIncoming(QString output)
Chris@120 1573 {
Chris@284 1574 m_runner->hide();
Chris@125 1575 IncomingDialog *d = new IncomingDialog(this, output);
Chris@125 1576 d->exec();
Chris@125 1577 delete d;
Chris@125 1578 }
Chris@125 1579
Chris@125 1580 int MainWindow::extractChangeCount(QString text)
Chris@125 1581 {
Chris@125 1582 QRegExp re("added (\\d+) ch\\w+ with (\\d+) ch\\w+ to (\\d+) f\\w+");
Chris@125 1583 if (re.indexIn(text) >= 0) {
Chris@125 1584 return re.cap(1).toInt();
Chris@125 1585 } else if (text.contains("no changes")) {
Chris@125 1586 return 0;
Chris@125 1587 } else {
Chris@125 1588 return -1; // unknown
Chris@125 1589 }
Chris@120 1590 }
Chris@120 1591
Chris@120 1592 void MainWindow::showPushResult(QString output)
Chris@120 1593 {
Chris@291 1594 QString head;
Chris@125 1595 QString report;
Chris@125 1596 int n = extractChangeCount(output);
Chris@125 1597 if (n > 0) {
Chris@291 1598 head = tr("Pushed %n changeset(s)", "", n);
Chris@125 1599 } else if (n == 0) {
Chris@291 1600 head = tr("No changes to push");
Chris@291 1601 report = tr("The remote repository already contains all changes that have been committed locally.");
Chris@294 1602 if (m_hgTabs->canCommit()) {
Chris@291 1603 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 1604 }
Chris@125 1605 } else {
Chris@291 1606 head = tr("Push complete");
Chris@125 1607 }
Chris@284 1608 m_runner->hide();
Chris@291 1609
Chris@291 1610 MoreInformationDialog::information(this, tr("Push complete"),
Chris@291 1611 head, report, output);
Chris@120 1612 }
Chris@120 1613
Chris@120 1614 void MainWindow::showPullResult(QString output)
Chris@120 1615 {
Chris@291 1616 QString head;
Chris@125 1617 QString report;
Chris@125 1618 int n = extractChangeCount(output);
Chris@125 1619 if (n > 0) {
Chris@291 1620 head = tr("Pulled %n changeset(s)", "", n);
Chris@291 1621 report = tr("New changes will be highlighted in the history. Update to bring these changes into your working copy.");
Chris@125 1622 } else if (n == 0) {
Chris@291 1623 head = tr("No changes to pull");
Chris@291 1624 report = tr("Your local repository already contains all changes found in the remote repository.");
Chris@125 1625 } else {
Chris@291 1626 head = tr("Pull complete");
Chris@125 1627 }
Chris@284 1628 m_runner->hide();
Chris@275 1629
Chris@275 1630 MoreInformationDialog::information(this, tr("Pull complete"),
Chris@291 1631 head, report, output);
Chris@120 1632 }
Chris@120 1633
Chris@174 1634 void MainWindow::reportNewRemoteHeads(QString output)
Chris@174 1635 {
Chris@174 1636 bool headsAreLocal = false;
Chris@174 1637
Chris@284 1638 if (m_currentParents.size() == 1) {
Chris@284 1639 int m_currentBranchHeads = 0;
Chris@174 1640 bool parentIsHead = false;
Chris@284 1641 Changeset *parent = m_currentParents[0];
Chris@284 1642 foreach (Changeset *head, m_currentHeads) {
Chris@284 1643 if (head->isOnBranch(m_currentBranch)) {
Chris@284 1644 ++m_currentBranchHeads;
Chris@174 1645 }
Chris@174 1646 if (parent->id() == head->id()) {
Chris@174 1647 parentIsHead = true;
Chris@174 1648 }
Chris@174 1649 }
Chris@284 1650 if (m_currentBranchHeads == 2 && parentIsHead) {
Chris@174 1651 headsAreLocal = true;
Chris@174 1652 }
Chris@174 1653 }
Chris@174 1654
Chris@174 1655 if (headsAreLocal) {
Chris@291 1656 MoreInformationDialog::warning
Chris@291 1657 (this,
Chris@291 1658 tr("Push failed"),
Chris@291 1659 tr("Push failed"),
Chris@291 1660 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 1661 output);
Chris@174 1662 } else {
Chris@291 1663 MoreInformationDialog::warning
Chris@291 1664 (this,
Chris@291 1665 tr("Push failed"),
Chris@291 1666 tr("Push failed"),
Chris@291 1667 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 1668 output);
Chris@174 1669 }
Chris@174 1670 }
Chris@174 1671
Chris@238 1672 void MainWindow::commandStarting(HgAction action)
Chris@238 1673 {
Chris@238 1674 // Annoyingly, hg stat actually modifies the working directory --
Chris@238 1675 // it creates files called hg-checklink and hg-checkexec to test
Chris@238 1676 // properties of the filesystem. For safety's sake, suspend the
Chris@238 1677 // fs watcher while running commands, and restore it shortly after
Chris@238 1678 // a command has finished.
Chris@238 1679
Chris@246 1680 if (action.action == ACT_STAT) {
Chris@246 1681 suspendFileSystemWatcher();
Chris@246 1682 }
Chris@238 1683 }
Chris@238 1684
Chris@143 1685 void MainWindow::commandFailed(HgAction action, QString output)
Chris@62 1686 {
Chris@62 1687 DEBUG << "MainWindow::commandFailed" << endl;
Chris@238 1688 restoreFileSystemWatcher();
Chris@74 1689
Chris@210 1690 QString setstr;
Chris@210 1691 #ifdef Q_OS_MAC
Chris@210 1692 setstr = tr("Preferences");
Chris@210 1693 #else
Chris@210 1694 setstr = tr("Settings");
Chris@210 1695 #endif
Chris@210 1696
Chris@113 1697 // Some commands we just have to ignore bad return values from:
Chris@113 1698
Chris@113 1699 switch(action.action) {
Chris@113 1700 case ACT_NONE:
Chris@113 1701 // uh huh
Chris@113 1702 return;
Chris@175 1703 case ACT_TEST_HG:
Chris@291 1704 MoreInformationDialog::warning
Chris@291 1705 (this,
Chris@291 1706 tr("Failed to run Mercurial"),
Chris@291 1707 tr("Failed to run Mercurial"),
Chris@291 1708 tr("The Mercurial program either could not be found or failed to run.<br>Check that the Mercurial program path is correct in %1.").arg(setstr),
Chris@291 1709 output);
Chris@200 1710 settings();
Chris@200 1711 return;
Chris@200 1712 case ACT_TEST_HG_EXT:
Chris@200 1713 QMessageBox::warning
Chris@291 1714 (this,
Chris@291 1715 tr("Failed to run Mercurial"),
Chris@291 1716 tr("Failed to run Mercurial with extension enabled"),
Chris@291 1717 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem with EasyMercurial.<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 may not work if you do this.").arg(setstr),
Chris@291 1718 output);
Chris@175 1719 settings();
Chris@175 1720 return;
Chris@252 1721 case ACT_CLONEFROMREMOTE:
Chris@252 1722 // if clone fails, we have no repo
Chris@284 1723 m_workFolderPath = "";
Chris@252 1724 enableDisableActions();
Chris@252 1725 break;
Chris@113 1726 case ACT_INCOMING:
Chris@211 1727 // returns non-zero code and no output if the check was
Chris@211 1728 // successful but there are no changes pending
Chris@280 1729 if (output.replace(QRegExp("(^|\\n)warning: [^\\n]*\\n"), "").trimmed() == "") {
Chris@211 1730 showIncoming("");
Chris@211 1731 return;
Chris@211 1732 }
Chris@211 1733 break;
Chris@162 1734 case ACT_QUERY_HEADS:
Chris@162 1735 // fails if repo is empty; we don't care (if there's a genuine
Chris@202 1736 // problem, something else will fail too). Pretend it
Chris@202 1737 // succeeded, so that any further actions that are contingent
Chris@202 1738 // on the success of the heads query get carried out properly.
Chris@202 1739 commandCompleted(action, "");
Chris@162 1740 return;
Chris@113 1741 case ACT_FOLDERDIFF:
Chris@113 1742 case ACT_CHGSETDIFF:
Chris@113 1743 // external program, unlikely to be anything useful in stderr
Chris@113 1744 // and some return with failure codes when something as basic
Chris@113 1745 // as the user closing the window via the wm happens
Chris@113 1746 return;
Chris@174 1747 case ACT_PUSH:
Chris@174 1748 if (output.contains("creates new remote heads")) {
Chris@174 1749 reportNewRemoteHeads(output);
Chris@174 1750 return;
Chris@174 1751 }
Chris@199 1752 case ACT_STAT:
Chris@199 1753 break; // go on and report
Chris@113 1754 default:
Chris@114 1755 break;
Chris@113 1756 }
Chris@113 1757
Chris@113 1758 QString command = action.executable;
Chris@113 1759 if (command == "") command = "hg";
Chris@113 1760 foreach (QString arg, action.params) {
Chris@113 1761 command += " " + arg;
Chris@113 1762 }
Chris@113 1763
Chris@291 1764 //!!!
Chris@291 1765
Chris@113 1766 QString message = tr("<qt><h3>Command failed</h3>"
Chris@113 1767 "<p>The following command failed:</p>"
Chris@113 1768 "<code>%1</code>"
Chris@113 1769 "%2</qt>")
Chris@113 1770 .arg(command)
Chris@143 1771 .arg((output.trimmed() != "") ?
Chris@113 1772 tr("<p>Its output said:</p><code>%1</code>")
Chris@143 1773 .arg(xmlEncode(output.left(800))
Chris@113 1774 .replace("\n", "<br>"))
Chris@113 1775 : "");
Chris@113 1776
Chris@113 1777 QMessageBox::warning(this, tr("Command failed"), message);
Chris@62 1778 }
Chris@62 1779
Chris@109 1780 void MainWindow::commandCompleted(HgAction completedAction, QString output)
jtkorhonen@0 1781 {
Chris@238 1782 restoreFileSystemWatcher();
Chris@109 1783 HGACTIONS action = completedAction.action;
Chris@109 1784
Chris@109 1785 if (action == ACT_NONE) return;
Chris@109 1786
Chris@150 1787 bool headsChanged = false;
Chris@150 1788 QStringList oldHeadIds;
Chris@150 1789
Chris@150 1790 switch (action) {
Chris@109 1791
Chris@175 1792 case ACT_TEST_HG:
Chris@175 1793 break;
Chris@175 1794
Chris@200 1795 case ACT_TEST_HG_EXT:
Chris@200 1796 break;
Chris@200 1797
Chris@109 1798 case ACT_QUERY_PATHS:
jtkorhonen@0 1799 {
Chris@109 1800 DEBUG << "stdout is " << output << endl;
Chris@109 1801 LogParser lp(output, "=");
Chris@109 1802 LogList ll = lp.parse();
Chris@109 1803 DEBUG << ll.size() << " results" << endl;
Chris@109 1804 if (!ll.empty()) {
Chris@284 1805 m_remoteRepoPath = lp.parse()[0]["default"].trimmed();
Chris@284 1806 DEBUG << "Set remote path to " << m_remoteRepoPath << endl;
Chris@210 1807 } else {
Chris@284 1808 m_remoteRepoPath = "";
Chris@109 1809 }
Chris@284 1810 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 1811 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@284 1812 m_hgTabs->setWorkFolderAndRepoNames(m_workFolderPath, m_remoteRepoPath);
Chris@109 1813 break;
Chris@109 1814 }
jtkorhonen@0 1815
Chris@109 1816 case ACT_QUERY_BRANCH:
Chris@284 1817 m_currentBranch = output.trimmed();
Chris@109 1818 break;
jtkorhonen@0 1819
Chris@109 1820 case ACT_STAT:
Chris@284 1821 m_lastStatOutput = output;
Chris@109 1822 updateFileSystemWatcher();
Chris@109 1823 break;
Chris@163 1824
Chris@163 1825 case ACT_RESOLVE_LIST:
Chris@163 1826 if (output != "") {
Chris@163 1827 // Remove lines beginning with R (they are resolved,
Chris@163 1828 // and the file stat parser treats R as removed)
Chris@163 1829 QStringList outList = output.split('\n');
Chris@163 1830 QStringList winnowed;
Chris@163 1831 foreach (QString line, outList) {
Chris@163 1832 if (!line.startsWith("R ")) winnowed.push_back(line);
Chris@163 1833 }
Chris@163 1834 output = winnowed.join("\n");
Chris@163 1835 }
Chris@284 1836 DEBUG << "m_lastStatOutput = " << m_lastStatOutput << endl;
Chris@199 1837 DEBUG << "resolve output = " << output << endl;
Chris@284 1838 m_hgTabs->updateWorkFolderFileList(m_lastStatOutput + output);
Chris@163 1839 break;
Chris@163 1840
Chris@163 1841 case ACT_RESOLVE_MARK:
Chris@284 1842 m_shouldHgStat = true;
Chris@163 1843 break;
Chris@109 1844
Chris@109 1845 case ACT_INCOMING:
Chris@120 1846 showIncoming(output);
Chris@120 1847 break;
Chris@120 1848
Chris@109 1849 case ACT_ANNOTATE:
Chris@109 1850 presentLongStdoutToUser(output);
Chris@284 1851 m_shouldHgStat = true;
Chris@109 1852 break;
Chris@109 1853
Chris@109 1854 case ACT_PULL:
Chris@120 1855 showPullResult(output);
Chris@284 1856 m_shouldHgStat = true;
Chris@109 1857 break;
Chris@109 1858
Chris@109 1859 case ACT_PUSH:
Chris@120 1860 showPushResult(output);
Chris@109 1861 break;
Chris@109 1862
Chris@109 1863 case ACT_INIT:
Chris@284 1864 MultiChoiceDialog::addRecentArgument("init", m_workFolderPath);
Chris@284 1865 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@109 1866 enableDisableActions();
Chris@284 1867 m_shouldHgStat = true;
Chris@109 1868 break;
Chris@109 1869
Chris@109 1870 case ACT_CLONEFROMREMOTE:
Chris@284 1871 MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
Chris@284 1872 MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
Chris@284 1873 MultiChoiceDialog::addRecentArgument("remote", m_workFolderPath, true);
Chris@291 1874 MoreInformationDialog::information
Chris@291 1875 (this,
Chris@291 1876 tr("Clone"),
Chris@291 1877 tr("Clone successful"),
Chris@294 1878 tr("The remote repository <pre>%1</pre> was successfully cloned to the local folder <pre>%2</pre>.").arg(m_remoteRepoPath).arg(m_workFolderPath),
Chris@291 1879 output);
Chris@109 1880 enableDisableActions();
Chris@284 1881 m_shouldHgStat = true;
Chris@109 1882 break;
Chris@109 1883
Chris@109 1884 case ACT_LOG:
Chris@284 1885 m_hgTabs->setNewLog(output);
Chris@284 1886 m_needNewLog = false;
Chris@120 1887 break;
Chris@120 1888
Chris@120 1889 case ACT_LOG_INCREMENTAL:
Chris@284 1890 m_hgTabs->addIncrementalLog(output);
Chris@109 1891 break;
Chris@109 1892
Chris@109 1893 case ACT_QUERY_PARENTS:
Chris@152 1894 {
Chris@284 1895 foreach (Changeset *cs, m_currentParents) delete cs;
Chris@284 1896 m_currentParents = Changeset::parseChangesets(output);
Chris@284 1897 QStringList parentIds = Changeset::getIds(m_currentParents);
Chris@284 1898 m_hgTabs->setCurrent(parentIds, m_currentBranch);
Chris@152 1899 }
Chris@109 1900 break;
Chris@109 1901
Chris@109 1902 case ACT_QUERY_HEADS:
Chris@150 1903 {
Chris@284 1904 oldHeadIds = Changeset::getIds(m_currentHeads);
Chris@150 1905 Changesets newHeads = Changeset::parseChangesets(output);
Chris@150 1906 QStringList newHeadIds = Changeset::getIds(newHeads);
Chris@150 1907 if (oldHeadIds != newHeadIds) {
Chris@150 1908 DEBUG << "Heads changed, will prompt an incremental log if appropriate" << endl;
Chris@150 1909 headsChanged = true;
Chris@284 1910 foreach (Changeset *cs, m_currentHeads) delete cs;
Chris@284 1911 m_currentHeads = newHeads;
Chris@150 1912 }
Chris@150 1913 }
Chris@109 1914 break;
Chris@130 1915
Chris@130 1916 case ACT_COMMIT:
Chris@284 1917 m_hgTabs->clearSelections();
Chris@284 1918 m_justMerged = false;
Chris@284 1919 m_shouldHgStat = true;
Chris@130 1920 break;
Chris@163 1921
Chris@163 1922 case ACT_REVERT:
Chris@284 1923 hgMarkResolved(m_lastRevertedFiles);
Chris@284 1924 m_justMerged = false;
Chris@163 1925 break;
Chris@109 1926
Chris@109 1927 case ACT_REMOVE:
Chris@109 1928 case ACT_ADD:
Chris@284 1929 m_hgTabs->clearSelections();
Chris@284 1930 m_shouldHgStat = true;
Chris@116 1931 break;
Chris@116 1932
Chris@164 1933 case ACT_TAG:
Chris@284 1934 m_needNewLog = true;
Chris@284 1935 m_shouldHgStat = true;
Chris@164 1936 break;
Chris@164 1937
Chris@288 1938 case ACT_UNCOMMITTED_SUMMARY:
Chris@168 1939 QMessageBox::information(this, tr("Change summary"),
Chris@168 1940 format3(tr("Summary of uncommitted changes"),
Chris@168 1941 "",
Chris@168 1942 output));
Chris@168 1943 break;
Chris@168 1944
Chris@288 1945 case ACT_DIFF_SUMMARY:
Chris@289 1946 {
Chris@289 1947 // Output has log info first, diff following after a blank line
Chris@289 1948 output.replace("\r\n", "\n");
Chris@289 1949 QStringList olist = output.split("\n\n", QString::SkipEmptyParts);
Chris@289 1950 if (olist.size() > 1) output = olist[1];
Chris@289 1951
Chris@289 1952 Changeset *cs = (Changeset *)completedAction.extraData;
Chris@289 1953 if (cs) {
Chris@289 1954 QMessageBox::information
Chris@289 1955 (this, tr("Change summary"),
Chris@289 1956 format3(tr("Summary of changes"),
Chris@289 1957 cs->formatHtml(),
Chris@289 1958 output));
Chris@289 1959 } else if (output == "") {
Chris@289 1960 // Can happen, for a merge commit (depending on parent)
Chris@288 1961 QMessageBox::information(this, tr("Change summary"),
Chris@288 1962 format3(tr("Summary of changes"),
Chris@288 1963 tr("No changes"),
Chris@288 1964 output));
Chris@288 1965 } else {
Chris@288 1966 QMessageBox::information(this, tr("Change summary"),
Chris@288 1967 format3(tr("Summary of changes"),
Chris@288 1968 "",
Chris@288 1969 output));
Chris@288 1970 }
Chris@288 1971 break;
Chris@289 1972 }
Chris@288 1973
Chris@109 1974 case ACT_FOLDERDIFF:
Chris@109 1975 case ACT_CHGSETDIFF:
Chris@109 1976 case ACT_SERVE:
Chris@109 1977 case ACT_HG_IGNORE:
Chris@284 1978 m_shouldHgStat = true;
Chris@109 1979 break;
Chris@109 1980
Chris@109 1981 case ACT_UPDATE:
Chris@162 1982 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output)));
Chris@284 1983 m_shouldHgStat = true;
Chris@109 1984 break;
Chris@109 1985
Chris@109 1986 case ACT_MERGE:
Chris@294 1987 MoreInformationDialog::information
Chris@294 1988 (this, tr("Merge"), tr("Merge successful"),
Chris@294 1989 tr("The merge succeeded. Remember to commit the result!"),
Chris@294 1990 output);
Chris@284 1991 m_shouldHgStat = true;
Chris@284 1992 m_justMerged = true;
Chris@109 1993 break;
Chris@109 1994
Chris@109 1995 case ACT_RETRY_MERGE:
Chris@163 1996 QMessageBox::information(this, tr("Resolved"),
Chris@163 1997 tr("<qt><h3>Merge resolved</h3><p>Merge resolved successfully.</p>"));
Chris@284 1998 m_shouldHgStat = true;
Chris@284 1999 m_justMerged = true;
Chris@109 2000 break;
Chris@109 2001
Chris@109 2002 default:
Chris@109 2003 break;
Chris@109 2004 }
Chris@108 2005
Chris@121 2006 // Sequence when no full log required:
Chris@163 2007 // paths -> branch -> stat -> resolve-list -> heads ->
Chris@150 2008 // incremental-log (only if heads changed) -> parents
Chris@150 2009 //
Chris@121 2010 // Sequence when full log required:
Chris@163 2011 // paths -> branch -> stat -> resolve-list -> heads -> parents -> log
Chris@150 2012 //
Chris@150 2013 // Note we want to call enableDisableActions only once, at the end
Chris@150 2014 // of whichever sequence is in use.
Chris@150 2015
Chris@156 2016 bool noMore = false;
Chris@156 2017
Chris@150 2018 switch (action) {
Chris@175 2019
Chris@175 2020 case ACT_TEST_HG:
Chris@248 2021 {
Chris@248 2022 QSettings settings;
Chris@248 2023 settings.beginGroup("General");
Chris@248 2024 if (settings.value("useextension", true).toBool()) {
Chris@248 2025 hgTestExtension();
Chris@284 2026 } else if (m_workFolderPath == "") {
Chris@248 2027 open();
Chris@248 2028 } else {
Chris@248 2029 hgQueryPaths();
Chris@248 2030 }
Chris@200 2031 break;
Chris@248 2032 }
Chris@200 2033
Chris@200 2034 case ACT_TEST_HG_EXT:
Chris@284 2035 if (m_workFolderPath == "") {
Chris@248 2036 open();
Chris@248 2037 } else{
Chris@248 2038 hgQueryPaths();
Chris@248 2039 }
Chris@175 2040 break;
Chris@150 2041
Chris@150 2042 case ACT_QUERY_PATHS:
Chris@109 2043 hgQueryBranch();
Chris@150 2044 break;
Chris@150 2045
Chris@150 2046 case ACT_QUERY_BRANCH:
Chris@109 2047 hgStat();
Chris@150 2048 break;
Chris@150 2049
Chris@150 2050 case ACT_STAT:
Chris@163 2051 hgResolveList();
Chris@163 2052 break;
Chris@163 2053
Chris@163 2054 case ACT_RESOLVE_LIST:
Chris@150 2055 hgQueryHeads();
Chris@150 2056 break;
Chris@150 2057
Chris@150 2058 case ACT_QUERY_HEADS:
Chris@284 2059 if (headsChanged && !m_needNewLog) {
Chris@150 2060 hgLogIncremental(oldHeadIds);
Chris@121 2061 } else {
Chris@150 2062 hgQueryParents();
Chris@121 2063 }
Chris@150 2064 break;
Chris@150 2065
Chris@150 2066 case ACT_LOG_INCREMENTAL:
Chris@109 2067 hgQueryParents();
Chris@150 2068 break;
Chris@150 2069
Chris@150 2070 case ACT_QUERY_PARENTS:
Chris@284 2071 if (m_needNewLog) {
Chris@120 2072 hgLog();
Chris@150 2073 } else {
Chris@150 2074 // we're done
Chris@156 2075 noMore = true;
Chris@120 2076 }
Chris@150 2077 break;
Chris@150 2078
Chris@150 2079 case ACT_LOG:
Chris@150 2080 // we're done
Chris@156 2081 noMore = true;
Chris@198 2082 break;
Chris@150 2083
Chris@150 2084 default:
Chris@284 2085 if (m_shouldHgStat) {
Chris@284 2086 m_shouldHgStat = false;
Chris@109 2087 hgQueryPaths();
Chris@150 2088 } else {
Chris@156 2089 noMore = true;
jtkorhonen@0 2090 }
Chris@150 2091 break;
Chris@150 2092 }
Chris@156 2093
Chris@156 2094 if (noMore) {
Chris@284 2095 m_stateUnknown = false;
Chris@156 2096 enableDisableActions();
Chris@284 2097 m_hgTabs->updateHistory();
Chris@156 2098 }
jtkorhonen@0 2099 }
jtkorhonen@0 2100
jtkorhonen@0 2101 void MainWindow::connectActions()
jtkorhonen@0 2102 {
Chris@284 2103 connect(m_exitAct, SIGNAL(triggered()), this, SLOT(close()));
Chris@284 2104 connect(m_aboutAct, SIGNAL(triggered()), this, SLOT(about()));
Chris@273 2105
Chris@284 2106 connect(m_hgRefreshAct, SIGNAL(triggered()), this, SLOT(hgRefresh()));
Chris@284 2107 connect(m_hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
Chris@284 2108 connect(m_hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
Chris@284 2109 connect(m_hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
Chris@284 2110 connect(m_hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
Chris@284 2111 connect(m_hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
Chris@284 2112 connect(m_hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
Chris@284 2113 connect(m_hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
Chris@284 2114 connect(m_hgIgnoreAct, SIGNAL(triggered()), this, SLOT(hgIgnore()));
Chris@273 2115
Chris@284 2116 connect(m_settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
Chris@284 2117 connect(m_openAct, SIGNAL(triggered()), this, SLOT(open()));
Chris@284 2118 connect(m_changeRemoteRepoAct, SIGNAL(triggered()), this, SLOT(changeRemoteRepo()));
Chris@273 2119
Chris@284 2120 connect(m_hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
Chris@284 2121 connect(m_hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
Chris@284 2122 connect(m_hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
Chris@273 2123
Chris@284 2124 connect(m_hgAnnotateAct, SIGNAL(triggered()), this, SLOT(hgAnnotate()));
Chris@284 2125 connect(m_hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
jtkorhonen@0 2126 }
Chris@141 2127
Chris@141 2128 void MainWindow::connectTabsSignals()
Chris@141 2129 {
Chris@284 2130 connect(m_hgTabs, SIGNAL(commit()),
Chris@141 2131 this, SLOT(hgCommit()));
Chris@141 2132
Chris@284 2133 connect(m_hgTabs, SIGNAL(revert()),
Chris@141 2134 this, SLOT(hgRevert()));
Chris@141 2135
Chris@284 2136 connect(m_hgTabs, SIGNAL(diffWorkingFolder()),
Chris@141 2137 this, SLOT(hgFolderDiff()));
Chris@168 2138
Chris@284 2139 connect(m_hgTabs, SIGNAL(showSummary()),
Chris@168 2140 this, SLOT(hgShowSummary()));
Chris@148 2141
Chris@284 2142 connect(m_hgTabs, SIGNAL(updateTo(QString)),
Chris@148 2143 this, SLOT(hgUpdateToRev(QString)));
Chris@141 2144
Chris@284 2145 connect(m_hgTabs, SIGNAL(diffToCurrent(QString)),
Chris@148 2146 this, SLOT(hgDiffToCurrent(QString)));
Chris@141 2147
Chris@284 2148 connect(m_hgTabs, SIGNAL(diffToParent(QString, QString)),
Chris@148 2149 this, SLOT(hgDiffToParent(QString, QString)));
Chris@141 2150
Chris@289 2151 connect(m_hgTabs, SIGNAL(showSummary(Changeset *)),
Chris@289 2152 this, SLOT(hgShowSummaryFor(Changeset *)));
Chris@288 2153
Chris@284 2154 connect(m_hgTabs, SIGNAL(mergeFrom(QString)),
Chris@148 2155 this, SLOT(hgMergeFrom(QString)));
Chris@164 2156
Chris@284 2157 connect(m_hgTabs, SIGNAL(tag(QString)),
Chris@148 2158 this, SLOT(hgTag(QString)));
Chris@141 2159 }
Chris@141 2160
jtkorhonen@0 2161 void MainWindow::enableDisableActions()
jtkorhonen@0 2162 {
Chris@90 2163 DEBUG << "MainWindow::enableDisableActions" << endl;
Chris@90 2164
Chris@284 2165 QString dirname = QDir(m_workFolderPath).dirName();
Chris@202 2166 if (dirname != "") {
Chris@202 2167 setWindowTitle(tr("EasyMercurial: %1").arg(dirname));
Chris@202 2168 } else {
Chris@202 2169 setWindowTitle(tr("EasyMercurial"));
Chris@202 2170 }
Chris@202 2171
Chris@115 2172 //!!! should also do things like set the status texts for the
Chris@115 2173 //!!! actions appropriately by context
Chris@115 2174
jtkorhonen@0 2175 QDir localRepoDir;
jtkorhonen@0 2176 QDir workFolderDir;
Chris@145 2177 bool workFolderExist = true;
Chris@145 2178 bool localRepoExist = true;
jtkorhonen@0 2179
Chris@284 2180 m_remoteRepoActionsEnabled = true;
Chris@284 2181 if (m_remoteRepoPath.isEmpty()) {
Chris@284 2182 m_remoteRepoActionsEnabled = false;
jtkorhonen@0 2183 }
jtkorhonen@0 2184
Chris@284 2185 m_localRepoActionsEnabled = true;
Chris@284 2186 if (m_workFolderPath.isEmpty()) {
Chris@284 2187 m_localRepoActionsEnabled = false;
jtkorhonen@0 2188 workFolderExist = false;
jtkorhonen@0 2189 }
jtkorhonen@0 2190
Chris@284 2191 if (m_workFolderPath == "" || !workFolderDir.exists(m_workFolderPath)) {
Chris@284 2192 m_localRepoActionsEnabled = false;
jtkorhonen@0 2193 workFolderExist = false;
Chris@90 2194 } else {
jtkorhonen@0 2195 workFolderExist = true;
jtkorhonen@0 2196 }
jtkorhonen@0 2197
Chris@284 2198 if (!localRepoDir.exists(m_workFolderPath + "/.hg")) {
Chris@284 2199 m_localRepoActionsEnabled = false;
jtkorhonen@0 2200 localRepoExist = false;
jtkorhonen@0 2201 }
jtkorhonen@0 2202
Chris@284 2203 m_hgIncomingAct -> setEnabled(m_remoteRepoActionsEnabled && m_remoteRepoActionsEnabled);
Chris@284 2204 m_hgPullAct -> setEnabled(m_remoteRepoActionsEnabled && m_remoteRepoActionsEnabled);
Chris@284 2205 m_hgPushAct -> setEnabled(m_remoteRepoActionsEnabled && m_remoteRepoActionsEnabled);
Chris@169 2206
Chris@179 2207 bool haveDiff = false;
Chris@179 2208 QSettings settings;
Chris@179 2209 settings.beginGroup("Locations");
Chris@179 2210 if (settings.value("extdiffbinary", "").toString() != "") {
Chris@179 2211 haveDiff = true;
Chris@179 2212 }
Chris@179 2213 settings.endGroup();
Chris@112 2214
Chris@284 2215 m_hgRefreshAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2216 m_hgFolderDiffAct -> setEnabled(m_localRepoActionsEnabled && haveDiff);
Chris@284 2217 m_hgRevertAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2218 m_hgAddAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2219 m_hgRemoveAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2220 m_hgUpdateAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2221 m_hgCommitAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2222 m_hgMergeAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2223 m_hgAnnotateAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2224 m_hgServeAct -> setEnabled(m_localRepoActionsEnabled);
Chris@284 2225 m_hgIgnoreAct -> setEnabled(m_localRepoActionsEnabled);
Chris@273 2226
Chris@284 2227 DEBUG << "m_localRepoActionsEnabled = " << m_localRepoActionsEnabled << endl;
Chris@284 2228 DEBUG << "canCommit = " << m_hgTabs->canCommit() << endl;
Chris@273 2229
Chris@284 2230 m_hgAddAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canAdd());
Chris@284 2231 m_hgRemoveAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canRemove());
Chris@284 2232 m_hgCommitAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canCommit());
Chris@284 2233 m_hgRevertAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canRevert());
Chris@284 2234 m_hgFolderDiffAct->setEnabled(m_localRepoActionsEnabled && m_hgTabs->canDiff());
Chris@90 2235
Chris@108 2236 // A default merge makes sense if:
Chris@108 2237 // * there is only one parent (if there are two, we have an uncommitted merge) and
Chris@108 2238 // * there are exactly two heads that have the same branch as the current branch and
Chris@108 2239 // * our parent is one of those heads
Chris@108 2240 //
Chris@108 2241 // A default update makes sense if:
Chris@108 2242 // * there is only one parent and
Chris@108 2243 // * the parent is not one of the current heads
Chris@156 2244
Chris@108 2245 bool canMerge = false;
Chris@108 2246 bool canUpdate = false;
Chris@156 2247 bool haveMerge = false;
Chris@162 2248 bool emptyRepo = false;
Chris@225 2249 bool noWorkingCopy = false;
Chris@235 2250 bool newBranch = false;
Chris@284 2251 int m_currentBranchHeads = 0;
Chris@273 2252
Chris@284 2253 if (m_currentParents.size() == 1) {
Chris@156 2254 bool parentIsHead = false;
Chris@284 2255 Changeset *parent = m_currentParents[0];
Chris@284 2256 foreach (Changeset *head, m_currentHeads) {
Chris@284 2257 DEBUG << "head branch " << head->branch() << ", current branch " << m_currentBranch << endl;
Chris@284 2258 if (head->isOnBranch(m_currentBranch)) {
Chris@284 2259 ++m_currentBranchHeads;
Chris@235 2260 }
Chris@235 2261 if (parent->id() == head->id()) {
Chris@235 2262 parentIsHead = true;
Chris@108 2263 }
Chris@108 2264 }
Chris@284 2265 if (m_currentBranchHeads == 2 && parentIsHead) {
Chris@108 2266 canMerge = true;
Chris@108 2267 }
Chris@284 2268 if (m_currentBranchHeads == 0 && parentIsHead) {
Chris@235 2269 // Just created a new branch
Chris@235 2270 newBranch = true;
Chris@235 2271 }
Chris@108 2272 if (!parentIsHead) {
Chris@108 2273 canUpdate = true;
Chris@108 2274 DEBUG << "parent id = " << parent->id() << endl;
Chris@108 2275 DEBUG << " head ids "<<endl;
Chris@284 2276 foreach (Changeset *h, m_currentHeads) {
Chris@108 2277 DEBUG << "head id = " << h->id() << endl;
Chris@108 2278 }
Chris@108 2279 }
Chris@284 2280 m_justMerged = false;
Chris@284 2281 } else if (m_currentParents.size() == 0) {
Chris@284 2282 if (m_currentHeads.size() == 0) {
Chris@225 2283 // No heads -> empty repo
Chris@225 2284 emptyRepo = true;
Chris@225 2285 } else {
Chris@225 2286 // Heads, but no parents -> no working copy, e.g. we have
Chris@225 2287 // just converted this repo but haven't updated in it yet.
Chris@225 2288 // Uncommon but confusing; probably merits a special case
Chris@225 2289 noWorkingCopy = true;
Chris@225 2290 canUpdate = true;
Chris@225 2291 }
Chris@284 2292 m_justMerged = false;
Chris@156 2293 } else {
Chris@156 2294 haveMerge = true;
Chris@284 2295 m_justMerged = true;
Chris@108 2296 }
Chris@156 2297
Chris@284 2298 m_hgMergeAct->setEnabled(m_localRepoActionsEnabled &&
Chris@284 2299 (canMerge || m_hgTabs->canResolve()));
Chris@284 2300 m_hgUpdateAct->setEnabled(m_localRepoActionsEnabled &&
Chris@284 2301 (canUpdate && !m_hgTabs->haveChangesToCommit()));
Chris@115 2302
Chris@115 2303 // Set the state field on the file status widget
Chris@115 2304
Chris@115 2305 QString branchText;
Chris@284 2306 if (m_currentBranch == "" || m_currentBranch == "default") {
Chris@115 2307 branchText = tr("the default branch");
Chris@115 2308 } else {
Chris@284 2309 branchText = tr("branch \"%1\"").arg(m_currentBranch);
Chris@115 2310 }
Chris@156 2311
Chris@284 2312 if (m_stateUnknown) {
Chris@284 2313 if (m_workFolderPath == "") {
Chris@284 2314 m_hgTabs->setState(tr("No repository open"));
Chris@248 2315 } else {
Chris@284 2316 m_hgTabs->setState(tr("(Examining repository)"));
Chris@248 2317 }
Chris@173 2318 } else if (emptyRepo) {
Chris@284 2319 m_hgTabs->setState(tr("Nothing committed to this repository yet"));
Chris@225 2320 } else if (noWorkingCopy) {
Chris@284 2321 m_hgTabs->setState(tr("No working copy yet: consider updating"));
Chris@162 2322 } else if (canMerge) {
Chris@284 2323 m_hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
Chris@284 2324 } else if (!m_hgTabs->getAllUnresolvedFiles().empty()) {
Chris@284 2325 m_hgTabs->setState(tr("Have unresolved files following merge on %1").arg(branchText));
Chris@156 2326 } else if (haveMerge) {
Chris@284 2327 m_hgTabs->setState(tr("Have merged but not yet committed on %1").arg(branchText));
Chris@235 2328 } else if (newBranch) {
Chris@284 2329 m_hgTabs->setState(tr("On %1. New branch: has not yet been committed").arg(branchText));
Chris@156 2330 } else if (canUpdate) {
Chris@284 2331 if (m_hgTabs->haveChangesToCommit()) {
Chris@163 2332 // have uncommitted changes
Chris@284 2333 m_hgTabs->setState(tr("On %1. Not at the head of the branch").arg(branchText));
Chris@163 2334 } else {
Chris@163 2335 // no uncommitted changes
Chris@284 2336 m_hgTabs->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));
Chris@163 2337 }
Chris@284 2338 } else if (m_currentBranchHeads > 1) {
Chris@284 2339 m_hgTabs->setState(tr("At one of %n heads of %1", "", m_currentBranchHeads).arg(branchText));
Chris@115 2340 } else {
Chris@284 2341 m_hgTabs->setState(tr("At the head of %1").arg(branchText));
Chris@115 2342 }
jtkorhonen@0 2343 }
jtkorhonen@0 2344
jtkorhonen@0 2345 void MainWindow::createActions()
jtkorhonen@0 2346 {
jtkorhonen@0 2347 //File actions
Chris@284 2348 m_openAct = new QAction(QIcon(":/images/fileopen.png"), tr("Open..."), this);
Chris@284 2349 m_openAct -> setStatusTip(tr("Open an existing repository or working folder"));
Chris@273 2350
Chris@284 2351 m_changeRemoteRepoAct = new QAction(tr("Change Remote Location..."), this);
Chris@284 2352 m_changeRemoteRepoAct->setStatusTip(tr("Change the default remote repository for pull and push actions"));
Chris@273 2353
Chris@284 2354 m_settingsAct = new QAction(QIcon(":/images/settings.png"), tr("Settings..."), this);
Chris@284 2355 m_settingsAct -> setStatusTip(tr("View and change application settings"));
Chris@273 2356
Chris@284 2357 m_exitAct = new QAction(QIcon(":/images/exit.png"), tr("Quit"), this);
Chris@284 2358 m_exitAct->setShortcuts(QKeySequence::Quit);
Chris@284 2359 m_exitAct->setStatusTip(tr("Quit EasyMercurial"));
jtkorhonen@0 2360
jtkorhonen@0 2361 //Repository actions
Chris@284 2362 m_hgRefreshAct = new QAction(QIcon(":/images/status.png"), tr("Refresh"), this);
Chris@284 2363 m_hgRefreshAct->setStatusTip(tr("Refresh the window to show the current state of the working folder"));
Chris@273 2364
Chris@284 2365 m_hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("Preview"), this);
Chris@284 2366 m_hgIncomingAct -> setStatusTip(tr("See what changes are available in the remote repository waiting to be pulled"));
Chris@273 2367
Chris@284 2368 m_hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull"), this);
Chris@284 2369 m_hgPullAct -> setStatusTip(tr("Pull changes from the remote repository to the local repository"));
Chris@273 2370
Chris@284 2371 m_hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push"), this);
Chris@284 2372 m_hgPushAct->setStatusTip(tr("Push changes from the local repository to the remote repository"));
jtkorhonen@0 2373
jtkorhonen@0 2374 //Workfolder actions
Chris@284 2375 m_hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("Diff"), this);
Chris@284 2376 m_hgFolderDiffAct->setStatusTip(tr("See what has changed in the working folder compared with the last committed state"));
Chris@273 2377
Chris@284 2378 m_hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Revert"), this);
Chris@284 2379 m_hgRevertAct->setStatusTip(tr("Throw away your changes and return to the last committed state"));
Chris@273 2380
Chris@284 2381 m_hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add"), this);
Chris@284 2382 m_hgAddAct -> setStatusTip(tr("Mark the selected file(s) to be added on the next commit"));
jtkorhonen@0 2383
Chris@169 2384 //!!! needs to be modified for number
Chris@284 2385 m_hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove"), this);
Chris@284 2386 m_hgRemoveAct -> setStatusTip(tr("Mark the selected file(s) to be removed from version control on the next commit"));
Chris@273 2387
Chris@284 2388 m_hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update"), this);
Chris@284 2389 m_hgUpdateAct->setStatusTip(tr("Update the working folder to the head of the current repository branch"));
jtkorhonen@0 2390
Chris@169 2391 //!!! needs to be modified when files selected
Chris@284 2392 m_hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit"), this);
Chris@284 2393 m_hgCommitAct->setStatusTip(tr("Commit your changes to the local repository"));
Chris@273 2394
Chris@284 2395 m_hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
Chris@284 2396 m_hgMergeAct->setStatusTip(tr("Merge the two independent sets of changes in the local repository into the working folder"));
jtkorhonen@0 2397
jtkorhonen@0 2398 //Advanced actions
Chris@169 2399 //!!! needs to be modified for number
Chris@284 2400 m_hgAnnotateAct = new QAction(tr("Annotate"), this);
Chris@284 2401 m_hgAnnotateAct -> setStatusTip(tr("Show line-by-line version information for selected file"));
Chris@273 2402
Chris@284 2403 m_hgIgnoreAct = new QAction(tr("Edit .hgignore File"), this);
Chris@284 2404 m_hgIgnoreAct -> setStatusTip(tr("Edit the .hgignore file, containing the names of files that should be ignored by Mercurial"));
Chris@273 2405
Chris@284 2406 m_hgServeAct = new QAction(tr("Serve via HTTP"), this);
Chris@284 2407 m_hgServeAct -> setStatusTip(tr("Serve local repository via http for workgroup access"));
jtkorhonen@11 2408
jtkorhonen@0 2409 //Help actions
Chris@284 2410 m_aboutAct = new QAction(tr("About EasyMercurial"), this);
Chris@94 2411
Chris@94 2412 // Miscellaneous
Chris@199 2413 QShortcut *clearSelectionsShortcut = new QShortcut(Qt::Key_Escape, this);
Chris@199 2414 connect(clearSelectionsShortcut, SIGNAL(activated()),
Chris@199 2415 this, SLOT(clearSelections()));
jtkorhonen@0 2416 }
jtkorhonen@0 2417
jtkorhonen@0 2418 void MainWindow::createMenus()
jtkorhonen@0 2419 {
Chris@284 2420 m_fileMenu = menuBar()->addMenu(tr("File"));
Chris@273 2421
Chris@284 2422 m_fileMenu -> addAction(m_openAct);
Chris@284 2423 m_fileMenu -> addAction(m_changeRemoteRepoAct);
Chris@284 2424 m_fileMenu -> addSeparator();
Chris@273 2425
Chris@284 2426 m_advancedMenu = m_fileMenu->addMenu(tr("Advanced"));
Chris@273 2427
Chris@284 2428 m_fileMenu -> addAction(m_settingsAct);
Chris@273 2429
Chris@284 2430 m_fileMenu -> addSeparator();
Chris@284 2431 m_fileMenu -> addAction(m_exitAct);
Chris@273 2432
Chris@284 2433 m_advancedMenu -> addAction(m_hgIgnoreAct);
Chris@284 2434 m_advancedMenu -> addSeparator();
Chris@284 2435 m_advancedMenu -> addAction(m_hgServeAct);
Chris@273 2436
Chris@284 2437 m_helpMenu = menuBar()->addMenu(tr("Help"));
Chris@284 2438 m_helpMenu->addAction(m_aboutAct);
jtkorhonen@0 2439 }
jtkorhonen@0 2440
jtkorhonen@0 2441 void MainWindow::createToolBars()
jtkorhonen@0 2442 {
Chris@284 2443 m_fileToolBar = addToolBar(tr("File"));
Chris@284 2444 m_fileToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
Chris@284 2445 m_fileToolBar -> addAction(m_openAct);
Chris@284 2446 m_fileToolBar -> addAction(m_hgRefreshAct);
Chris@284 2447 m_fileToolBar -> addSeparator();
Chris@284 2448 m_fileToolBar -> setMovable(false);
Chris@273 2449
Chris@284 2450 m_repoToolBar = addToolBar(tr(REPOMENU_TITLE));
Chris@284 2451 m_repoToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
Chris@284 2452 m_repoToolBar->addAction(m_hgIncomingAct);
Chris@284 2453 m_repoToolBar->addAction(m_hgPullAct);
Chris@284 2454 m_repoToolBar->addAction(m_hgPushAct);
Chris@284 2455 m_repoToolBar -> setMovable(false);
Chris@273 2456
Chris@284 2457 m_workFolderToolBar = addToolBar(tr(WORKFOLDERMENU_TITLE));
Chris@284 2458 addToolBar(Qt::LeftToolBarArea, m_workFolderToolBar);
Chris@284 2459 m_workFolderToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
Chris@284 2460 m_workFolderToolBar->addAction(m_hgFolderDiffAct);
Chris@284 2461 m_workFolderToolBar->addSeparator();
Chris@284 2462 m_workFolderToolBar->addAction(m_hgRevertAct);
Chris@284 2463 m_workFolderToolBar->addAction(m_hgUpdateAct);
Chris@284 2464 m_workFolderToolBar->addAction(m_hgCommitAct);
Chris@284 2465 m_workFolderToolBar->addAction(m_hgMergeAct);
Chris@284 2466 m_workFolderToolBar->addSeparator();
Chris@284 2467 m_workFolderToolBar->addAction(m_hgAddAct);
Chris@284 2468 m_workFolderToolBar->addAction(m_hgRemoveAct);
Chris@284 2469 m_workFolderToolBar -> setMovable(false);
Chris@61 2470
Chris@230 2471 updateToolBarStyle();
jtkorhonen@0 2472 }
jtkorhonen@0 2473
Chris@230 2474 void MainWindow::updateToolBarStyle()
Chris@230 2475 {
Chris@230 2476 QSettings settings;
Chris@230 2477 settings.beginGroup("Presentation");
Chris@230 2478 bool showText = settings.value("showiconlabels", true).toBool();
Chris@230 2479 settings.endGroup();
Chris@230 2480
Chris@230 2481 foreach (QToolButton *tb, findChildren<QToolButton *>()) {
Chris@230 2482 tb->setToolButtonStyle(showText ?
Chris@230 2483 Qt::ToolButtonTextUnderIcon :
Chris@230 2484 Qt::ToolButtonIconOnly);
Chris@230 2485 }
Chris@230 2486 }
jtkorhonen@0 2487
jtkorhonen@0 2488 void MainWindow::createStatusBar()
jtkorhonen@0 2489 {
jtkorhonen@0 2490 statusBar()->showMessage(tr("Ready"));
jtkorhonen@0 2491 }
jtkorhonen@0 2492
Chris@69 2493
Chris@69 2494 //!!! review these:
Chris@69 2495
jtkorhonen@0 2496 void MainWindow::readSettings()
jtkorhonen@0 2497 {
jtkorhonen@0 2498 QDir workFolder;
jtkorhonen@0 2499
Chris@61 2500 QSettings settings;
jtkorhonen@0 2501
Chris@284 2502 m_remoteRepoPath = settings.value("remoterepopath", "").toString();
Chris@284 2503 m_workFolderPath = settings.value("workfolderpath", "").toString();
Chris@284 2504 if (!workFolder.exists(m_workFolderPath))
jtkorhonen@0 2505 {
Chris@284 2506 m_workFolderPath = "";
jtkorhonen@0 2507 }
jtkorhonen@0 2508
jtkorhonen@0 2509 QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
jtkorhonen@0 2510 QSize size = settings.value("size", QSize(400, 400)).toSize();
Chris@284 2511 m_firstStart = settings.value("firststart", QVariant(true)).toBool();
jtkorhonen@0 2512
Chris@109 2513 //!!! initialFileTypesBits = (unsigned char) settings.value("viewFileTypes", QVariant(DEFAULT_HG_STAT_BITS)).toInt();
jtkorhonen@0 2514 resize(size);
jtkorhonen@0 2515 move(pos);
jtkorhonen@0 2516 }
jtkorhonen@0 2517
jtkorhonen@17 2518
jtkorhonen@0 2519 void MainWindow::writeSettings()
jtkorhonen@0 2520 {
Chris@61 2521 QSettings settings;
jtkorhonen@0 2522 settings.setValue("pos", pos());
jtkorhonen@0 2523 settings.setValue("size", size());
Chris@284 2524 settings.setValue("remoterepopath", m_remoteRepoPath);
Chris@284 2525 settings.setValue("workfolderpath", m_workFolderPath);
Chris@284 2526 settings.setValue("firststart", m_firstStart);
Chris@284 2527 //!!!settings.setValue("viewFileTypes", m_hgTabs -> getFileTypesBits());
jtkorhonen@0 2528 }
jtkorhonen@0 2529
jtkorhonen@0 2530
jtkorhonen@0 2531
jtkorhonen@0 2532