forked from qt-creator/qt-creator
It was not possible to simultaneously open two commit editors for different version control systems, also there was no reason to scan all open editors for the submit editor, since the plugins can just remember the editor that they opened. Change-Id: I1bea6ece3cd6faa1ecc0566bdd6f5fb10c816963 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
216 lines
7.7 KiB
C++
216 lines
7.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef SUBVERSIONPLUGIN_H
|
|
#define SUBVERSIONPLUGIN_H
|
|
|
|
#include "subversionsettings.h"
|
|
|
|
#include <vcsbase/vcsbaseplugin.h>
|
|
#include <QStringList>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
class QDir;
|
|
class QAction;
|
|
class QTextCodec;
|
|
QT_END_NAMESPACE
|
|
|
|
namespace Core {
|
|
class IVersionControl;
|
|
class IEditor;
|
|
}
|
|
namespace Utils {
|
|
class ParameterAction;
|
|
}
|
|
|
|
namespace VcsBase {
|
|
class VcsBaseSubmitEditor;
|
|
}
|
|
|
|
namespace Locator {
|
|
class CommandLocator;
|
|
}
|
|
|
|
namespace Subversion {
|
|
namespace Internal {
|
|
|
|
class SubversionSubmitEditor;
|
|
class SubversionControl;
|
|
struct SubversionDiffParameters;
|
|
|
|
struct SubversionResponse
|
|
{
|
|
SubversionResponse() : error(false) {}
|
|
bool error;
|
|
QString stdOut;
|
|
QString stdErr;
|
|
QString message;
|
|
};
|
|
|
|
class SubversionPlugin : public VcsBase::VcsBasePlugin
|
|
{
|
|
Q_OBJECT
|
|
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Subversion.json")
|
|
|
|
public:
|
|
SubversionPlugin();
|
|
~SubversionPlugin();
|
|
|
|
bool initialize(const QStringList &arguments, QString *errorMessage);
|
|
|
|
void svnDiff(const QString &workingDir, const QStringList &files, QString diffname = QString());
|
|
|
|
SubversionSubmitEditor *openSubversionSubmitEditor(const QString &fileName);
|
|
|
|
SubversionSettings settings() const;
|
|
void setSettings(const SubversionSettings &s);
|
|
|
|
// IVersionControl
|
|
bool vcsAdd(const QString &workingDir, const QString &fileName);
|
|
bool vcsAdd14(const QString &workingDir, const QString &fileName);
|
|
bool vcsAdd15(const QString &workingDir, const QString &fileName);
|
|
bool vcsDelete(const QString &workingDir, const QString &fileName);
|
|
bool vcsMove(const QString &workingDir, const QString &from, const QString &to);
|
|
bool managesDirectory(const QString &directory, QString *topLevel = 0) const;
|
|
bool vcsCheckout(const QString &directory, const QByteArray &url);
|
|
QString vcsGetRepositoryURL(const QString &directory);
|
|
|
|
static SubversionPlugin *instance();
|
|
|
|
// Add authorization options to the command line arguments.
|
|
static QStringList addAuthenticationOptions(const QStringList &args,
|
|
const QString &userName = QString(),
|
|
const QString &password = QString());
|
|
|
|
public slots:
|
|
void vcsAnnotate(const QString &workingDir, const QString &file,
|
|
const QString &revision = QString(), int lineNumber = -1);
|
|
void svnDiff(const Subversion::Internal::SubversionDiffParameters &p);
|
|
|
|
private slots:
|
|
void addCurrentFile();
|
|
void revertCurrentFile();
|
|
void diffProject();
|
|
void diffCurrentFile();
|
|
void startCommitAll();
|
|
void startCommitProject();
|
|
void startCommitCurrentFile();
|
|
void revertAll();
|
|
void filelogCurrentFile();
|
|
void annotateCurrentFile();
|
|
void annotateVersion(const QString &file, const QString &revision, int lineNumber);
|
|
void projectStatus();
|
|
void describe(const QString &source, const QString &changeNr);
|
|
void slotDescribe();
|
|
void updateProject();
|
|
void submitCurrentLog();
|
|
void diffCommitFiles(const QStringList &);
|
|
void logProject();
|
|
void logRepository();
|
|
void diffRepository();
|
|
void statusRepository();
|
|
void updateRepository();
|
|
#ifdef WITH_TESTS
|
|
void testDiffFileResolving_data();
|
|
void testDiffFileResolving();
|
|
void testLogResolving();
|
|
#endif
|
|
|
|
protected:
|
|
void updateActions(VcsBase::VcsBasePlugin::ActionState);
|
|
bool submitEditorAboutToClose();
|
|
|
|
private:
|
|
inline bool isCommitEditorOpen() const;
|
|
Core::IEditor * showOutputInEditor(const QString& title, const QString &output,
|
|
int editorType, const QString &source,
|
|
QTextCodec *codec);
|
|
// Run using the settings' authentication options.
|
|
SubversionResponse runSvn(const QString &workingDir,
|
|
const QStringList &arguments, int timeOut,
|
|
unsigned flags, QTextCodec *outputCodec = 0);
|
|
// Run using custom authentication options.
|
|
SubversionResponse runSvn(const QString &workingDir,
|
|
const QString &userName, const QString &password,
|
|
const QStringList &arguments, int timeOut,
|
|
unsigned flags, QTextCodec *outputCodec = 0);
|
|
|
|
void filelog(const QString &workingDir,
|
|
const QStringList &file = QStringList(),
|
|
bool enableAnnotationContextMenu = false);
|
|
void svnStatus(const QString &workingDir, const QStringList &relativePath = QStringList());
|
|
void svnUpdate(const QString &workingDir, const QStringList &relativePaths = QStringList());
|
|
bool checkSVNSubDir(const QDir &directory, const QString &fileName = QString()) const;
|
|
void startCommit(const QString &workingDir, const QStringList &files = QStringList());
|
|
bool commit(const QString &messageFile, const QStringList &subVersionFileList);
|
|
void cleanCommitMessageFile();
|
|
inline SubversionControl *subVersionControl() const;
|
|
|
|
const QStringList m_svnDirectories;
|
|
|
|
SubversionSettings m_settings;
|
|
QString m_commitMessageFileName;
|
|
QString m_commitRepository;
|
|
|
|
Locator::CommandLocator *m_commandLocator;
|
|
Utils::ParameterAction *m_addAction;
|
|
Utils::ParameterAction *m_deleteAction;
|
|
Utils::ParameterAction *m_revertAction;
|
|
Utils::ParameterAction *m_diffProjectAction;
|
|
Utils::ParameterAction *m_diffCurrentAction;
|
|
Utils::ParameterAction *m_logProjectAction;
|
|
QAction *m_logRepositoryAction;
|
|
QAction *m_commitAllAction;
|
|
QAction *m_revertRepositoryAction;
|
|
QAction *m_diffRepositoryAction;
|
|
QAction *m_statusRepositoryAction;
|
|
QAction *m_updateRepositoryAction;
|
|
Utils::ParameterAction *m_commitCurrentAction;
|
|
Utils::ParameterAction *m_filelogCurrentAction;
|
|
Utils::ParameterAction *m_annotateCurrentAction;
|
|
Utils::ParameterAction *m_statusProjectAction;
|
|
Utils::ParameterAction *m_updateProjectAction;
|
|
Utils::ParameterAction *m_commitProjectAction;
|
|
QAction *m_describeAction;
|
|
|
|
QAction *m_submitCurrentLogAction;
|
|
QAction *m_submitDiffAction;
|
|
QAction *m_submitUndoAction;
|
|
QAction *m_submitRedoAction;
|
|
QAction *m_menuAction;
|
|
bool m_submitActionTriggered;
|
|
|
|
static SubversionPlugin *m_subversionPluginInstance;
|
|
};
|
|
|
|
} // namespace Subversion
|
|
} // namespace Internal
|
|
|
|
#endif // SUBVERSIONPLUGIN_H
|