2016-01-15 14:57:40 +01:00
|
|
|
/****************************************************************************
|
2011-02-28 13:40:04 +01:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** Copyright (C) 2016 Brian McGillion and Hugues Delorme
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
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
|
2016-01-15 14:57:40 +01:00
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
2011-02-28 13:40:04 +01:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** GNU General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
|
|
|
** included in the packaging of this file. Please review the following
|
|
|
|
|
** information to ensure the GNU General Public License requirements will
|
|
|
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
2011-02-28 13:40:04 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
****************************************************************************/
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2016-02-03 12:15:21 +01:00
|
|
|
#pragma once
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
#include "vcsbase_global.h"
|
|
|
|
|
|
2021-02-16 14:51:16 +01:00
|
|
|
#include "vcsbaseclientsettings.h"
|
|
|
|
|
|
2015-03-25 12:30:07 +01:00
|
|
|
#include <utils/fileutils.h>
|
2020-06-26 13:59:38 +02:00
|
|
|
#include <utils/id.h>
|
2021-05-05 18:21:22 +02:00
|
|
|
#include <utils/qtcprocess.h>
|
2015-03-25 12:30:07 +01:00
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QObject>
|
|
|
|
|
#include <QStringList>
|
2015-06-04 12:35:59 +02:00
|
|
|
#include <QVariant>
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2015-01-20 17:42:16 +01:00
|
|
|
#include <functional>
|
|
|
|
|
|
2011-02-28 13:40:04 +01:00
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
class QFileInfo;
|
2013-03-25 11:36:51 +01:00
|
|
|
class QProcessEnvironment;
|
2015-08-24 13:39:40 +02:00
|
|
|
class QToolBar;
|
2011-02-28 13:40:04 +01:00
|
|
|
QT_END_NAMESPACE
|
|
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
namespace VcsBase {
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
class VcsCommand;
|
2012-01-07 12:31:48 +01:00
|
|
|
class VcsBaseEditorWidget;
|
|
|
|
|
class VcsJob;
|
2015-03-26 12:22:29 +01:00
|
|
|
class VcsBaseClientImplPrivate;
|
2016-10-23 04:42:43 +03:00
|
|
|
class VcsBaseEditorConfig;
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2015-03-26 12:18:09 +01:00
|
|
|
class VCSBASE_EXPORT VcsBaseClientImpl : public QObject
|
|
|
|
|
{
|
|
|
|
|
Q_OBJECT
|
|
|
|
|
|
|
|
|
|
public:
|
2021-03-19 14:19:16 +01:00
|
|
|
explicit VcsBaseClientImpl(VcsBaseSettings *baseSettings);
|
2020-01-24 10:13:02 +01:00
|
|
|
~VcsBaseClientImpl() override = default;
|
2015-03-26 12:22:29 +01:00
|
|
|
|
2021-03-19 14:19:16 +01:00
|
|
|
VcsBaseSettings &settings() const;
|
2015-03-26 12:22:29 +01:00
|
|
|
|
2019-05-28 13:49:26 +02:00
|
|
|
virtual Utils::FilePath vcsBinary() const;
|
2015-04-10 14:44:17 +02:00
|
|
|
int vcsTimeoutS() const;
|
2015-03-27 14:24:47 +01:00
|
|
|
|
2015-03-27 15:24:45 +01:00
|
|
|
enum JobOutputBindMode {
|
|
|
|
|
NoOutputBind,
|
|
|
|
|
VcsWindowOutputBind
|
|
|
|
|
};
|
|
|
|
|
|
2020-06-26 13:59:38 +02:00
|
|
|
VcsBaseEditorWidget *createVcsEditor(Utils::Id kind, QString title,
|
2015-03-27 16:08:52 +01:00
|
|
|
const QString &source, QTextCodec *codec,
|
|
|
|
|
const char *registerDynamicProperty,
|
|
|
|
|
const QString &dynamicPropertyValue) const;
|
|
|
|
|
|
2015-03-27 15:24:45 +01:00
|
|
|
VcsCommand *createCommand(const QString &workingDirectory,
|
2018-05-07 17:30:00 +02:00
|
|
|
VcsBaseEditorWidget *editor = nullptr,
|
2015-03-27 15:24:45 +01:00
|
|
|
JobOutputBindMode mode = NoOutputBind) const;
|
|
|
|
|
|
|
|
|
|
void enqueueJob(VcsCommand *cmd, const QStringList &args,
|
2015-06-08 15:04:04 +02:00
|
|
|
const QString &workingDirectory = QString(),
|
2016-05-08 11:42:08 +03:00
|
|
|
const Utils::ExitCodeInterpreter &interpreter = Utils::defaultExitCodeInterpreter) const;
|
2015-03-27 15:24:45 +01:00
|
|
|
|
2021-05-04 05:54:54 +02:00
|
|
|
virtual Utils::Environment processEnvironment() const;
|
2015-03-27 15:24:45 +01:00
|
|
|
|
2015-04-13 11:38:44 +02:00
|
|
|
// VCS functionality:
|
2016-06-13 19:57:45 +03:00
|
|
|
virtual VcsBaseEditorWidget *annotate(
|
|
|
|
|
const QString &workingDir, const QString &file, const QString &revision = QString(),
|
|
|
|
|
int lineNumber = -1, const QStringList &extraOptions = QStringList()) = 0;
|
2015-04-13 11:38:44 +02:00
|
|
|
|
2015-04-10 15:23:20 +02:00
|
|
|
// Return converted command output, remove '\r' read on Windows
|
|
|
|
|
static QString commandOutputFromLocal8Bit(const QByteArray &a);
|
|
|
|
|
// Return converted command output split into lines
|
|
|
|
|
static QStringList commandOutputLinesFromLocal8Bit(const QByteArray &a);
|
2016-07-05 10:34:41 +02:00
|
|
|
static QStringList splitLines(const QString &s);
|
2015-04-10 15:23:20 +02:00
|
|
|
|
2016-07-05 10:34:41 +02:00
|
|
|
static QString stripLastNewline(const QString &in);
|
2015-03-27 15:33:38 +01:00
|
|
|
|
2015-04-10 16:04:42 +02:00
|
|
|
// Fully synchronous VCS execution (QProcess-based)
|
2016-07-05 10:34:41 +02:00
|
|
|
Utils::SynchronousProcessResponse
|
|
|
|
|
vcsFullySynchronousExec(const QString &workingDir, const QStringList &args,
|
|
|
|
|
unsigned flags = 0, int timeoutS = -1, QTextCodec *codec = nullptr) const;
|
2016-10-25 13:52:43 +02:00
|
|
|
Utils::SynchronousProcessResponse
|
2019-06-07 15:27:50 +02:00
|
|
|
vcsFullySynchronousExec(const QString &workingDir, const Utils::CommandLine &cmdLine,
|
2016-10-25 13:52:43 +02:00
|
|
|
unsigned flags = 0, int timeoutS = -1, QTextCodec *codec = nullptr) const;
|
|
|
|
|
|
2015-04-10 16:04:42 +02:00
|
|
|
|
2015-04-14 15:26:15 +02:00
|
|
|
// Simple helper to execute a single command using createCommand and enqueueJob.
|
|
|
|
|
VcsCommand *vcsExec(const QString &workingDirectory, const QStringList &arguments,
|
2016-07-05 10:34:41 +02:00
|
|
|
VcsBaseEditorWidget *editor = nullptr, bool useOutputToWindow = false,
|
2016-05-08 11:42:08 +03:00
|
|
|
unsigned additionalFlags = 0, const QVariant &cookie = QVariant()) const;
|
2015-04-14 15:26:15 +02:00
|
|
|
|
2016-07-05 10:34:41 +02:00
|
|
|
protected:
|
|
|
|
|
void resetCachedVcsInfo(const QString &workingDir);
|
|
|
|
|
virtual void annotateRevisionRequested(const QString &workingDirectory, const QString &file,
|
|
|
|
|
const QString &change, int line);
|
|
|
|
|
|
2015-04-10 16:10:46 +02:00
|
|
|
// Synchronous VCS execution using Utils::SynchronousProcess, with
|
|
|
|
|
// log windows updating (using VcsBasePlugin::runVcs with flags)
|
|
|
|
|
Utils::SynchronousProcessResponse vcsSynchronousExec(const QString &workingDir,
|
|
|
|
|
const QStringList &args,
|
|
|
|
|
unsigned flags = 0,
|
2016-07-05 10:34:41 +02:00
|
|
|
QTextCodec *outputCodec = nullptr) const;
|
2015-04-10 16:10:46 +02:00
|
|
|
|
2015-03-26 12:22:29 +01:00
|
|
|
private:
|
|
|
|
|
void saveSettings();
|
|
|
|
|
|
2021-03-16 06:00:25 +01:00
|
|
|
VcsBaseSettings *m_baseSettings = nullptr; // Aspect based.
|
2015-03-26 12:18:09 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class VCSBASE_EXPORT VcsBaseClient : public VcsBaseClientImpl
|
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:
|
2016-02-03 12:15:21 +01:00
|
|
|
StatusItem() = default;
|
2011-08-22 15:33:03 +00:00
|
|
|
QString flags;
|
|
|
|
|
QString file;
|
|
|
|
|
};
|
|
|
|
|
|
2021-03-19 14:19:16 +01:00
|
|
|
explicit VcsBaseClient(VcsBaseSettings *baseSettings);
|
2020-01-31 17:28:43 +01:00
|
|
|
|
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());
|
2016-06-13 19:57:45 +03:00
|
|
|
VcsBaseEditorWidget *annotate(
|
|
|
|
|
const QString &workingDir, const QString &file, const QString &revision = QString(),
|
|
|
|
|
int lineNumber = -1, const QStringList &extraOptions = QStringList()) override;
|
2011-08-23 10:38:44 +00:00
|
|
|
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
|
|
|
|
2020-01-31 17:21:51 +01:00
|
|
|
virtual QString findTopLevelForFile(const QFileInfo &/*file*/) const { return {}; }
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2016-11-26 21:52:49 +02:00
|
|
|
virtual void view(const QString &source, const QString &id,
|
|
|
|
|
const QStringList &extraOptions = QStringList());
|
|
|
|
|
|
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);
|
|
|
|
|
|
2020-01-30 12:31:47 +01:00
|
|
|
public:
|
2014-08-27 18:55:41 +02:00
|
|
|
enum VcsCommandTag
|
2011-02-28 13:40:04 +01:00
|
|
|
{
|
|
|
|
|
CreateRepositoryCommand,
|
|
|
|
|
CloneCommand,
|
|
|
|
|
AddCommand,
|
|
|
|
|
RemoveCommand,
|
|
|
|
|
MoveCommand,
|
|
|
|
|
PullCommand,
|
|
|
|
|
PushCommand,
|
|
|
|
|
CommitCommand,
|
|
|
|
|
ImportCommand,
|
|
|
|
|
UpdateCommand,
|
|
|
|
|
RevertCommand,
|
|
|
|
|
AnnotateCommand,
|
|
|
|
|
DiffCommand,
|
|
|
|
|
LogCommand,
|
|
|
|
|
StatusCommand
|
|
|
|
|
};
|
2020-01-30 12:31:47 +01:00
|
|
|
protected:
|
2014-08-27 18:55:41 +02:00
|
|
|
virtual QString vcsCommandString(VcsCommandTag cmd) const;
|
2020-06-26 13:59:38 +02:00
|
|
|
virtual Utils::Id vcsEditorKind(VcsCommandTag cmd) const = 0;
|
2016-04-25 14:40:42 +02:00
|
|
|
virtual Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const;
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2020-01-31 17:21:51 +01:00
|
|
|
virtual QStringList revisionSpec(const QString &/*revision*/) const { return {}; }
|
2015-01-20 17:42:16 +01:00
|
|
|
|
2016-10-23 04:42:43 +03:00
|
|
|
typedef std::function<VcsBaseEditorConfig *(QToolBar *)> ConfigCreator;
|
|
|
|
|
void setDiffConfigCreator(ConfigCreator creator);
|
|
|
|
|
void setLogConfigCreator(ConfigCreator creator);
|
2015-01-20 17:42:16 +01:00
|
|
|
|
2020-01-31 17:21:51 +01:00
|
|
|
virtual StatusItem parseStatusLine(const QString &/*line*/) const { return {}; }
|
2011-02-28 13:40:04 +01:00
|
|
|
|
|
|
|
|
QString vcsEditorTitle(const QString &vcsCmd, const QString &sourceId) const;
|
2015-04-10 16:04:42 +02:00
|
|
|
|
2011-02-28 13:40:04 +01:00
|
|
|
private:
|
2015-01-21 10:16:17 +01:00
|
|
|
void statusParser(const QString&);
|
|
|
|
|
|
2020-01-31 17:28:43 +01:00
|
|
|
VcsBaseClient::ConfigCreator m_diffConfigCreator;
|
|
|
|
|
VcsBaseClient::ConfigCreator m_logConfigCreator;
|
2011-02-28 13:40:04 +01:00
|
|
|
};
|
|
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
} //namespace VcsBase
|