feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS[Mercurial]: Remove LANG=C setting

Browse Source 
as it breaks the log output.
Task-number: QTCREATORBUG-1623
(cherry picked from commit b8c78764e2)
This commit is contained in:
Friedemann Kleint
2010-06-15 11:41:43 +02:00
committed by con
parent 7900d97d3a
commit 52709fed04
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -121,8 +121,6 @@ bool MercurialClient::executeHgSynchronously(const QString &workingDir,
QProcess hgProcess; QProcess hgProcess;
if (!workingDir.isEmpty()) if (!workingDir.isEmpty())
hgProcess.setWorkingDirectory(workingDir); hgProcess.setWorkingDirectory(workingDir);
MercurialJobRunner::setProcessEnvironment(hgProcess);
const MercurialSettings &settings = MercurialPlugin::instance()->settings(); const MercurialSettings &settings = MercurialPlugin::instance()->settings();
const QString binary = settings.binary(); const QString binary = settings.binary();
const QStringList arguments = settings.standardArguments() + args; const QStringList arguments = settings.standardArguments() + args;

13
src/plugins/mercurial/mercurialjobrunner.cpp
View File

@@ -162,16 +162,6 @@ QString MercurialJobRunner::msgTimeout(int timeoutSeconds)
return tr("Timed out after %1s waiting for mercurial process to finish.").arg(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) void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
{ {
HgTask *taskData = job.data(); HgTask *taskData = job.data();
@@ -203,9 +193,6 @@ void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
qDebug() << Q_FUNC_INFO << "Repository root is " << taskData->repositoryRoot(); qDebug() << Q_FUNC_INFO << "Repository root is " << taskData->repositoryRoot();
QProcess hgProcess; QProcess hgProcess;
hgProcess.setWorkingDirectory(taskData->repositoryRoot());
MercurialJobRunner::setProcessEnvironment(hgProcess);
hgProcess.start(binary, args); hgProcess.start(binary, args);
if (!hgProcess.waitForStarted()) { if (!hgProcess.waitForStarted()) {

3
src/plugins/mercurial/mercurialjobrunner.h
View File

@@ -99,9 +99,6 @@ public:
static QString msgStartFailed(const QString &binary, const QString &why); static QString msgStartFailed(const QString &binary, const QString &why);
static QString msgTimeout(int timeoutSeconds); static QString msgTimeout(int timeoutSeconds);
// Set environment for a hg process to run in locale "C"
static void setProcessEnvironment(QProcess &p);
protected: protected:
void run(); void run();