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

ShellCommand: Allow setting working directory per job

Browse Source 
Change-Id: I6d541f87b76bdc7f1503f202792079f833e8932c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-06-08 15:04:04 +02:00
parent ccbc7f9ec1
commit f2be797696
6 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/vcsbase/vcscommand.cpp
View File

@@ -93,30 +93,33 @@ const QProcessEnvironment VcsCommand::processEnvironment() const
Utils::SynchronousProcessResponse VcsCommand::runCommand(const Utils::FileName &binary,
const QStringList &arguments, int timeoutS,
const QString &workingDirectory,
Utils::ExitCodeInterpreter *interpreter)
{
Utils::SynchronousProcessResponse response
= Core::ShellCommand::runCommand(binary, arguments, timeoutS, interpreter);
emitRepositoryChanged();
= Core::ShellCommand::runCommand(binary, arguments, timeoutS, workingDirectory,
interpreter);
emitRepositoryChanged(workingDirectory);
return response;
}
bool VcsCommand::runFullySynchronous(const Utils::FileName &binary, const QStringList &arguments,
int timeoutS, QByteArray *outputData, QByteArray *errorData)
int timeoutS, QByteArray *outputData, QByteArray *errorData,
const QString &workingDirectory)
{
bool result = Core::ShellCommand::runFullySynchronous(binary, arguments, timeoutS,
outputData, errorData);
emitRepositoryChanged();
outputData, errorData, workingDirectory);
emitRepositoryChanged(workingDirectory);
return result;
}
void VcsCommand::emitRepositoryChanged()
void VcsCommand::emitRepositoryChanged(const QString &workingDirectory)
{
if (m_preventRepositoryChanged || !(flags() & VcsCommand::ExpectRepoChanges))
return;
// TODO tell the document manager that the directory now received all expected changes
// Core::DocumentManager::unexpectDirectoryChange(d->m_workingDirectory);
Core::VcsManager::emitRepositoryChanged(defaultWorkingDirectory());
Core::VcsManager::emitRepositoryChanged(workDirectory(workingDirectory));
}
unsigned VcsCommand::processFlags() const