feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS[CVS]: Complement menu options, support 'edit'.

Browse Source 
Add missing menu options for project/repository actions. Add support for
'edit' (current file) and 'unedit' (current file/repository, with
prompt).
Note: Unediting modified files will only work with cvsnt, since it uses
the '-y' option to force a 'yes' to CVS asking to revert changes.
Implement IVersionControl::vcsOpen() by using 'edit', causing it to
prompt for read-only as it does for Perforce.

Task-number: QTCREATORBUG-1971
Task-number: QTCREATORBUG-1864
This commit is contained in:
Friedemann Kleint
2010-08-06 16:12:24 +02:00
parent eb91f0843f
commit cc533b40c8
3 changed files with 231 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cvs/cvsplugin.h
View File

@@ -96,6 +96,8 @@ public:
bool vcsAdd(const QString &workingDir, const QString &fileName);
bool vcsDelete(const QString &workingDir, const QString &fileName);
bool managesDirectory(const QString &directory, QString *topLevel = 0) const;
// cvs 'edit' is used to implement 'open' (cvsnt).
bool edit(const QString &topLevel, const QStringList &files);
static CVSPlugin *cvsPluginInstance();
@@ -119,6 +121,13 @@ private slots:
void diffCommitFiles(const QStringList &);
void logProject();
void logRepository();
void commitProject();
void diffRepository();
void statusRepository();
void updateRepository();
void editCurrentFile();
void uneditCurrentFile();
void uneditCurrentRepository();
protected:
virtual void updateActions(VCSBase::VCSBasePlugin::ActionState);
@@ -143,7 +152,12 @@ private:
void filelog(const QString &workingDir,
const QStringList &files = QStringList(),
bool enableAnnotationContextMenu = false);
bool unedit(const QString &topLevel, const QStringList &files);
bool status(const QString &topLevel, const QStringList &files, const QString &title);
bool update(const QString &topLevel, const QStringList &files);
bool checkCVSDirectory(const QDir &directory) const;
// Quick check if files are modified
bool diffCheckModified(const QString &topLevel, const QStringList &files, bool *modified);
QString findTopLevelForDirectoryI(const QString &directory) const;
void startCommit(const QString &workingDir, const QStringList &files = QStringList());
bool commit(const QString &messageFile, const QStringList &subVersionFileList);
@@ -158,6 +172,9 @@ private:
Utils::ParameterAction *m_addAction;
Utils::ParameterAction *m_deleteAction;
Utils::ParameterAction *m_revertAction;
Utils::ParameterAction *m_editCurrentAction;
Utils::ParameterAction *m_uneditCurrentAction;
QAction *m_uneditRepositoryAction;
Utils::ParameterAction *m_diffProjectAction;
Utils::ParameterAction *m_diffCurrentAction;
Utils::ParameterAction *m_logProjectAction;
@@ -169,6 +186,10 @@ private:
Utils::ParameterAction *m_annotateCurrentAction;
Utils::ParameterAction *m_statusProjectAction;
Utils::ParameterAction *m_updateProjectAction;
Utils::ParameterAction *m_commitProjectAction;
QAction *m_diffRepositoryAction;
QAction *m_updateRepositoryAction;
QAction *m_statusRepositoryAction;
QAction *m_submitCurrentLogAction;
QAction *m_submitDiffAction;