2013-10-15 20:03:22 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
2015-01-14 18:07:15 +01:00
|
|
|
** Copyright (C) 2015 The Qt Company Ltd.
|
|
|
|
|
** Contact: http://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
|
2015-01-14 18:07:15 +01:00
|
|
|
** a written agreement between you and The Qt Company. For licensing terms and
|
|
|
|
|
** conditions see http://www.qt.io/terms-conditions. For further information
|
2014-10-01 13:21:18 +02:00
|
|
|
** use the contact form at http://www.qt.io/contact-us.
|
2013-10-15 20:03:22 +02:00
|
|
|
**
|
|
|
|
|
** GNU Lesser General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
2014-10-01 13:21:18 +02:00
|
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
|
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
|
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
|
|
|
** following information to ensure the GNU Lesser General Public License
|
|
|
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
|
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
2013-10-15 20:03:22 +02:00
|
|
|
**
|
2015-01-14 18:07:15 +01:00
|
|
|
** In addition, as a special exception, The Qt Company gives you certain additional
|
|
|
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
2013-10-15 20:03:22 +02:00
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "cvsclient.h"
|
|
|
|
|
#include "cvssettings.h"
|
|
|
|
|
#include "cvsconstants.h"
|
|
|
|
|
|
|
|
|
|
#include <vcsbase/vcsbaseplugin.h>
|
|
|
|
|
#include <vcsbase/vcsbaseeditor.h>
|
|
|
|
|
#include <vcsbase/vcsbaseconstants.h>
|
|
|
|
|
#include <vcsbase/vcsbaseeditorparameterwidget.h>
|
|
|
|
|
#include <utils/synchronousprocess.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 {
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
class CvsDiffExitCodeInterpreter : public ExitCodeInterpreter
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
Q_OBJECT
|
|
|
|
|
public:
|
2014-08-27 18:55:41 +02:00
|
|
|
CvsDiffExitCodeInterpreter(QObject *parent) : ExitCodeInterpreter(parent) {}
|
|
|
|
|
SynchronousProcessResponse::Result interpretExitCode(int code) const;
|
2013-10-15 20:03:22 +02:00
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
SynchronousProcessResponse::Result CvsDiffExitCodeInterpreter::interpretExitCode(int code) const
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
if (code < 0 || code > 2)
|
2014-08-27 18:55:41 +02:00
|
|
|
return SynchronousProcessResponse::FinishedError;
|
|
|
|
|
return SynchronousProcessResponse::Finished;
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 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-01-20 17:42:16 +01:00
|
|
|
explicit CvsDiffParameterWidget(CvsSettings *settings, QWidget *parent = 0);
|
2013-10-15 20:03:22 +02:00
|
|
|
QStringList arguments() const;
|
|
|
|
|
|
|
|
|
|
private:
|
2015-01-20 17:42:16 +01:00
|
|
|
const CvsSettings *m_settings;
|
2013-10-15 20:03:22 +02:00
|
|
|
};
|
|
|
|
|
|
2015-01-20 17:42:16 +01:00
|
|
|
CvsDiffParameterWidget::CvsDiffParameterWidget(CvsSettings *settings, QWidget *parent)
|
|
|
|
|
: VcsBaseEditorParameterWidget(parent),
|
|
|
|
|
m_settings(settings)
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
|
2015-01-20 17:42:16 +01:00
|
|
|
settings->boolPointer(CvsSettings::diffIgnoreWhiteSpaceKey));
|
2013-10-15 20:03:22 +02:00
|
|
|
mapSetting(addToggleButton(QLatin1String("-B"), tr("Ignore Blank Lines")),
|
2015-01-20 17:42:16 +01:00
|
|
|
settings->boolPointer(CvsSettings::diffIgnoreBlankLinesKey));
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList CvsDiffParameterWidget::arguments() const
|
|
|
|
|
{
|
|
|
|
|
QStringList args;
|
2015-01-20 17:42:16 +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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CvsClient::CvsClient(CvsSettings *settings) :
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsBaseClient(settings)
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
2015-01-20 17:42:16 +01:00
|
|
|
setDiffParameterWidgetCreator([=] { return new CvsDiffParameterWidget(settings); });
|
2013-10-15 20:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CvsSettings *CvsClient::settings() const
|
|
|
|
|
{
|
2014-08-27 18:55:41 +02:00
|
|
|
return dynamic_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();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
ExitCodeInterpreter *CvsClient::exitCodeInterpreter(VcsCommandTag cmd, QObject *parent) const
|
2013-10-15 20:03:22 +02:00
|
|
|
{
|
|
|
|
|
switch (cmd) {
|
|
|
|
|
case DiffCommand:
|
|
|
|
|
return new CvsDiffExitCodeInterpreter(parent);
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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"
|