2022-08-19 15:59:36 +02:00
|
|
|
// Copyright (C) 2016 Brian McGillion and Hugues Delorme
|
2022-12-21 10:12:09 +01:00
|
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
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"
|
2022-10-05 19:08:53 +02:00
|
|
|
#include "vcsenums.h"
|
2011-02-28 13:40:04 +01:00
|
|
|
|
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>
|
2022-03-02 04:12:25 +01:00
|
|
|
#include <utils/processenums.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
|
2022-03-02 04:12:25 +01:00
|
|
|
class QTextCodec;
|
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
|
|
|
|
2022-08-01 10:49:13 +02:00
|
|
|
class CommandResult;
|
2016-10-23 04:42:43 +03:00
|
|
|
class VcsBaseEditorConfig;
|
2022-07-29 15:56:28 +02:00
|
|
|
class VcsBaseEditorWidget;
|
2022-08-01 10:49:13 +02:00
|
|
|
class VcsCommand;
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2022-12-08 18:50:54 +01:00
|
|
|
using CommandHandler = std::function<void(const CommandResult &)>;
|
|
|
|
|
|
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
|
|
|
|
2022-08-01 10:49:13 +02:00
|
|
|
static VcsCommand *createVcsCommand(const Utils::FilePath &defaultWorkingDir,
|
|
|
|
|
const Utils::Environment &environment);
|
2022-07-12 15:40:47 +02:00
|
|
|
|
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;
|
|
|
|
|
|
2022-08-01 10:49:13 +02:00
|
|
|
VcsCommand *createCommand(const Utils::FilePath &workingDirectory,
|
2022-12-09 13:49:13 +01:00
|
|
|
VcsBaseEditorWidget *editor = nullptr) const;
|
2015-03-27 15:24:45 +01:00
|
|
|
|
2022-08-01 10:49:13 +02:00
|
|
|
void enqueueJob(VcsCommand *cmd, const QStringList &args,
|
2021-05-06 15:54:02 +02:00
|
|
|
const Utils::ExitCodeInterpreter &interpreter = {}) 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:
|
2022-12-11 11:49:17 +01:00
|
|
|
virtual void annotate(const Utils::FilePath &workingDir, const QString &file,
|
|
|
|
|
int lineNumber = -1, const QString &revision = {},
|
|
|
|
|
const QStringList &extraOptions = {}, int firstLine = -1) = 0;
|
2015-04-13 11:38:44 +02:00
|
|
|
|
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)
|
2022-09-02 15:12:13 +02:00
|
|
|
CommandResult vcsSynchronousExec(const Utils::FilePath &workingDir,
|
2022-10-05 19:08:53 +02:00
|
|
|
const QStringList &args, RunFlags flags = RunFlags::None,
|
2022-09-02 18:35:00 +02:00
|
|
|
int timeoutS = -1, QTextCodec *codec = nullptr) const;
|
2022-09-02 15:12:13 +02:00
|
|
|
CommandResult vcsSynchronousExec(const Utils::FilePath &workingDir,
|
2022-10-05 19:08:53 +02:00
|
|
|
const Utils::CommandLine &cmdLine,
|
|
|
|
|
RunFlags flags = RunFlags::None,
|
2022-09-02 18:35:00 +02:00
|
|
|
int timeoutS = -1, QTextCodec *codec = nullptr) const;
|
2016-10-25 13:52:43 +02:00
|
|
|
|
2022-12-08 18:50:54 +01:00
|
|
|
void vcsExecWithHandler(const Utils::FilePath &workingDirectory,
|
|
|
|
|
const QStringList &arguments,
|
|
|
|
|
const QObject *context,
|
|
|
|
|
const CommandHandler &handler,
|
2022-12-09 13:49:13 +01:00
|
|
|
RunFlags additionalFlags = RunFlags::None) const;
|
2022-12-08 18:50:54 +01:00
|
|
|
void vcsExec(const Utils::FilePath &workingDirectory,
|
|
|
|
|
const QStringList &arguments,
|
2022-12-09 13:49:13 +01:00
|
|
|
RunFlags additionalFlags = RunFlags::None) const;
|
2022-12-08 20:41:43 +01:00
|
|
|
void vcsExecWithEditor(const Utils::FilePath &workingDirectory,
|
|
|
|
|
const QStringList &arguments,
|
|
|
|
|
VcsBaseEditorWidget *editor) const;
|
2015-04-14 15:26:15 +02:00
|
|
|
|
2016-07-05 10:34:41 +02:00
|
|
|
protected:
|
2021-07-30 09:24:21 +02:00
|
|
|
void resetCachedVcsInfo(const Utils::FilePath &workingDir);
|
2021-07-30 16:46:27 +02:00
|
|
|
virtual void annotateRevisionRequested(const Utils::FilePath &workingDirectory, const QString &file,
|
2016-07-05 10:34:41 +02:00
|
|
|
const QString &change, int line);
|
|
|
|
|
|
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
|
|
|
|
2021-07-30 09:24:21 +02:00
|
|
|
virtual bool synchronousCreateRepository(const Utils::FilePath &workingDir,
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual bool synchronousClone(const Utils::FilePath &workingDir,
|
2011-02-28 13:40:04 +01:00
|
|
|
const QString &srcLocation,
|
|
|
|
|
const QString &dstLocation,
|
2021-07-30 09:24:21 +02:00
|
|
|
const QStringList &extraOptions = {});
|
2021-07-30 16:46:27 +02:00
|
|
|
virtual bool synchronousAdd(const Utils::FilePath &workingDir,
|
|
|
|
|
const QString &relFileName,
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual bool synchronousRemove(const Utils::FilePath &workingDir,
|
|
|
|
|
const QString &fileName,
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual bool synchronousMove(const Utils::FilePath &workingDir,
|
2011-08-23 10:38:44 +00:00
|
|
|
const QString &from, const QString &to,
|
2021-07-30 16:46:27 +02:00
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual bool synchronousPull(const Utils::FilePath &workingDir,
|
2011-02-28 13:40:04 +01:00
|
|
|
const QString &srcLocation,
|
2021-07-30 16:46:27 +02:00
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual bool synchronousPush(const Utils::FilePath &workingDir,
|
2011-02-28 13:40:04 +01:00
|
|
|
const QString &dstLocation,
|
2021-07-30 16:46:27 +02:00
|
|
|
const QStringList &extraOptions = {});
|
2022-12-11 11:49:17 +01:00
|
|
|
void annotate(const Utils::FilePath &workingDir, const QString &file,
|
|
|
|
|
int lineNumber = -1, const QString &revision = {},
|
|
|
|
|
const QStringList &extraOptions = {}, int firstLine = -1) override;
|
2021-07-30 16:46:27 +02:00
|
|
|
virtual void diff(const Utils::FilePath &workingDir,
|
|
|
|
|
const QStringList &files = {},
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual void log(const Utils::FilePath &workingDir,
|
|
|
|
|
const QStringList &files = {},
|
|
|
|
|
const QStringList &extraOptions = {},
|
2011-08-23 10:38:44 +00:00
|
|
|
bool enableAnnotationContextMenu = false);
|
2021-07-30 16:46:27 +02:00
|
|
|
virtual void status(const Utils::FilePath &workingDir,
|
|
|
|
|
const QString &file = {},
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual void emitParsedStatus(const Utils::FilePath &repository,
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual void revertFile(const Utils::FilePath &workingDir,
|
|
|
|
|
const QString &file,
|
|
|
|
|
const QString &revision = {},
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual void revertAll(const Utils::FilePath &workingDir,
|
|
|
|
|
const QString &revision = {},
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual void import(const Utils::FilePath &repositoryRoot,
|
|
|
|
|
const QStringList &files,
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual void update(const Utils::FilePath &repositoryRoot,
|
|
|
|
|
const QString &revision = {},
|
|
|
|
|
const QStringList &extraOptions = {});
|
|
|
|
|
virtual void commit(const Utils::FilePath &repositoryRoot,
|
|
|
|
|
const QStringList &files,
|
2011-08-23 10:38:44 +00:00
|
|
|
const QString &commitMessageFile,
|
2021-07-30 16:46:27 +02:00
|
|
|
const QStringList &extraOptions = {});
|
2011-02-28 13:40:04 +01:00
|
|
|
|
2021-07-29 17:54:14 +02:00
|
|
|
virtual Utils::FilePath findTopLevelForFile(const Utils::FilePath &/*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:
|
2022-07-29 12:48:29 +02:00
|
|
|
void statusParser(const QString &);
|
2015-01-21 10:16:17 +01:00
|
|
|
|
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
|