2011-02-28 13:40:04 +01:00
|
|
|
/**************************************************************************
|
|
|
|
|
**
|
2013-01-28 17:12:19 +01:00
|
|
|
** Copyright (c) 2013 Brian McGillion and Hugues Delorme
|
2012-10-02 09:12:39 +02:00
|
|
|
** Contact: http://www.qt-project.org/legal
|
2011-02-28 13:40:04 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** This file is part of Qt Creator.
|
2011-02-28 13:40:04 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** 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.
|
2011-02-28 13:40:04 +01:00
|
|
|
**
|
|
|
|
|
** GNU Lesser General Public License Usage
|
2012-10-02 09:12:39 +02:00
|
|
|
** 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
|
2011-02-28 13:40:04 +01:00
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
****************************************************************************/
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
#ifndef VCSBASECLIENT_H
|
|
|
|
|
#define VCSBASECLIENT_H
|
|
|
|
|
|
|
|
|
|
#include "vcsbase_global.h"
|
2013-03-19 15:23:04 +01:00
|
|
|
#include <coreplugin/id.h>
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QObject>
|
|
|
|
|
#include <QStringList>
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
class QFileInfo;
|
2013-03-25 11:36:51 +01:00
|
|
|
class QVariant;
|
|
|
|
|
class QProcessEnvironment;
|
2011-02-28 13:40:04 +01:00
|
|
|
QT_END_NAMESPACE
|
|
|
|
|
|
|
|
|
|
namespace Utils {
|
|
|
|
|
struct SynchronousProcessResponse;
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
namespace VcsBase {
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2011-10-05 15:32:16 +00:00
|
|
|
class Command;
|
2012-01-07 12:31:48 +01:00
|
|
|
class VcsBaseEditorWidget;
|
|
|
|
|
class VcsBaseClientSettings;
|
|
|
|
|
class VcsJob;
|
|
|
|
|
class VcsBaseClientPrivate;
|
|
|
|
|
class VcsBaseEditorParameterWidget;
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
class VCSBASE_EXPORT VcsBaseClient : public QObject
|
2011-02-28 13:40:04 +01:00
|
|
|
{
|
|
|
|
|
Q_OBJECT
|
2011-09-16 15:00:41 +02:00
|
|
|
|
2011-02-28 13:40:04 +01:00
|
|
|
public:
|
2011-12-08 13:07:00 +01:00
|
|
|
class VCSBASE_EXPORT StatusItem
|
2011-08-22 15:33:03 +00:00
|
|
|
{
|
2011-12-08 13:07:00 +01:00
|
|
|
public:
|
2012-01-07 03:35:54 +01:00
|
|
|
StatusItem() {}
|
2011-08-22 15:33:03 +00:00
|
|
|
StatusItem(const QString &s, const QString &f);
|
|
|
|
|
QString flags;
|
|
|
|
|
QString file;
|
|
|
|
|
};
|
|
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
explicit VcsBaseClient(VcsBaseClientSettings *settings);
|
|
|
|
|
~VcsBaseClient();
|
2011-08-23 10:38:44 +00:00
|
|
|
virtual bool synchronousCreateRepository(const QString &workingDir,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-02-28 13:40:04 +01:00
|
|
|
virtual bool synchronousClone(const QString &workingDir,
|
|
|
|
|
const QString &srcLocation,
|
|
|
|
|
const QString &dstLocation,
|
2011-05-12 14:48:10 +02:00
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-08-23 10:38:44 +00:00
|
|
|
virtual bool synchronousAdd(const QString &workingDir, const QString &fileName,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
virtual bool synchronousRemove(const QString &workingDir, const QString &fileName,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-02-28 13:40:04 +01:00
|
|
|
virtual bool synchronousMove(const QString &workingDir,
|
2011-08-23 10:38:44 +00:00
|
|
|
const QString &from, const QString &to,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-02-28 13:40:04 +01:00
|
|
|
virtual bool synchronousPull(const QString &workingDir,
|
|
|
|
|
const QString &srcLocation,
|
2011-05-12 14:48:10 +02:00
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-02-28 13:40:04 +01:00
|
|
|
virtual bool synchronousPush(const QString &workingDir,
|
|
|
|
|
const QString &dstLocation,
|
2011-05-12 14:48:10 +02:00
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-08-23 10:38:44 +00:00
|
|
|
virtual void annotate(const QString &workingDir, const QString &file,
|
|
|
|
|
const QString revision = QString(), int lineNumber = -1,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
virtual void diff(const QString &workingDir, const QStringList &files = QStringList(),
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
virtual void log(const QString &workingDir, const QStringList &files = QStringList(),
|
|
|
|
|
const QStringList &extraOptions = QStringList(),
|
|
|
|
|
bool enableAnnotationContextMenu = false);
|
|
|
|
|
virtual void status(const QString &workingDir, const QString &file = QString(),
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-08-22 15:33:03 +00:00
|
|
|
virtual void emitParsedStatus(const QString &repository,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-08-23 10:38:44 +00:00
|
|
|
virtual void revertFile(const QString &workingDir, const QString &file,
|
|
|
|
|
const QString &revision = QString(),
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
virtual void revertAll(const QString &workingDir, const QString &revision = QString(),
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
virtual void import(const QString &repositoryRoot, const QStringList &files,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
virtual void update(const QString &repositoryRoot, const QString &revision = QString(),
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
virtual void commit(const QString &repositoryRoot, const QStringList &files,
|
|
|
|
|
const QString &commitMessageFile,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
virtual QString findTopLevelForFile(const QFileInfo &file) const = 0;
|
|
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
virtual VcsBaseClientSettings *settings() const;
|
2011-03-15 15:47:45 +01:00
|
|
|
|
2011-02-28 13:40:04 +01:00
|
|
|
signals:
|
2012-01-07 12:31:48 +01:00
|
|
|
void parsedStatus(const QList<VcsBase::VcsBaseClient::StatusItem> &statusList);
|
|
|
|
|
// Passes on changed signals from VcsJob to Control
|
2011-02-28 13:40:04 +01:00
|
|
|
void changed(const QVariant &v);
|
|
|
|
|
|
|
|
|
|
public slots:
|
2011-08-23 10:38:44 +00:00
|
|
|
virtual void view(const QString &source, const QString &id,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
protected:
|
2012-01-07 12:31:48 +01:00
|
|
|
enum VcsCommand
|
2011-02-28 13:40:04 +01:00
|
|
|
{
|
|
|
|
|
CreateRepositoryCommand,
|
|
|
|
|
CloneCommand,
|
|
|
|
|
AddCommand,
|
|
|
|
|
RemoveCommand,
|
|
|
|
|
MoveCommand,
|
|
|
|
|
PullCommand,
|
|
|
|
|
PushCommand,
|
|
|
|
|
CommitCommand,
|
|
|
|
|
ImportCommand,
|
|
|
|
|
UpdateCommand,
|
|
|
|
|
RevertCommand,
|
|
|
|
|
AnnotateCommand,
|
|
|
|
|
DiffCommand,
|
|
|
|
|
LogCommand,
|
|
|
|
|
StatusCommand
|
|
|
|
|
};
|
2012-01-07 12:31:48 +01:00
|
|
|
virtual QString vcsCommandString(VcsCommand cmd) const;
|
2013-03-19 15:23:04 +01:00
|
|
|
virtual Core::Id vcsEditorKind(VcsCommand cmd) const = 0;
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2011-08-23 10:38:44 +00:00
|
|
|
virtual QStringList revisionSpec(const QString &revision) const = 0;
|
2012-01-07 12:31:48 +01:00
|
|
|
virtual VcsBaseEditorParameterWidget *createDiffEditor(const QString &workingDir,
|
2011-06-10 15:27:57 +00:00
|
|
|
const QStringList &files,
|
|
|
|
|
const QStringList &extraOptions);
|
2012-01-07 12:31:48 +01:00
|
|
|
virtual VcsBaseEditorParameterWidget *createLogEditor(const QString &workingDir,
|
2011-07-28 10:22:11 +00:00
|
|
|
const QStringList &files,
|
|
|
|
|
const QStringList &extraOptions);
|
2011-08-22 15:33:03 +00:00
|
|
|
virtual StatusItem parseStatusLine(const QString &line) const = 0;
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
QString vcsEditorTitle(const QString &vcsCmd, const QString &sourceId) const;
|
|
|
|
|
// Fully synchronous VCS execution (QProcess-based)
|
2011-03-11 15:32:08 +01:00
|
|
|
bool vcsFullySynchronousExec(const QString &workingDir,
|
2011-02-28 13:40:04 +01:00
|
|
|
const QStringList &args,
|
|
|
|
|
QByteArray *output);
|
|
|
|
|
// Synchronous VCS execution using Utils::SynchronousProcess, with
|
2012-01-07 12:31:48 +01:00
|
|
|
// log windows updating (using VcsBasePlugin::runVcs with flags)
|
2011-02-28 13:40:04 +01:00
|
|
|
Utils::SynchronousProcessResponse vcsSynchronousExec(const QString &workingDir,
|
|
|
|
|
const QStringList &args,
|
|
|
|
|
unsigned flags = 0,
|
|
|
|
|
QTextCodec *outputCodec = 0);
|
2013-03-19 15:23:04 +01:00
|
|
|
VcsBase::VcsBaseEditorWidget *createVcsEditor(Core::Id kind, QString title,
|
2011-02-28 13:40:04 +01:00
|
|
|
const QString &source, bool setSourceCodec,
|
|
|
|
|
const char *registerDynamicProperty,
|
|
|
|
|
const QString &dynamicPropertyValue) const;
|
|
|
|
|
|
2011-10-05 15:32:16 +00:00
|
|
|
virtual QProcessEnvironment processEnvironment() const;
|
|
|
|
|
|
|
|
|
|
enum JobOutputBindMode {
|
|
|
|
|
NoOutputBind,
|
|
|
|
|
VcsWindowOutputBind
|
|
|
|
|
};
|
|
|
|
|
Command *createCommand(const QString &workingDirectory,
|
2012-01-07 12:31:48 +01:00
|
|
|
VcsBase::VcsBaseEditorWidget *editor = 0,
|
2011-10-05 15:32:16 +00:00
|
|
|
JobOutputBindMode mode = NoOutputBind);
|
|
|
|
|
void enqueueJob(Command *cmd, const QStringList &args);
|
|
|
|
|
|
2011-09-13 15:05:50 +00:00
|
|
|
void resetCachedVcsInfo(const QString &workingDir);
|
|
|
|
|
|
2011-02-28 13:40:04 +01:00
|
|
|
private:
|
2012-01-07 12:31:48 +01:00
|
|
|
friend class VcsBaseClientPrivate;
|
|
|
|
|
VcsBaseClientPrivate *d;
|
2011-08-22 15:33:02 +00:00
|
|
|
|
2013-07-17 22:24:13 +03:00
|
|
|
Q_PRIVATE_SLOT(d, void statusParser(QString))
|
2011-08-22 15:33:02 +00:00
|
|
|
Q_PRIVATE_SLOT(d, void annotateRevision(QString, QString, int))
|
|
|
|
|
Q_PRIVATE_SLOT(d, void saveSettings())
|
2013-06-13 14:46:17 +03:00
|
|
|
Q_PRIVATE_SLOT(d, void commandFinishedGotoLine(QWidget *))
|
2011-02-28 13:40:04 +01:00
|
|
|
};
|
|
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
} //namespace VcsBase
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
#endif // VCSBASECLIENT_H
|