2013-10-15 20:03:22 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
2013-10-15 20:03:22 +02:00
|
|
|
**
|
|
|
|
|
** 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
|
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.
|
2013-10-15 20:03:22 +02: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.
|
2013-10-15 20:03:22 +02:00
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "cvsclient.h"
|
|
|
|
|
#include "cvssettings.h"
|
|
|
|
|
|
|
|
|
|
#include <vcsbase/vcsbaseplugin.h>
|
|
|
|
|
#include <vcsbase/vcsbaseeditor.h>
|
|
|
|
|
#include <vcsbase/vcsbaseconstants.h>
|
|
|
|
|
#include <vcsbase/vcsbaseeditorparameterwidget.h>
|
|
|
|
|
|
|
|
|
|
#include <QDir>
|
|
|
|
|
#include <QFileInfo>
|
|
|
|
|
#include <QTextStream>
|
|
|
|
|
#include <QDebug>
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
using namespace Utils;
|
|
|
|
|
using namespace VcsBase;
|
|
|
|
|
|
2013-10-15 20:03:22 +02:00
|
|
|
namespace Cvs {
|
|
|
|
|
namespace Internal {
|
|
|
|
|
|
|
|
|
|
// Parameter widget controlling whitespace diff mode, associated with a parameter
|
2014-08-27 18:55:41 +02:00
|
|
|
class CvsDiffParameterWidget : public VcsBaseEditorParameterWidget
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
Q_OBJECT
|
|
|
|
|
public:
|
2015-03-26 12:22:29 +01:00
|
|
|
explicit CvsDiffParameterWidget(VcsBaseClientSettings &settings, QWidget *parent = 0);
|
2013-10-15 20:03:22 +02:00
|
|
|
QStringList arguments() const;
|
|
|
|
|
|
|
|
|
|
private:
|
2015-03-26 12:22:29 +01:00
|
|
|
VcsBaseClientSettings &m_settings;
|
2013-10-15 20:03:22 +02:00
|
|
|
};
|
|
|
|
|
|
2015-03-26 12:22:29 +01:00
|
|
|
CvsDiffParameterWidget::CvsDiffParameterWidget(VcsBaseClientSettings &settings,
|
|
|
|
|
QWidget *parent) :
|
|
|
|
|
VcsBaseEditorParameterWidget(parent),
|
|
|
|
|
m_settings(settings)
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
|
2015-03-26 12:22:29 +01:00
|
|
|
settings.boolPointer(CvsSettings::diffIgnoreWhiteSpaceKey));
|
2013-10-15 20:03:22 +02:00
|
|
|
mapSetting(addToggleButton(QLatin1String("-B"), tr("Ignore Blank Lines")),
|
2015-03-26 12:22:29 +01:00
|
|
|
settings.boolPointer(CvsSettings::diffIgnoreBlankLinesKey));
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList CvsDiffParameterWidget::arguments() const
|
|
|
|
|
{
|
|
|
|
|
QStringList args;
|
2015-03-26 12:22:29 +01:00
|
|
|
args = m_settings.stringValue(CvsSettings::diffOptionsKey).split(QLatin1Char(' '),
|
|
|
|
|
QString::SkipEmptyParts);
|
2013-10-15 20:03:22 +02:00
|
|
|
args += VcsBaseEditorParameterWidget::arguments();
|
|
|
|
|
return args;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-26 12:22:29 +01:00
|
|
|
CvsClient::CvsClient() : VcsBaseClient(new CvsSettings)
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
2015-03-26 12:22:29 +01:00
|
|
|
setDiffParameterWidgetCreator([this] { return new CvsDiffParameterWidget(settings()); });
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
2015-03-26 12:22:29 +01:00
|
|
|
CvsSettings &CvsClient::settings() const
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
2015-03-26 12:22:29 +01:00
|
|
|
return static_cast<CvsSettings &>(VcsBaseClient::settings());
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
Core::Id CvsClient::vcsEditorKind(VcsCommandTag cmd) const
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
switch (cmd) {
|
|
|
|
|
case DiffCommand:
|
|
|
|
|
return "CVS Diff Editor"; // TODO: replace by string from cvsconstants.h
|
|
|
|
|
default:
|
|
|
|
|
return Core::Id();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-25 14:40:42 +02:00
|
|
|
ExitCodeInterpreter CvsClient::exitCodeInterpreter(VcsCommandTag cmd) const
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
2016-04-25 14:40:42 +02:00
|
|
|
if (cmd == DiffCommand) {
|
|
|
|
|
return [](int code) {
|
|
|
|
|
return (code < 0 || code > 2) ? SynchronousProcessResponse::FinishedError
|
|
|
|
|
: SynchronousProcessResponse::Finished;
|
|
|
|
|
};
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
2016-04-25 14:40:42 +02:00
|
|
|
return Utils::defaultExitCodeInterpreter;
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CvsClient::diff(const QString &workingDir, const QStringList &files,
|
|
|
|
|
const QStringList &extraOptions)
|
|
|
|
|
{
|
|
|
|
|
VcsBaseClient::diff(workingDir, files, extraOptions);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString CvsClient::findTopLevelForFile(const QFileInfo &file) const
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(file)
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList CvsClient::revisionSpec(const QString &revision) const
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(revision)
|
|
|
|
|
return QStringList();
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsBaseClient::StatusItem CvsClient::parseStatusLine(const QString &line) const
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
Q_UNUSED(line)
|
2014-08-27 18:55:41 +02:00
|
|
|
return VcsBaseClient::StatusItem();
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace Internal
|
|
|
|
|
} // namespace Cvs
|
|
|
|
|
|
|
|
|
|
#include "cvsclient.moc"
|