You do have some uncommitted changes. If you wish to push those to the remote repository, commit them locally first.").arg(report);
+ }
} else {
- report = tr("Push complete");
+ head = tr("Push complete");
}
- report = format3(report, tr("The push command output was:"), output);
m_runner->hide();
- QMessageBox::information(this, "Push complete", report);
+
+ MoreInformationDialog::information(this, tr("Push complete"),
+ head, report, output);
}
void MainWindow::showPullResult(QString output)
{
+ QString head;
QString report;
int n = extractChangeCount(output);
if (n > 0) {
- report = tr("Pulled %n changeset(s)", "", n);
+ head = tr("Pulled %n changeset(s)", "", n);
+ report = tr("New changes will be highlighted in the history. Update to bring these changes into your working copy.");
} else if (n == 0) {
- report = tr("No changes to pull");
+ head = tr("No changes to pull");
+ report = tr("Your local repository already contains all changes found in the remote repository.");
} else {
- report = tr("Pull complete");
+ head = tr("Pull complete");
}
- report = format3(report, tr("The pull command output was:"), output);
m_runner->hide();
- //!!! and something about updating
-
- QMessageBox::information(this, "Pull complete", report);
+ runner->hide();
+
+ MoreInformationDialog::information(this, tr("Pull complete"),
+ head, report, output);
}
void MainWindow::reportNewRemoteHeads(QString output)
@@ -1640,17 +1655,19 @@
}
if (headsAreLocal) {
- QMessageBox::warning
- (this, tr("Push failed"),
- format3(tr("Push failed"),
- tr("Your local repository could not be pushed to the remote repository. The following command failed:
You may need to merge the changes locally first.
The output of the push command was:"),
- output));
+ MoreInformationDialog::warning
+ (this,
+ tr("Push failed"),
+ tr("Push failed"),
+ tr("Your local repository could not be pushed to the remote repository.
You may need to merge the changes locally first."),
+ output);
} else {
- QMessageBox::warning
- (this, tr("Push failed"),
- format3(tr("Push failed"),
- tr("Your local repository could not be pushed to the remote repository.
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.
The output of the push command was:"),
- output));
+ MoreInformationDialog::warning
+ (this,
+ tr("Push failed"),
+ tr("Push failed"),
+ tr("Your local repository could not be pushed to the remote repository.
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."),
+ output);
}
}
@@ -1686,19 +1703,21 @@
// uh huh
return;
case ACT_TEST_HG:
- QMessageBox::warning
- (this, tr("Failed to run Mercurial"),
- format3(tr("Failed to run Mercurial"),
- tr("The Mercurial program either could not be found or failed to run.
Check that the Mercurial program path is correct in %1.
%2").arg(setstr).arg(output == "" ? QString("") : tr("The test command said:")),
- output));
+ MoreInformationDialog::warning
+ (this,
+ tr("Failed to run Mercurial"),
+ tr("Failed to run Mercurial"),
+ tr("The Mercurial program either could not be found or failed to run.
Check that the Mercurial program path is correct in %1.").arg(setstr),
+ output);
settings();
return;
case ACT_TEST_HG_EXT:
QMessageBox::warning
- (this, tr("Failed to run Mercurial"),
- format3(tr("Failed to run Mercurial with extension enabled"),
- tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.
This may indicate an installation problem with EasyMercurial.
You may be able to continue working if you switch off “Use EasyHg Mercurial Extension” in %1. Note that remote repositories that require authentication may not work if you do this.
%2").arg(setstr).arg(output == "" ? QString("") : tr("The test command said:")),
- output));
+ (this,
+ tr("Failed to run Mercurial"),
+ tr("Failed to run Mercurial with extension enabled"),
+ tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.
This may indicate an installation problem with EasyMercurial.
You may be able to continue working if you switch off “Use EasyHg Mercurial Extension” in %1. Note that remote repositories that require authentication may not work if you do this.").arg(setstr),
+ output);
settings();
return;
case ACT_CLONEFROMREMOTE:
@@ -1744,6 +1763,8 @@
command += " " + arg;
}
+ //!!!
+
QString message = tr("Command failed
"
"%1"
@@ -1852,7 +1873,12 @@
MultiChoiceDialog::addRecentArgument("local", m_workFolderPath);
MultiChoiceDialog::addRecentArgument("remote", m_remoteRepoPath);
MultiChoiceDialog::addRecentArgument("remote", m_workFolderPath, true);
- QMessageBox::information(this, tr("Clone"), tr("Clone successful
%1
").arg(xmlEncode(output)));
+ MoreInformationDialog::information
+ (this,
+ tr("Clone"),
+ tr("Clone successful"),
+ tr("The remote repository %1
was successfully cloned to the local folder %2
.").arg(remoteRepoPath).arg(workFolderPath),
+ output);
enableDisableActions();
m_shouldHgStat = true;
break;
diff -r a1c8630a0057 -r 7b4f42cfc596 mainwindow.h
--- a/mainwindow.h Mon Feb 21 18:16:15 2011 +0000
+++ b/mainwindow.h Mon Feb 21 18:17:18 2011 +0000
@@ -142,6 +142,7 @@
void showPullResult(QString);
void showPushResult(QString);
int extractChangeCount(QString);
+ QString format1(QString);
QString format3(QString, QString, QString);
void clearState();
diff -r a1c8630a0057 -r 7b4f42cfc596 moreinformationdialog.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/moreinformationdialog.cpp Mon Feb 21 18:17:18 2011 +0000
@@ -0,0 +1,140 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ EasyMercurial
+
+ Based on hgExplorer by Jari Korhonen
+ Copyright (c) 2010 Jari Korhonen
+ Copyright (c) 2011 Chris Cannam
+ Copyright (c) 2011 Queen Mary, University of London
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version. See the file
+ COPYING included with this distribution for more information.
+*/
+
+#include "moreinformationdialog.h"
+
+#include %1