diff options
| author | Orgad Shaneh <[email protected]> | 2012-11-12 16:48:26 +0200 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2012-11-16 14:13:14 +0100 |
| commit | 3f44c6d0becc704538523a84593efb4e1719c84c (patch) | |
| tree | bbd36e459112e580bff180442de47dd7d18a3d34 /src/plugins/clearcase/clearcasesync.cpp | |
| parent | 691ade174771141b6c5efb0d7f2e983826c6670c (diff) | |
ClearCase: Fix race condition
setStatus() is invoked in the main thread, but the
status change is tested for in the sync thread...
Change-Id: Ib322e12e7d40dafa6b60f3a73a202e8e1dcbfb53
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/clearcase/clearcasesync.cpp')
| -rw-r--r-- | src/plugins/clearcase/clearcasesync.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index 1e954b59890..865b94b634f 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -87,7 +87,7 @@ void ClearCaseSync::run(QFutureInterface<void> &future, const QString &topLevel, args << files; } else { foreach (const QString &file, files) - emit setStatus(topLevelDir.relativeFilePath(file), FileStatus::Unknown, false); + m_plugin->setStatus(topLevelDir.relativeFilePath(file), FileStatus::Unknown, false); args << QLatin1String("-recurse"); args << vobs; } @@ -120,15 +120,15 @@ void ClearCaseSync::run(QFutureInterface<void> &future, const QString &topLevel, if (reState.indexIn(buffer, wspos + 1, QRegExp::CaretAtOffset) != -1) { ccState = reState.cap(); if (ccState.indexOf(QLatin1String("hijacked")) != -1) - emit setStatus(file, FileStatus::Hijacked, true); + m_plugin->setStatus(file, FileStatus::Hijacked, true); else if (ccState.indexOf(QLatin1String("loaded but missing")) != -1) - emit setStatus(file, FileStatus::Missing, false); + m_plugin->setStatus(file, FileStatus::Missing, false); } else if (buffer.lastIndexOf(QLatin1String("CHECKEDOUT"), wspos) != -1) - emit setStatus(file, FileStatus::CheckedOut, true); + m_plugin->setStatus(file, FileStatus::CheckedOut, true); // don't care about checked-in files not listed in project else if (m_statusMap->contains(file)) - emit setStatus(file, FileStatus::CheckedIn, true); + m_plugin->setStatus(file, FileStatus::CheckedIn, true); } buffer.clear(); future.setProgressValue(qMin(total, ++processed)); @@ -140,7 +140,7 @@ void ClearCaseSync::run(QFutureInterface<void> &future, const QString &topLevel, foreach (const QString &file, files) { QString relFile = topLevelDir.relativeFilePath(file); if (m_statusMap->value(relFile).status == FileStatus::Unknown) - emit setStatus(relFile, FileStatus::NotManaged, false); + m_plugin->setStatus(relFile, FileStatus::NotManaged, false); } future.setProgressValue(total + 1); if (!hot) { |