aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-06-15 11:41:43 +0200
committercon <qtc-committer@nokia.com>2010-06-16 12:50:25 +0200
commit52709fed0445d0fb14488fa207cb973c29d27680 (patch)
tree2b47dc97cd7de97eb0e9fbc776bcb64a51e280c9
parent7900d97d3abcfb1a2ffd25eb5cc1ee0035da97a2 (diff)
VCS[Mercurial]: Remove LANG=C setting
as it breaks the log output. Task-number: QTCREATORBUG-1623 (cherry picked from commit b8c78764e2d905da4adab7b1c6ad18aa1b77dbe3)
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp2
-rw-r--r--src/plugins/mercurial/mercurialjobrunner.cpp13
-rw-r--r--src/plugins/mercurial/mercurialjobrunner.h3
3 files changed, 0 insertions, 18 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index caf4f0bfc0..37d5382a2e 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -121,8 +121,6 @@ bool MercurialClient::executeHgSynchronously(const QString &workingDir,
QProcess hgProcess;
if (!workingDir.isEmpty())
hgProcess.setWorkingDirectory(workingDir);
- MercurialJobRunner::setProcessEnvironment(hgProcess);
-
const MercurialSettings &settings = MercurialPlugin::instance()->settings();
const QString binary = settings.binary();
const QStringList arguments = settings.standardArguments() + args;
diff --git a/src/plugins/mercurial/mercurialjobrunner.cpp b/src/plugins/mercurial/mercurialjobrunner.cpp
index 54f343c122..e92e73c5e7 100644
--- a/src/plugins/mercurial/mercurialjobrunner.cpp
+++ b/src/plugins/mercurial/mercurialjobrunner.cpp
@@ -162,16 +162,6 @@ QString MercurialJobRunner::msgTimeout(int timeoutSeconds)
return tr("Timed out after %1s waiting for mercurial process to finish.").arg(timeoutSeconds);
}
-// Set environment for a hg process to run in locale "C". Note that there appears
-// to be a bug in hg that causes special characters to be garbled when running
-// in a different language, which seems to be independent from the encoding.
-void MercurialJobRunner::setProcessEnvironment(QProcess &p)
-{
- QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- env.insert(QLatin1String("LANG"), QString(QLatin1Char('C')));
- p.setProcessEnvironment(env);
-}
-
void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
{
HgTask *taskData = job.data();
@@ -203,9 +193,6 @@ void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
qDebug() << Q_FUNC_INFO << "Repository root is " << taskData->repositoryRoot();
QProcess hgProcess;
- hgProcess.setWorkingDirectory(taskData->repositoryRoot());
- MercurialJobRunner::setProcessEnvironment(hgProcess);
-
hgProcess.start(binary, args);
if (!hgProcess.waitForStarted()) {
diff --git a/src/plugins/mercurial/mercurialjobrunner.h b/src/plugins/mercurial/mercurialjobrunner.h
index df6f1f79d6..ef9c7856c8 100644
--- a/src/plugins/mercurial/mercurialjobrunner.h
+++ b/src/plugins/mercurial/mercurialjobrunner.h
@@ -99,9 +99,6 @@ public:
static QString msgStartFailed(const QString &binary, const QString &why);
static QString msgTimeout(int timeoutSeconds);
- // Set environment for a hg process to run in locale "C"
- static void setProcessEnvironment(QProcess &p);
-
protected:
void run();