forked from qt-creator/qt-creator
Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
187 lines
5.7 KiB
C++
187 lines
5.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** 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 Digia. For licensing terms and
|
|
** conditions see http://www.qt.io/licensing. For further information
|
|
** use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** 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.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** 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>
|
|
|
|
using namespace Utils;
|
|
using namespace VcsBase;
|
|
|
|
namespace Cvs {
|
|
namespace Internal {
|
|
|
|
class CvsDiffExitCodeInterpreter : public ExitCodeInterpreter
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
CvsDiffExitCodeInterpreter(QObject *parent) : ExitCodeInterpreter(parent) {}
|
|
SynchronousProcessResponse::Result interpretExitCode(int code) const;
|
|
|
|
};
|
|
|
|
SynchronousProcessResponse::Result CvsDiffExitCodeInterpreter::interpretExitCode(int code) const
|
|
{
|
|
if (code < 0 || code > 2)
|
|
return SynchronousProcessResponse::FinishedError;
|
|
return SynchronousProcessResponse::Finished;
|
|
}
|
|
|
|
// Collect all parameters required for a diff to be able to associate them
|
|
// with a diff editor and re-run the diff with parameters.
|
|
struct CvsDiffParameters
|
|
{
|
|
QString workingDir;
|
|
QStringList extraOptions;
|
|
QStringList files;
|
|
};
|
|
|
|
// Parameter widget controlling whitespace diff mode, associated with a parameter
|
|
class CvsDiffParameterWidget : public VcsBaseEditorParameterWidget
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit CvsDiffParameterWidget(CvsClient *client,
|
|
const CvsDiffParameters &p,
|
|
QWidget *parent = 0);
|
|
QStringList arguments() const;
|
|
void executeCommand();
|
|
|
|
private:
|
|
|
|
CvsClient *m_client;
|
|
const CvsDiffParameters m_params;
|
|
};
|
|
|
|
CvsDiffParameterWidget::CvsDiffParameterWidget(CvsClient *client,
|
|
const CvsDiffParameters &p,
|
|
QWidget *parent)
|
|
: VcsBaseEditorParameterWidget(parent), m_client(client), m_params(p)
|
|
{
|
|
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
|
|
client->settings()->boolPointer(CvsSettings::diffIgnoreWhiteSpaceKey));
|
|
mapSetting(addToggleButton(QLatin1String("-B"), tr("Ignore Blank Lines")),
|
|
client->settings()->boolPointer(CvsSettings::diffIgnoreBlankLinesKey));
|
|
}
|
|
|
|
QStringList CvsDiffParameterWidget::arguments() const
|
|
{
|
|
QStringList args;
|
|
args = m_client->settings()->stringValue(CvsSettings::diffOptionsKey).split(QLatin1Char(' '), QString::SkipEmptyParts);
|
|
args += VcsBaseEditorParameterWidget::arguments();
|
|
return args;
|
|
}
|
|
|
|
void CvsDiffParameterWidget::executeCommand()
|
|
{
|
|
m_client->diff(m_params.workingDir, m_params.files, m_params.extraOptions);
|
|
}
|
|
|
|
CvsClient::CvsClient(CvsSettings *settings) :
|
|
VcsBaseClient(settings)
|
|
{
|
|
}
|
|
|
|
CvsSettings *CvsClient::settings() const
|
|
{
|
|
return dynamic_cast<CvsSettings *>(VcsBaseClient::settings());
|
|
}
|
|
|
|
Core::Id CvsClient::vcsEditorKind(VcsCommandTag cmd) const
|
|
{
|
|
switch (cmd) {
|
|
case DiffCommand:
|
|
return "CVS Diff Editor"; // TODO: replace by string from cvsconstants.h
|
|
default:
|
|
return Core::Id();
|
|
}
|
|
}
|
|
|
|
ExitCodeInterpreter *CvsClient::exitCodeInterpreter(VcsCommandTag cmd, QObject *parent) const
|
|
{
|
|
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();
|
|
}
|
|
|
|
VcsBaseClient::StatusItem CvsClient::parseStatusLine(const QString &line) const
|
|
{
|
|
Q_UNUSED(line)
|
|
return VcsBaseClient::StatusItem();
|
|
}
|
|
|
|
VcsBaseEditorParameterWidget *CvsClient::createDiffEditor(
|
|
const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
|
|
{
|
|
Q_UNUSED(extraOptions)
|
|
CvsDiffParameters p;
|
|
p.workingDir = workingDir;
|
|
p.files = files;
|
|
p.extraOptions = extraOptions;
|
|
return new CvsDiffParameterWidget(this, p);
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Cvs
|
|
|
|
#include "cvsclient.moc"
|