forked from qt-creator/qt-creator
Change VcsBaseEditorParameterWidget to add actions/widgets to an existing toolbar, instead of being a widget itself. The class is renamed in a follow-up commit. Task-number: QTCREATORBUG-14934 Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
647 lines
25 KiB
C++
647 lines
25 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 Brian McGillion and Hugues Delorme
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** 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 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.
|
|
**
|
|
** 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.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "vcsbaseclient.h"
|
|
#include "vcscommand.h"
|
|
#include "vcsbaseclientsettings.h"
|
|
#include "vcsbaseeditorparameterwidget.h"
|
|
|
|
#include <coreplugin/icore.h>
|
|
#include <coreplugin/vcsmanager.h>
|
|
#include <coreplugin/editormanager/documentmodel.h>
|
|
#include <coreplugin/editormanager/editormanager.h>
|
|
#include <coreplugin/idocument.h>
|
|
|
|
#include <utils/qtcassert.h>
|
|
#include <utils/synchronousprocess.h>
|
|
#include <vcsbase/vcsbaseeditor.h>
|
|
#include <vcsbase/vcsoutputwindow.h>
|
|
#include <vcsbase/vcsbaseplugin.h>
|
|
|
|
#include <QStringList>
|
|
#include <QDir>
|
|
#include <QProcess>
|
|
#include <QTextCodec>
|
|
#include <QDebug>
|
|
#include <QFileInfo>
|
|
#include <QByteArray>
|
|
#include <QVariant>
|
|
#include <QProcessEnvironment>
|
|
|
|
/*!
|
|
\class VcsBase::VcsBaseClient
|
|
|
|
\brief The VcsBaseClient class is the base class for Mercurial and Bazaar
|
|
'clients'.
|
|
|
|
Provides base functionality for common commands (diff, log, etc).
|
|
|
|
\sa VcsBase::VcsJobRunner
|
|
*/
|
|
|
|
static Core::IEditor *locateEditor(const char *property, const QString &entry)
|
|
{
|
|
foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments())
|
|
if (document->property(property).toString() == entry)
|
|
return Core::DocumentModel::editorsForDocument(document).first();
|
|
return 0;
|
|
}
|
|
|
|
namespace VcsBase {
|
|
|
|
class VcsBaseClientImplPrivate
|
|
{
|
|
public:
|
|
VcsBaseClientImplPrivate(VcsBaseClientSettings *settings);
|
|
~VcsBaseClientImplPrivate();
|
|
|
|
VcsBaseClientSettings *m_clientSettings;
|
|
};
|
|
|
|
VcsBaseClientImplPrivate::VcsBaseClientImplPrivate(VcsBaseClientSettings *settings) :
|
|
m_clientSettings(settings)
|
|
{
|
|
m_clientSettings->readSettings(Core::ICore::settings());
|
|
}
|
|
|
|
VcsBaseClientImplPrivate::~VcsBaseClientImplPrivate()
|
|
{
|
|
delete m_clientSettings;
|
|
}
|
|
|
|
VcsBaseClientImpl::VcsBaseClientImpl(VcsBaseClientSettings *settings) :
|
|
d(new VcsBaseClientImplPrivate(settings))
|
|
{
|
|
connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
|
|
this, &VcsBaseClientImpl::saveSettings);
|
|
}
|
|
|
|
VcsBaseClientImpl::~VcsBaseClientImpl()
|
|
{
|
|
delete d;
|
|
}
|
|
|
|
VcsBaseClientSettings &VcsBaseClientImpl::settings() const
|
|
{
|
|
return *d->m_clientSettings;
|
|
}
|
|
|
|
Utils::FileName VcsBaseClientImpl::vcsBinary() const
|
|
{
|
|
return settings().binaryPath();
|
|
}
|
|
|
|
VcsCommand *VcsBaseClientImpl::createCommand(const QString &workingDirectory,
|
|
VcsBaseEditorWidget *editor,
|
|
JobOutputBindMode mode) const
|
|
{
|
|
auto cmd = new VcsCommand(workingDirectory, processEnvironment());
|
|
cmd->setDefaultTimeoutS(vcsTimeoutS());
|
|
if (editor)
|
|
editor->setCommand(cmd);
|
|
if (mode == VcsWindowOutputBind) {
|
|
cmd->addFlags(VcsCommand::ShowStdOut);
|
|
if (editor) // assume that the commands output is the important thing
|
|
cmd->addFlags(VcsCommand::SilentOutput);
|
|
} else if (editor) {
|
|
connect(cmd, &VcsCommand::stdOutText, editor, &VcsBaseEditorWidget::setPlainText);
|
|
}
|
|
|
|
return cmd;
|
|
}
|
|
|
|
void VcsBaseClientImpl::enqueueJob(VcsCommand *cmd, const QStringList &args,
|
|
const QString &workingDirectory,
|
|
const Utils::ExitCodeInterpreter &interpreter) const
|
|
{
|
|
cmd->addJob(vcsBinary(), args, vcsTimeoutS(), workingDirectory, interpreter);
|
|
cmd->execute();
|
|
}
|
|
|
|
QProcessEnvironment VcsBaseClientImpl::processEnvironment() const
|
|
{
|
|
QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
|
|
VcsBasePlugin::setProcessEnvironment(&environment, false);
|
|
return environment;
|
|
}
|
|
|
|
QString VcsBaseClientImpl::commandOutputFromLocal8Bit(const QByteArray &a)
|
|
{
|
|
return Utils::SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(a));
|
|
}
|
|
|
|
QStringList VcsBaseClientImpl::commandOutputLinesFromLocal8Bit(const QByteArray &a)
|
|
{
|
|
return splitLines(commandOutputFromLocal8Bit(a));
|
|
}
|
|
|
|
QStringList VcsBaseClientImpl::splitLines(const QString &s)
|
|
{
|
|
const QChar newLine = QLatin1Char('\n');
|
|
QString output = s;
|
|
if (output.endsWith(newLine))
|
|
output.truncate(output.size() - 1);
|
|
if (output.isEmpty())
|
|
return QStringList();
|
|
return output.split(newLine);
|
|
}
|
|
|
|
QString VcsBaseClientImpl::stripLastNewline(const QString &in)
|
|
{
|
|
if (in.endsWith('\n'))
|
|
return in.left(in.count() - 1);
|
|
return in;
|
|
}
|
|
|
|
void VcsBaseClientImpl::resetCachedVcsInfo(const QString &workingDir)
|
|
{
|
|
Core::VcsManager::resetVersionControlForDirectory(workingDir);
|
|
}
|
|
|
|
void VcsBaseClientImpl::annotateRevisionRequested(const QString &workingDirectory,
|
|
const QString &file, const QString &change,
|
|
int line)
|
|
{
|
|
QString changeCopy = change;
|
|
// This might be invoked with a verbose revision description
|
|
// "SHA1 author subject" from the annotation context menu. Strip the rest.
|
|
const int blankPos = changeCopy.indexOf(QLatin1Char(' '));
|
|
if (blankPos != -1)
|
|
changeCopy.truncate(blankPos);
|
|
annotate(workingDirectory, file, changeCopy, line);
|
|
}
|
|
|
|
Utils::SynchronousProcessResponse
|
|
VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const QStringList &args,
|
|
unsigned flags, int timeoutS, QTextCodec *codec) const
|
|
{
|
|
VcsCommand command(workingDir, processEnvironment());
|
|
command.addFlags(flags);
|
|
if (codec)
|
|
command.setCodec(codec);
|
|
return command.runCommand(vcsBinary(), args, (timeoutS > 0) ? timeoutS : vcsTimeoutS());
|
|
}
|
|
|
|
VcsCommand *VcsBaseClientImpl::vcsExec(const QString &workingDirectory, const QStringList &arguments,
|
|
VcsBaseEditorWidget *editor, bool useOutputToWindow,
|
|
unsigned additionalFlags, const QVariant &cookie) const
|
|
{
|
|
VcsCommand *command = createCommand(workingDirectory, editor,
|
|
useOutputToWindow ? VcsWindowOutputBind : NoOutputBind);
|
|
command->setCookie(cookie);
|
|
command->addFlags(additionalFlags);
|
|
if (editor)
|
|
command->setCodec(editor->codec());
|
|
enqueueJob(command, arguments);
|
|
return command;
|
|
}
|
|
|
|
Utils::SynchronousProcessResponse VcsBaseClientImpl::vcsSynchronousExec(const QString &workingDir,
|
|
const QStringList &args,
|
|
unsigned flags,
|
|
QTextCodec *outputCodec) const
|
|
{
|
|
return VcsBasePlugin::runVcs(workingDir, vcsBinary(), args, vcsTimeoutS(), flags,
|
|
outputCodec, processEnvironment());
|
|
}
|
|
|
|
int VcsBaseClientImpl::vcsTimeoutS() const
|
|
{
|
|
return settings().intValue(VcsBaseClientSettings::timeoutKey);
|
|
}
|
|
|
|
VcsBaseEditorWidget *VcsBaseClientImpl::createVcsEditor(Core::Id kind, QString title,
|
|
const QString &source, QTextCodec *codec,
|
|
const char *registerDynamicProperty,
|
|
const QString &dynamicPropertyValue) const
|
|
{
|
|
VcsBaseEditorWidget *baseEditor = 0;
|
|
Core::IEditor *outputEditor = locateEditor(registerDynamicProperty, dynamicPropertyValue);
|
|
const QString progressMsg = tr("Working...");
|
|
if (outputEditor) {
|
|
// Exists already
|
|
outputEditor->document()->setContents(progressMsg.toUtf8());
|
|
baseEditor = VcsBaseEditor::getVcsBaseEditor(outputEditor);
|
|
QTC_ASSERT(baseEditor, return 0);
|
|
Core::EditorManager::activateEditor(outputEditor);
|
|
} else {
|
|
outputEditor = Core::EditorManager::openEditorWithContents(kind, &title, progressMsg.toUtf8());
|
|
outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
|
|
baseEditor = VcsBaseEditor::getVcsBaseEditor(outputEditor);
|
|
QTC_ASSERT(baseEditor, return 0);
|
|
connect(baseEditor, &VcsBaseEditorWidget::annotateRevisionRequested,
|
|
this, &VcsBaseClientImpl::annotateRevisionRequested);
|
|
baseEditor->setSource(source);
|
|
if (codec)
|
|
baseEditor->setCodec(codec);
|
|
}
|
|
|
|
baseEditor->setForceReadOnly(true);
|
|
return baseEditor;
|
|
}
|
|
|
|
void VcsBaseClientImpl::saveSettings()
|
|
{
|
|
settings().writeSettings(Core::ICore::settings());
|
|
}
|
|
|
|
class VcsBaseClientPrivate
|
|
{
|
|
public:
|
|
VcsBaseEditorParameterWidget *createDiffEditor(VcsBaseEditorWidget *editor);
|
|
VcsBaseEditorParameterWidget *createLogEditor(VcsBaseEditorWidget *editor);
|
|
|
|
VcsBaseClient::ParameterWidgetCreator m_diffParamWidgetCreator;
|
|
VcsBaseClient::ParameterWidgetCreator m_logParamWidgetCreator;
|
|
};
|
|
|
|
VcsBaseEditorParameterWidget *VcsBaseClientPrivate::createDiffEditor(VcsBaseEditorWidget *editor)
|
|
{
|
|
return m_diffParamWidgetCreator ? m_diffParamWidgetCreator(editor->toolBar()) : 0;
|
|
}
|
|
|
|
VcsBaseEditorParameterWidget *VcsBaseClientPrivate::createLogEditor(VcsBaseEditorWidget *editor)
|
|
{
|
|
return m_logParamWidgetCreator ? m_logParamWidgetCreator(editor->toolBar()) : 0;
|
|
}
|
|
|
|
VcsBaseClient::StatusItem::StatusItem(const QString &s, const QString &f) :
|
|
flags(s), file(f)
|
|
{ }
|
|
|
|
VcsBaseClient::VcsBaseClient(VcsBaseClientSettings *settings) :
|
|
VcsBaseClientImpl(settings),
|
|
d(new VcsBaseClientPrivate)
|
|
{
|
|
qRegisterMetaType<QVariant>();
|
|
}
|
|
|
|
VcsBaseClient::~VcsBaseClient()
|
|
{
|
|
delete d;
|
|
}
|
|
|
|
bool VcsBaseClient::synchronousCreateRepository(const QString &workingDirectory,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(vcsCommandString(CreateRepositoryCommand));
|
|
args << extraOptions;
|
|
Utils::SynchronousProcessResponse result = vcsFullySynchronousExec(workingDirectory, args);
|
|
if (result.result != Utils::SynchronousProcessResponse::Finished)
|
|
return false;
|
|
VcsOutputWindow::append(result.stdOut());
|
|
|
|
resetCachedVcsInfo(workingDirectory);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool VcsBaseClient::synchronousClone(const QString &workingDir,
|
|
const QString &srcLocation,
|
|
const QString &dstLocation,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << vcsCommandString(CloneCommand)
|
|
<< extraOptions << srcLocation << dstLocation;
|
|
|
|
Utils::SynchronousProcessResponse result = vcsFullySynchronousExec(workingDir, args);
|
|
resetCachedVcsInfo(workingDir);
|
|
return result.result == Utils::SynchronousProcessResponse::Finished;
|
|
}
|
|
|
|
bool VcsBaseClient::synchronousAdd(const QString &workingDir, const QString &filename,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << vcsCommandString(AddCommand) << extraOptions << filename;
|
|
return vcsFullySynchronousExec(workingDir, args).result == Utils::SynchronousProcessResponse::Finished;
|
|
}
|
|
|
|
bool VcsBaseClient::synchronousRemove(const QString &workingDir, const QString &filename,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << vcsCommandString(RemoveCommand) << extraOptions << filename;
|
|
return vcsFullySynchronousExec(workingDir, args).result == Utils::SynchronousProcessResponse::Finished;
|
|
}
|
|
|
|
bool VcsBaseClient::synchronousMove(const QString &workingDir,
|
|
const QString &from, const QString &to,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << vcsCommandString(MoveCommand) << extraOptions << from << to;
|
|
return vcsFullySynchronousExec(workingDir, args).result == Utils::SynchronousProcessResponse::Finished;
|
|
}
|
|
|
|
bool VcsBaseClient::synchronousPull(const QString &workingDir,
|
|
const QString &srcLocation,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << vcsCommandString(PullCommand) << extraOptions << srcLocation;
|
|
// Disable UNIX terminals to suppress SSH prompting
|
|
const unsigned flags =
|
|
VcsCommand::SshPasswordPrompt
|
|
| VcsCommand::ShowStdOut
|
|
| VcsCommand::ShowSuccessMessage;
|
|
const Utils::SynchronousProcessResponse resp = vcsSynchronousExec(workingDir, args, flags);
|
|
const bool ok = resp.result == Utils::SynchronousProcessResponse::Finished;
|
|
if (ok)
|
|
emit changed(QVariant(workingDir));
|
|
return ok;
|
|
}
|
|
|
|
bool VcsBaseClient::synchronousPush(const QString &workingDir,
|
|
const QString &dstLocation,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << vcsCommandString(PushCommand) << extraOptions << dstLocation;
|
|
// Disable UNIX terminals to suppress SSH prompting
|
|
const unsigned flags =
|
|
VcsCommand::SshPasswordPrompt
|
|
| VcsCommand::ShowStdOut
|
|
| VcsCommand::ShowSuccessMessage;
|
|
const Utils::SynchronousProcessResponse resp = vcsSynchronousExec(workingDir, args, flags);
|
|
return resp.result == Utils::SynchronousProcessResponse::Finished;
|
|
}
|
|
|
|
VcsBaseEditorWidget *VcsBaseClient::annotate(
|
|
const QString &workingDir, const QString &file, const QString &revision /* = QString() */,
|
|
int lineNumber /* = -1 */, const QStringList &extraOptions)
|
|
{
|
|
const QString vcsCmdString = vcsCommandString(AnnotateCommand);
|
|
QStringList args;
|
|
args << vcsCmdString << revisionSpec(revision) << extraOptions << file;
|
|
const Core::Id kind = vcsEditorKind(AnnotateCommand);
|
|
const QString id = VcsBaseEditor::getSource(workingDir, QStringList(file));
|
|
const QString title = vcsEditorTitle(vcsCmdString, id);
|
|
const QString source = VcsBaseEditor::getSource(workingDir, file);
|
|
|
|
VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
|
|
VcsBaseEditor::getCodec(source),
|
|
vcsCmdString.toLatin1().constData(), id);
|
|
|
|
VcsCommand *cmd = createCommand(workingDir, editor);
|
|
cmd->setCookie(lineNumber);
|
|
enqueueJob(cmd, args);
|
|
return editor;
|
|
}
|
|
|
|
void VcsBaseClient::diff(const QString &workingDir, const QStringList &files,
|
|
const QStringList &extraOptions)
|
|
{
|
|
const QString vcsCmdString = vcsCommandString(DiffCommand);
|
|
const Core::Id kind = vcsEditorKind(DiffCommand);
|
|
const QString id = VcsBaseEditor::getTitleId(workingDir, files);
|
|
const QString title = vcsEditorTitle(vcsCmdString, id);
|
|
const QString source = VcsBaseEditor::getSource(workingDir, files);
|
|
VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
|
|
VcsBaseEditor::getCodec(source),
|
|
vcsCmdString.toLatin1().constData(), id);
|
|
editor->setWorkingDirectory(workingDir);
|
|
|
|
QStringList effectiveArgs = extraOptions;
|
|
if (!editor->configurationAdded()) {
|
|
if (VcsBaseEditorParameterWidget *paramWidget = d->createDiffEditor(editor)) {
|
|
// editor has been just created, createVcsEditor() didn't set a configuration widget yet
|
|
connect(editor, &VcsBaseEditorWidget::diffChunkReverted,
|
|
paramWidget, &VcsBaseEditorParameterWidget::executeCommand);
|
|
connect(paramWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested,
|
|
[=] { diff(workingDir, files, extraOptions + paramWidget->arguments()); } );
|
|
effectiveArgs = paramWidget->arguments();
|
|
editor->setConfigurationAdded();
|
|
}
|
|
}
|
|
|
|
QStringList args;
|
|
args << vcsCmdString << effectiveArgs << files;
|
|
QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VcsBaseEditor::getCodec(source);
|
|
VcsCommand *command = createCommand(workingDir, editor);
|
|
command->setCodec(codec);
|
|
enqueueJob(command, args, workingDir, exitCodeInterpreter(DiffCommand));
|
|
}
|
|
|
|
void VcsBaseClient::log(const QString &workingDir, const QStringList &files,
|
|
const QStringList &extraOptions,
|
|
bool enableAnnotationContextMenu)
|
|
{
|
|
const QString vcsCmdString = vcsCommandString(LogCommand);
|
|
const Core::Id kind = vcsEditorKind(LogCommand);
|
|
const QString id = VcsBaseEditor::getTitleId(workingDir, files);
|
|
const QString title = vcsEditorTitle(vcsCmdString, id);
|
|
const QString source = VcsBaseEditor::getSource(workingDir, files);
|
|
VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
|
|
VcsBaseEditor::getCodec(source),
|
|
vcsCmdString.toLatin1().constData(), id);
|
|
editor->setFileLogAnnotateEnabled(enableAnnotationContextMenu);
|
|
|
|
QStringList effectiveArgs = extraOptions;
|
|
if (!editor->configurationAdded()) {
|
|
if (VcsBaseEditorParameterWidget *paramWidget = d->createLogEditor(editor)) {
|
|
// editor has been just created, createVcsEditor() didn't set a configuration widget yet
|
|
connect(paramWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested,
|
|
[=]() { this->log(workingDir, files, extraOptions + paramWidget->arguments(),
|
|
enableAnnotationContextMenu); } );
|
|
effectiveArgs = paramWidget->arguments();
|
|
editor->setConfigurationAdded();
|
|
}
|
|
}
|
|
|
|
QStringList args;
|
|
args << vcsCmdString << effectiveArgs << files;
|
|
enqueueJob(createCommand(workingDir, editor), args);
|
|
}
|
|
|
|
void VcsBaseClient::revertFile(const QString &workingDir,
|
|
const QString &file,
|
|
const QString &revision,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(vcsCommandString(RevertCommand));
|
|
args << revisionSpec(revision) << extraOptions << file;
|
|
// Indicate repository change or file list
|
|
VcsCommand *cmd = createCommand(workingDir);
|
|
cmd->setCookie(QStringList(workingDir + QLatin1Char('/') + file));
|
|
connect(cmd, &VcsCommand::success, this, &VcsBaseClient::changed, Qt::QueuedConnection);
|
|
enqueueJob(cmd, args);
|
|
}
|
|
|
|
void VcsBaseClient::revertAll(const QString &workingDir, const QString &revision,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(vcsCommandString(RevertCommand));
|
|
args << revisionSpec(revision) << extraOptions;
|
|
// Indicate repository change or file list
|
|
VcsCommand *cmd = createCommand(workingDir);
|
|
cmd->setCookie(QStringList(workingDir));
|
|
connect(cmd, &VcsCommand::success, this, &VcsBaseClient::changed, Qt::QueuedConnection);
|
|
enqueueJob(createCommand(workingDir), args);
|
|
}
|
|
|
|
void VcsBaseClient::status(const QString &workingDir, const QString &file,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(vcsCommandString(StatusCommand));
|
|
args << extraOptions << file;
|
|
VcsOutputWindow::setRepository(workingDir);
|
|
VcsCommand *cmd = createCommand(workingDir, 0, VcsWindowOutputBind);
|
|
connect(cmd, &VcsCommand::finished,
|
|
VcsOutputWindow::instance(), &VcsOutputWindow::clearRepository,
|
|
Qt::QueuedConnection);
|
|
enqueueJob(cmd, args);
|
|
}
|
|
|
|
void VcsBaseClient::emitParsedStatus(const QString &repository, const QStringList &extraOptions)
|
|
{
|
|
QStringList args(vcsCommandString(StatusCommand));
|
|
args << extraOptions;
|
|
VcsCommand *cmd = createCommand(repository);
|
|
connect(cmd, &VcsCommand::stdOutText, this, &VcsBaseClient::statusParser);
|
|
enqueueJob(cmd, args);
|
|
}
|
|
|
|
QString VcsBaseClient::vcsCommandString(VcsCommandTag cmd) const
|
|
{
|
|
switch (cmd) {
|
|
case CreateRepositoryCommand: return QLatin1String("init");
|
|
case CloneCommand: return QLatin1String("clone");
|
|
case AddCommand: return QLatin1String("add");
|
|
case RemoveCommand: return QLatin1String("remove");
|
|
case MoveCommand: return QLatin1String("rename");
|
|
case PullCommand: return QLatin1String("pull");
|
|
case PushCommand: return QLatin1String("push");
|
|
case CommitCommand: return QLatin1String("commit");
|
|
case ImportCommand: return QLatin1String("import");
|
|
case UpdateCommand: return QLatin1String("update");
|
|
case RevertCommand: return QLatin1String("revert");
|
|
case AnnotateCommand: return QLatin1String("annotate");
|
|
case DiffCommand: return QLatin1String("diff");
|
|
case LogCommand: return QLatin1String("log");
|
|
case StatusCommand: return QLatin1String("status");
|
|
}
|
|
return QString();
|
|
}
|
|
|
|
Utils::ExitCodeInterpreter VcsBaseClient::exitCodeInterpreter(VcsCommandTag cmd) const
|
|
{
|
|
Q_UNUSED(cmd)
|
|
return Utils::defaultExitCodeInterpreter;
|
|
}
|
|
|
|
void VcsBaseClient::setDiffParameterWidgetCreator(ParameterWidgetCreator creator)
|
|
{
|
|
d->m_diffParamWidgetCreator = std::move(creator);
|
|
}
|
|
|
|
void VcsBaseClient::setLogParameterWidgetCreator(ParameterWidgetCreator creator)
|
|
{
|
|
d->m_logParamWidgetCreator = std::move(creator);
|
|
}
|
|
|
|
void VcsBaseClient::import(const QString &repositoryRoot, const QStringList &files,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(vcsCommandString(ImportCommand));
|
|
args << extraOptions << files;
|
|
enqueueJob(createCommand(repositoryRoot), args);
|
|
}
|
|
|
|
void VcsBaseClient::view(const QString &source, const QString &id,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << extraOptions << revisionSpec(id);
|
|
const Core::Id kind = vcsEditorKind(DiffCommand);
|
|
const QString title = vcsEditorTitle(vcsCommandString(LogCommand), id);
|
|
|
|
VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
|
|
VcsBaseEditor::getCodec(source), "view", id);
|
|
|
|
const QFileInfo fi(source);
|
|
const QString workingDirPath = fi.isFile() ? fi.absolutePath() : source;
|
|
enqueueJob(createCommand(workingDirPath, editor), args);
|
|
}
|
|
|
|
void VcsBaseClient::update(const QString &repositoryRoot, const QString &revision,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(vcsCommandString(UpdateCommand));
|
|
args << revisionSpec(revision) << extraOptions;
|
|
VcsCommand *cmd = createCommand(repositoryRoot);
|
|
cmd->setCookie(repositoryRoot);
|
|
connect(cmd, &VcsCommand::success, this, &VcsBaseClient::changed, Qt::QueuedConnection);
|
|
enqueueJob(cmd, args);
|
|
}
|
|
|
|
void VcsBaseClient::commit(const QString &repositoryRoot,
|
|
const QStringList &files,
|
|
const QString &commitMessageFile,
|
|
const QStringList &extraOptions)
|
|
{
|
|
// Handling of commitMessageFile is a bit tricky :
|
|
// VcsBaseClient cannot do something with it because it doesn't know which
|
|
// option to use (-F ? but sub VCS clients might require a different option
|
|
// name like -l for hg ...)
|
|
//
|
|
// So descendants of VcsBaseClient *must* redefine commit() and extend
|
|
// extraOptions with the usage for commitMessageFile (see BazaarClient::commit()
|
|
// for example)
|
|
QStringList args(vcsCommandString(CommitCommand));
|
|
args << extraOptions << files;
|
|
VcsCommand *cmd = createCommand(repositoryRoot, 0, VcsWindowOutputBind);
|
|
if (!commitMessageFile.isEmpty())
|
|
connect(cmd, &VcsCommand::finished, [commitMessageFile]() { QFile(commitMessageFile).remove(); });
|
|
enqueueJob(cmd, args);
|
|
}
|
|
|
|
QString VcsBaseClient::vcsEditorTitle(const QString &vcsCmd, const QString &sourceId) const
|
|
{
|
|
return vcsBinary().toFileInfo().baseName() +
|
|
QLatin1Char(' ') + vcsCmd + QLatin1Char(' ') +
|
|
Utils::FileName::fromString(sourceId).fileName();
|
|
}
|
|
|
|
void VcsBaseClient::statusParser(const QString &text)
|
|
{
|
|
QList<VcsBaseClient::StatusItem> lineInfoList;
|
|
|
|
QStringList rawStatusList = text.split(QLatin1Char('\n'));
|
|
|
|
foreach (const QString &string, rawStatusList) {
|
|
const VcsBaseClient::StatusItem lineInfo = parseStatusLine(string);
|
|
if (!lineInfo.flags.isEmpty() && !lineInfo.file.isEmpty())
|
|
lineInfoList.append(lineInfo);
|
|
}
|
|
|
|
emit parsedStatus(lineInfoList);
|
|
}
|
|
|
|
} // namespace VcsBase
|
|
|
|
#include "moc_vcsbaseclient.cpp"
|