diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index 5f1432d856f068dd6be26455bcabb7159cc52583..1bf3a439fd37534602d0196ada605805702e6649 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -102,7 +102,6 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files) if (m_process->waitForStarted()) { connect(m_process, SIGNAL(finished(int)), this, SLOT(done())); connect(m_process, SIGNAL(readyRead()), this, SLOT(readData())); - Core::DocumentManager::expectDirectoryChange(workingDirectory); } else { delete m_process; @@ -269,7 +268,6 @@ void MergeTool::done() } else { outputWindow->append(tr("Merge tool process terminated with exit code %1").arg(exitCode)); } - Core::DocumentManager::unexpectDirectoryChange(workingDirectory); GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory); deleteLater(); } diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 9ed54c6a8f14e5144a716ab69d234365a36e19f2..05c51a8aa348d79e71e63986a8b1aea62f5a7fa4 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -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; }