forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Orgad Shaneh
parent
8676b58fb4
commit
d1ef970a19
@@ -118,7 +118,7 @@ public:
|
||||
|
||||
bool initialize(const QStringList &arguments, QString *error_message);
|
||||
|
||||
ClearCaseSubmitEditor *openClearCaseSubmitEditor(const QString &fileName);
|
||||
ClearCaseSubmitEditor *openClearCaseSubmitEditor(const QString &fileName, bool isUcm);
|
||||
|
||||
const ClearCaseSettings &settings() const;
|
||||
void setSettings(const ClearCaseSettings &s);
|
||||
@@ -148,6 +148,9 @@ public:
|
||||
FileStatus vcsStatus(const QString &file) const;
|
||||
QString currentView() const { return m_view; }
|
||||
void refreshActivities();
|
||||
inline bool isUcm() const { return m_isUcm; }
|
||||
|
||||
bool ccCheckUcm(const QString &viewname, const QString &workingDir) const;
|
||||
|
||||
public slots:
|
||||
void vcsAnnotate(const QString &workingDir, const QString &file,
|
||||
@@ -216,7 +219,7 @@ private:
|
||||
static void rmdir(const QString &path);
|
||||
QString runExtDiff(const QString &workingDir, const QStringList &arguments,
|
||||
int timeOut, QTextCodec *outputCodec = 0);
|
||||
QString ccGetView(const QString &workingDir, bool *isDynamic = 0) const;
|
||||
QString ccGetView(const QString &workingDir, bool *isDynamic = 0, bool *isUcm = 0) const;
|
||||
|
||||
ClearCaseSettings m_settings;
|
||||
|
||||
@@ -226,6 +229,7 @@ private:
|
||||
QString m_stream;
|
||||
QString m_view;
|
||||
bool m_isDynamic;
|
||||
bool m_isUcm;
|
||||
QString m_intStream;
|
||||
QString m_activity;
|
||||
QString m_diffPrefix;
|
||||
|
||||
Reference in New Issue
Block a user