forked from qt-creator/qt-creator
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 <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
691ade1747
commit
3f44c6d0be
@@ -147,6 +147,7 @@ public:
|
||||
QString currentView() const { return m_view; }
|
||||
void refreshActivities();
|
||||
inline bool isUcm() const { return m_isUcm; }
|
||||
void setStatus(const QString &file, FileStatus::Status status, bool update = true);
|
||||
|
||||
bool ccCheckUcm(const QString &viewname, const QString &workingDir) const;
|
||||
|
||||
@@ -155,7 +156,6 @@ public slots:
|
||||
const QString &revision = QString(), int lineNumber = -1) const;
|
||||
bool newActivity();
|
||||
void updateStreamAndView();
|
||||
void setStatus(const QString &file, ClearCase::Internal::FileStatus::Status status, bool update = true);
|
||||
|
||||
private slots:
|
||||
void checkOutCurrentFile();
|
||||
@@ -180,6 +180,7 @@ private slots:
|
||||
void tasksFinished(const QString &type);
|
||||
void syncSlot();
|
||||
void closing();
|
||||
void updateStatusActions();
|
||||
|
||||
protected:
|
||||
void updateActions(VcsBase::VcsBasePlugin::ActionState);
|
||||
@@ -210,7 +211,6 @@ private:
|
||||
inline ClearCaseControl *clearCaseControl() const;
|
||||
QString ccGetFileActivity(const QString &workingDir, const QString &file);
|
||||
QStringList ccGetActivityVersions(const QString &workingDir, const QString &activity);
|
||||
void updateStatusActions();
|
||||
void diffGraphical(const QString &file1, const QString &file2 = QString());
|
||||
QString diffExternal(QString file1, QString file2 = QString(), bool keep = false);
|
||||
QString getFile(const QString &nativeFile, const QString &prefix);
|
||||
@@ -264,6 +264,4 @@ private:
|
||||
} // namespace Internal
|
||||
} // namespace ClearCase
|
||||
|
||||
Q_DECLARE_METATYPE(ClearCase::Internal::FileStatus::Status)
|
||||
|
||||
#endif // CLEARCASEPLUGIN_H
|
||||
|
||||
Reference in New Issue
Block a user