diff options
| author | Knut Petter Svendsen <knutpett@pvv.org> | 2012-09-24 11:39:34 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-09-24 16:51:56 +0200 |
| commit | d1ef970a19dbfc60fe0f99557bade02020c7a1a8 (patch) | |
| tree | 6676f8199c0a9221eff9e1be965448cd12246842 /src/plugins/clearcase/clearcasesync.cpp | |
| parent | 8676b58fb46d378954841bbe702ed7fdf0524c9d (diff) | |
Add support for base ClearCase.
Current implementation only works for UCM views, which is a bug.
UCM is layered on top of base ClearCase. UCM has concepts such as
projects, streams and activities. When a view is base ClearCase
disable all prompting for activity, UCM menu entries and dialogs.
Change-Id: I81fb1a014373ece97d3f681623d314344a59b75a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/clearcase/clearcasesync.cpp')
| -rw-r--r-- | src/plugins/clearcase/clearcasesync.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index 3877e62596f..aa9aaa8d331 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -1,4 +1,5 @@ #include "clearcasesync.h" +#include "clearcaseconstants.h" #include <QDir> #include <QFutureInterface> @@ -30,7 +31,8 @@ void ClearCaseSync::run(QFutureInterface<void> &future, const QString &topLevel, total = settings.totalFiles.value(view, total); // refresh activities list - m_plugin->refreshActivities(); + if (m_plugin->isUcm()) + m_plugin->refreshActivities(); if (settings.disableIndexer) return; @@ -66,6 +68,7 @@ void ClearCaseSync::run(QFutureInterface<void> &future, const QString &topLevel, future.setProgressRange(0, total + 1); QProcess process; process.setWorkingDirectory(topLevel); + process.start(program, args); if (!process.waitForStarted()) return; @@ -75,6 +78,7 @@ void ClearCaseSync::run(QFutureInterface<void> &future, const QString &topLevel, process.bytesAvailable() && !future.isCanceled()) { QString line = QString::fromLocal8Bit(process.readLine().constData()); + buffer += line; if (buffer.endsWith(QLatin1Char('\n')) || process.atEnd()) { int atatpos = buffer.indexOf(QLatin1String("@@")); |