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

VCS: Do not force LANG=C on all commands.

Browse Source 
Introduce extra flag.

Task-number: QTCREATORBUG-1623
This commit is contained in:
Friedemann Kleint
2010-06-15 12:17:09 +02:00
parent ff7c543a73
commit 59592c820c
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -1085,7 +1085,7 @@ QProcessEnvironment GitClient::processEnvironment() const
if (m_settings.adoptPath) if (m_settings.adoptPath)
environment.insert(QLatin1String("PATH"), m_settings.path); environment.insert(QLatin1String("PATH"), m_settings.path);
// Set up SSH and C locale (required by git using perl). // Set up SSH and C locale (required by git using perl).
VCSBase::VCSBasePlugin::setProcessEnvironment(&environment); VCSBase::VCSBasePlugin::setProcessEnvironment(&environment, false);
return environment; return environment;
} }

2
src/plugins/vcsbase/checkoutjobs.cpp
View File

@@ -72,7 +72,7 @@ ProcessCheckoutJobPrivate::ProcessCheckoutJobPrivate(const QString &b,
{ {
if (!workingDirectory.isEmpty()) if (!workingDirectory.isEmpty())
process->setWorkingDirectory(workingDirectory); process->setWorkingDirectory(workingDirectory);
VCSBasePlugin::setProcessEnvironment(&processEnv); VCSBasePlugin::setProcessEnvironment(&processEnv, false);
process->setProcessEnvironment(processEnv); process->setProcessEnvironment(processEnv);
} }

9
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -686,9 +686,10 @@ bool VCSBasePlugin::isSshPromptConfigured()
return !sshPrompt().isEmpty(); return !sshPrompt().isEmpty();
} }
void VCSBasePlugin::setProcessEnvironment(QProcessEnvironment *e) void VCSBasePlugin::setProcessEnvironment(QProcessEnvironment *e, bool forceCLocale)
{ {
e->insert(QLatin1String("LANG"), QString(QLatin1Char('C'))); if (forceCLocale)
e->insert(QLatin1String("LANG"), QString(QLatin1Char('C')));
const QString sshPromptBinary = sshPrompt(); const QString sshPromptBinary = sshPrompt();
if (!sshPromptBinary.isEmpty()) if (!sshPromptBinary.isEmpty())
e->insert(QLatin1String("SSH_ASKPASS"), sshPromptBinary); e->insert(QLatin1String("SSH_ASKPASS"), sshPromptBinary);
@@ -738,6 +739,8 @@ Utils::SynchronousProcessResponse
nsp << "ssh (" << sshPromptConfigured << ')'; nsp << "ssh (" << sshPromptConfigured << ')';
if (flags & SuppressCommandLogging) if (flags & SuppressCommandLogging)
nsp << "suppress_log"; nsp << "suppress_log";
if (flags & ForceCLocale)
nsp << "c_locale";
if (outputCodec) if (outputCodec)
nsp << " Codec: " << outputCodec->name(); nsp << " Codec: " << outputCodec->name();
} }
@@ -747,7 +750,7 @@ Utils::SynchronousProcessResponse
if (!workingDir.isEmpty()) if (!workingDir.isEmpty())
process.setWorkingDirectory(workingDir); process.setWorkingDirectory(workingDir);
VCSBase::VCSBasePlugin::setProcessEnvironment(&env); VCSBase::VCSBasePlugin::setProcessEnvironment(&env, (flags & ForceCLocale));
process.setProcessEnvironment(env); process.setProcessEnvironment(env);
process.setTimeout(timeOutMS); process.setTimeout(timeOutMS);
if (outputCodec) if (outputCodec)

11
src/plugins/vcsbase/vcsbaseplugin.h
View File

@@ -176,10 +176,10 @@ public:
static QString findRepositoryForDirectory(const QString &dir, const QString &checkFile); static QString findRepositoryForDirectory(const QString &dir, const QString &checkFile);
// Set up the environment for a version control command line call. // Set up the environment for a version control command line call.
// Sets LANG to 'C' to force English (suppress LOCALE warnings) // Sets up SSH graphical password prompting (note that the latter
// and sets up SSH graphical password prompting (note that the latter // requires a terminal-less process) and sets LANG to 'C' to force English
// requires a terminal-less process). // (suppress LOCALE warnings/parse commands output) if desired.
static void setProcessEnvironment(QProcessEnvironment *e); static void setProcessEnvironment(QProcessEnvironment *e, bool forceCLocale);
// Returns whether an SSH prompt is configured. // Returns whether an SSH prompt is configured.
static bool isSshPromptConfigured(); static bool isSshPromptConfigured();
@@ -191,7 +191,8 @@ public:
SuppressStdErrInLogWindow = 0x8, // No standard error output to VCS output window. SuppressStdErrInLogWindow = 0x8, // No standard error output to VCS output window.
SuppressFailMessageInLogWindow = 0x10, // No message VCS about failure in VCS output window. SuppressFailMessageInLogWindow = 0x10, // No message VCS about failure in VCS output window.
SuppressCommandLogging = 0x20, // No command log entry in VCS output window. SuppressCommandLogging = 0x20, // No command log entry in VCS output window.
ShowSuccessMessage = 0x40 // Show message about successful completion in VCS output window. ShowSuccessMessage = 0x40, // Show message about successful completion in VCS output window.
ForceCLocale = 0x80 // Force C-locale for commands whose output is parsed.
}; };
static Utils::SynchronousProcessResponse static Utils::SynchronousProcessResponse