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

Vcs/Utils: Use Utils::Environment for ShellCommand

Browse Source 
Change-Id: Ica289ab2f83d52270923c4ff4983860cfbe0b494
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-04 05:54:54 +02:00
parent f5aa7bd9a1
commit 793d673f39
22 changed files with 72 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -742,16 +742,14 @@ QString source(IDocument *document)
return document->property(SOURCE_PROPERTY).toString();
}
void setProcessEnvironment(QProcessEnvironment *e,
bool forceCLocale,
const QString &sshPromptBinary)
void setProcessEnvironment(Environment *e, bool forceCLocale, const QString &sshPromptBinary)
{
if (forceCLocale) {
e->insert("LANG", "C");
e->insert("LANGUAGE", "C");
e->set("LANG", "C");
e->set("LANGUAGE", "C");
}
if (!sshPromptBinary.isEmpty())
e->insert("SSH_ASKPASS", sshPromptBinary);
e->set("SSH_ASKPASS", sshPromptBinary);
}
// Run a process synchronously, returning Utils::SynchronousProcessResponse
@@ -761,9 +759,9 @@ SynchronousProcessResponse runVcs(const QString &workingDir,
int timeOutS,
unsigned flags,
QTextCodec *outputCodec,
const QProcessEnvironment &env)
const Environment &env)
{
VcsCommand command(workingDir, env.isEmpty() ? QProcessEnvironment::systemEnvironment() : env);
VcsCommand command(workingDir, env.size() == 0 ? Environment::systemEnvironment() : env);
command.addFlags(flags);
command.setCodec(outputCodec);
return command.runCommand(cmd, timeOutS);