diff options
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 6 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialjobrunner.cpp | 4 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 9d4bd97c5d4..ccf88a3e2c6 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -187,7 +187,8 @@ static inline QString msgParentRevisionFailed(const QString &workingDirectory, const QString &revision, const QString &why) { - return MercurialClient::tr("Unable to find parent revisions of %1 in %2: %3").arg(revision, workingDirectory, why); + return MercurialClient::tr("Unable to find parent revisions of %1 in %2: %3"). + arg(revision, QDir::toNativeSeparators(workingDirectory), why); } static inline QString msgParseParentsOutputFailed(const QString &output) @@ -526,7 +527,8 @@ void MercurialClient::outgoing(const QString &repositoryRoot) args << QLatin1String("outgoing") << QLatin1String("-g") << QLatin1String("-p"); const QString kind = QLatin1String(Constants::DIFFLOG); - const QString title = tr("Hg outgoing %1").arg(repositoryRoot); + const QString title = tr("Hg outgoing %1"). + arg(QDir::toNativeSeparators(repositoryRoot)); VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, repositoryRoot, true, "outgoing", repositoryRoot); diff --git a/src/plugins/mercurial/mercurialjobrunner.cpp b/src/plugins/mercurial/mercurialjobrunner.cpp index 696b2997876..a367037c993 100644 --- a/src/plugins/mercurial/mercurialjobrunner.cpp +++ b/src/plugins/mercurial/mercurialjobrunner.cpp @@ -41,6 +41,7 @@ #include <QtCore/QProcessEnvironment> #include <QtCore/QString> #include <QtCore/QDebug> +#include <QtCore/QDir> using namespace Mercurial::Internal; using namespace Mercurial; @@ -151,7 +152,8 @@ void MercurialJobRunner::run() QString MercurialJobRunner::msgStartFailed(const QString &binary, const QString &why) { - return tr("Unable to start mercurial process '%1': %2").arg(binary, why); + return tr("Unable to start mercurial process '%1': %2"). + arg(QDir::toNativeSeparators(binary), why); } QString MercurialJobRunner::msgTimeout(int timeoutSeconds) diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 12affb01f0c..3a0a4372e0b 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -602,7 +602,8 @@ void MercurialPlugin::showCommitWidget(const QList<QPair<QString, QString> > &st return; } - const QString msg = tr("Commit changes for \"%1\".").arg(m_submitRepository); + const QString msg = tr("Commit changes for \"%1\"."). + arg(QDir::toNativeSeparators(m_submitRepository)); commitEditor->setDisplayName(msg); QString branch = m_client->branchQuerySync(m_submitRepository); |