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

Fix build

Browse Source 
The (un)expectDirectoryChange API addition has been reverted

Change-Id: I4736f51a77eb2f63b3e4a7b44426ad15a06624c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2013-06-19 11:45:05 +02:00
committed by Orgad Shaneh
parent 1ef2e51cf8
commit f7349e49df
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -931,8 +931,9 @@ SynchronousProcessResponse VcsBasePlugin::runVcs(const QString &workingDir,
VcsBase::VcsBasePlugin::setProcessEnvironment(&env, (flags & ForceCLocale));
if (flags & ExpectRepoChanges)
Core::DocumentManager::expectDirectoryChange(workingDir);
// TODO tell the document manager about expected repository changes
// if (flags & ExpectRepoChanges)
// Core::DocumentManager::expectDirectoryChange(workingDir);
if (flags & FullySynchronously) {
response = runVcsFullySynchronously(workingDir, binary, arguments, timeOutMS,
env, flags, outputCodec);
@@ -981,8 +982,9 @@ SynchronousProcessResponse VcsBasePlugin::runVcs(const QString &workingDir,
if (!(flags & SuppressFailMessageInLogWindow))
outputWindow->appendError(response.exitMessage(binary, timeOutMS));
}
if (flags & ExpectRepoChanges)
Core::DocumentManager::unexpectDirectoryChange(workingDir);
// TODO tell the document manager that the directory now received all expected changes
// if (flags & ExpectRepoChanges)
// Core::DocumentManager::unexpectDirectoryChange(workingDir);
return response;
}
@@ -1002,8 +1004,9 @@ bool VcsBasePlugin::runFullySynchronous(const QString &workingDirectory,
if (!(flags & SuppressCommandLogging))
VcsBase::VcsBaseOutputWindow::instance()->appendCommand(workingDirectory, binary, arguments);
if (flags & ExpectRepoChanges)
Core::DocumentManager::expectDirectoryChange(workingDirectory);
// TODO tell the document manager about expected repository changes
// if (flags & ExpectRepoChanges)
// Core::DocumentManager::expectDirectoryChange(workingDirectory);
QProcess process;
process.setWorkingDirectory(workingDirectory);
process.setProcessEnvironment(env);
@@ -1025,8 +1028,9 @@ bool VcsBasePlugin::runFullySynchronous(const QString &workingDirectory,
SynchronousProcess::stopProcess(process);
return false;
}
if (flags & ExpectRepoChanges)
Core::DocumentManager::unexpectDirectoryChange(workingDirectory);
// TODO tell the document manager that the directory now received all expected changes
// if (flags & ExpectRepoChanges)
// Core::DocumentManager::unexpectDirectoryChange(workingDirectory);
return process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0;
}