2013-09-27 15:39:16 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
2014-01-08 12:00:22 +01:00
|
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
2013-09-27 15:39:16 +02:00
|
|
|
** 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
|
2014-10-01 13:21:18 +02:00
|
|
|
** conditions see http://www.qt.io/licensing. For further information
|
|
|
|
|
** use the contact form at http://www.qt.io/contact-us.
|
2013-09-27 15:39:16 +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-09-27 15:39:16 +02:00
|
|
|
**
|
|
|
|
|
** 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 "subversionclient.h"
|
|
|
|
|
#include "subversionsettings.h"
|
2014-05-19 18:40:37 +02:00
|
|
|
#include "subversionconstants.h"
|
2013-09-27 15:39:16 +02:00
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
#include <vcsbase/vcscommand.h>
|
2013-09-27 15:39:16 +02:00
|
|
|
#include <vcsbase/vcsbaseplugin.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-09-27 15:39:16 +02:00
|
|
|
namespace Subversion {
|
|
|
|
|
namespace Internal {
|
|
|
|
|
|
|
|
|
|
// 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 SubversionDiffParameters
|
|
|
|
|
{
|
|
|
|
|
QString workingDir;
|
|
|
|
|
QStringList extraOptions;
|
|
|
|
|
QStringList files;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Parameter widget controlling whitespace diff mode, associated with a parameter
|
2014-08-27 18:55:41 +02:00
|
|
|
class SubversionDiffParameterWidget : public VcsBaseEditorParameterWidget
|
2013-09-27 15:39:16 +02:00
|
|
|
{
|
|
|
|
|
Q_OBJECT
|
|
|
|
|
public:
|
|
|
|
|
explicit SubversionDiffParameterWidget(SubversionClient *client,
|
|
|
|
|
const SubversionDiffParameters &p,
|
|
|
|
|
QWidget *parent = 0);
|
|
|
|
|
QStringList arguments() const;
|
|
|
|
|
void executeCommand();
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
SubversionClient *m_client;
|
|
|
|
|
const SubversionDiffParameters m_params;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
SubversionDiffParameterWidget::SubversionDiffParameterWidget(SubversionClient *client,
|
|
|
|
|
const SubversionDiffParameters &p,
|
|
|
|
|
QWidget *parent)
|
2014-08-27 18:55:41 +02:00
|
|
|
: VcsBaseEditorParameterWidget(parent), m_client(client), m_params(p)
|
2013-09-27 15:39:16 +02:00
|
|
|
{
|
|
|
|
|
mapSetting(addToggleButton(QLatin1String("w"), tr("Ignore Whitespace")),
|
|
|
|
|
client->settings()->boolPointer(SubversionSettings::diffIgnoreWhiteSpaceKey));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList SubversionDiffParameterWidget::arguments() const
|
|
|
|
|
{
|
|
|
|
|
QStringList args;
|
|
|
|
|
// Subversion wants" -x -<ext-args>", default being -u
|
|
|
|
|
const QStringList formatArguments = VcsBaseEditorParameterWidget::arguments();
|
|
|
|
|
if (!formatArguments.isEmpty()) {
|
|
|
|
|
args << QLatin1String("-x")
|
|
|
|
|
<< (QLatin1String("-u") + formatArguments.join(QString()));
|
|
|
|
|
}
|
|
|
|
|
return args;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SubversionDiffParameterWidget::executeCommand()
|
|
|
|
|
{
|
|
|
|
|
m_client->diff(m_params.workingDir, m_params.files, m_params.extraOptions);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SubversionClient::SubversionClient(SubversionSettings *settings) :
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsBaseClient(settings)
|
2013-09-27 15:39:16 +02:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SubversionSettings *SubversionClient::settings() const
|
|
|
|
|
{
|
2014-08-27 18:55:41 +02:00
|
|
|
return dynamic_cast<SubversionSettings *>(VcsBaseClient::settings());
|
2013-09-27 15:39:16 +02:00
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsCommand *SubversionClient::createCommitCmd(const QString &repositoryRoot,
|
|
|
|
|
const QStringList &files,
|
|
|
|
|
const QString &commitMessageFile,
|
|
|
|
|
const QStringList &extraOptions) const
|
2014-05-19 18:40:37 +02:00
|
|
|
{
|
|
|
|
|
const QStringList svnExtraOptions =
|
|
|
|
|
QStringList(extraOptions)
|
|
|
|
|
<< authenticationOptions(SubversionClient::CommitCommand)
|
|
|
|
|
<< QLatin1String(Constants::NON_INTERACTIVE_OPTION)
|
2014-11-05 12:15:42 +01:00
|
|
|
<< QLatin1String("--encoding") << QLatin1String("utf8")
|
2014-05-19 18:40:37 +02:00
|
|
|
<< QLatin1String("--file") << commitMessageFile;
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsCommand *cmd = createCommand(repositoryRoot);
|
2014-11-04 20:38:32 +02:00
|
|
|
cmd->addFlags(VcsBasePlugin::ShowStdOutInLogWindow);
|
2014-05-19 18:40:37 +02:00
|
|
|
QStringList args(vcsCommandString(CommitCommand));
|
|
|
|
|
cmd->addJob(args << svnExtraOptions << files);
|
|
|
|
|
return cmd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SubversionClient::commit(const QString &repositoryRoot,
|
|
|
|
|
const QStringList &files,
|
|
|
|
|
const QString &commitMessageFile,
|
|
|
|
|
const QStringList &extraOptions)
|
|
|
|
|
{
|
|
|
|
|
if (Subversion::Constants::debug)
|
|
|
|
|
qDebug() << Q_FUNC_INFO << commitMessageFile << files;
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsCommand *cmd = createCommitCmd(repositoryRoot, files, commitMessageFile, extraOptions);
|
2014-05-19 18:40:37 +02:00
|
|
|
cmd->execute();
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
Core::Id SubversionClient::vcsEditorKind(VcsCommandTag cmd) const
|
2013-09-27 15:39:16 +02:00
|
|
|
{
|
|
|
|
|
switch (cmd) {
|
|
|
|
|
case DiffCommand:
|
|
|
|
|
return "Subversion Diff Editor"; // TODO: create subversionconstants.h
|
|
|
|
|
default:
|
|
|
|
|
return Core::Id();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SubversionClient::Version SubversionClient::svnVersion()
|
|
|
|
|
{
|
|
|
|
|
if (m_svnVersionBinary != settings()->binaryPath()) {
|
|
|
|
|
QStringList args;
|
|
|
|
|
args << QLatin1String("--version") << QLatin1String("-q");
|
2014-08-27 18:55:41 +02:00
|
|
|
const SynchronousProcessResponse response =
|
|
|
|
|
VcsBasePlugin::runVcs(QDir().absolutePath(), settings()->binaryPath(),
|
|
|
|
|
args, settings()->timeOutMs());
|
|
|
|
|
if (response.result == SynchronousProcessResponse::Finished &&
|
2013-09-27 15:39:16 +02:00
|
|
|
response.exitCode == 0) {
|
|
|
|
|
m_svnVersionBinary = settings()->binaryPath();
|
|
|
|
|
m_svnVersion = response.stdOut.trimmed();
|
|
|
|
|
} else {
|
|
|
|
|
m_svnVersionBinary.clear();
|
|
|
|
|
m_svnVersion.clear();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SubversionClient::Version v;
|
|
|
|
|
if (::sscanf(m_svnVersion.toLatin1().constData(), "%d.%d.%d",
|
|
|
|
|
&v.majorVersion, &v.minorVersion, &v.patchVersion) != 3) {
|
|
|
|
|
v.majorVersion = v.minorVersion = v.patchVersion = -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
QStringList SubversionClient::authenticationOptions(VcsCommandTag cmd) const
|
2014-05-19 18:40:37 +02:00
|
|
|
{
|
|
|
|
|
const bool hasAuth = settings()->hasAuthentication();
|
|
|
|
|
const QString userName = hasAuth ? settings()->stringValue(SubversionSettings::userKey) : QString();
|
|
|
|
|
const QString password = hasAuth ? settings()->stringValue(SubversionSettings::passwordKey) : QString();
|
|
|
|
|
QStringList args(vcsCommandString(cmd));
|
|
|
|
|
args = SubversionClient::addAuthenticationOptions(args, userName, password);
|
|
|
|
|
args.removeFirst();
|
|
|
|
|
return args;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-27 15:39:16 +02:00
|
|
|
// Add authorization options to the command line arguments.
|
|
|
|
|
// SVN pre 1.5 does not accept "--userName" for "add", which is most likely
|
|
|
|
|
// an oversight. As no password is needed for the option, generally omit it.
|
|
|
|
|
QStringList SubversionClient::addAuthenticationOptions(const QStringList &args,
|
|
|
|
|
const QString &userName,
|
|
|
|
|
const QString &password)
|
|
|
|
|
{
|
|
|
|
|
if (userName.isEmpty())
|
|
|
|
|
return args;
|
|
|
|
|
if (!args.empty() && args.front() == QLatin1String("add"))
|
|
|
|
|
return args;
|
|
|
|
|
QStringList rc;
|
|
|
|
|
rc.push_back(QLatin1String("--username"));
|
|
|
|
|
rc.push_back(userName);
|
|
|
|
|
if (!password.isEmpty()) {
|
|
|
|
|
rc.push_back(QLatin1String("--password"));
|
|
|
|
|
rc.push_back(password);
|
|
|
|
|
}
|
|
|
|
|
rc.append(args);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-04 16:35:14 +01:00
|
|
|
QString SubversionClient::synchronousTopic(const QString &repository)
|
|
|
|
|
{
|
|
|
|
|
QStringList args;
|
|
|
|
|
args << QLatin1String("info");
|
|
|
|
|
|
|
|
|
|
QByteArray stdOut;
|
|
|
|
|
if (!vcsFullySynchronousExec(repository, args, &stdOut))
|
|
|
|
|
return QString();
|
|
|
|
|
|
|
|
|
|
const QString revisionString = QLatin1String("Revision: ");
|
|
|
|
|
// stdOut is ASCII only (at least in those areas we care about).
|
|
|
|
|
QString output = SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(stdOut));
|
|
|
|
|
foreach (const QString &line, output.split(QLatin1Char('\n'))) {
|
|
|
|
|
if (line.startsWith(revisionString))
|
|
|
|
|
return QString::fromLatin1("r") + line.mid(revisionString.count());
|
|
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-27 15:39:16 +02:00
|
|
|
void SubversionClient::diff(const QString &workingDir, const QStringList &files,
|
|
|
|
|
const QStringList &extraOptions)
|
|
|
|
|
{
|
|
|
|
|
QStringList args(extraOptions);
|
2014-11-05 17:53:57 +01:00
|
|
|
args.append(QLatin1String("--internal-diff"));
|
2013-09-27 15:39:16 +02:00
|
|
|
|
|
|
|
|
const bool hasAuth = settings()->hasAuthentication();
|
|
|
|
|
const QString userName = hasAuth ? settings()->stringValue(SubversionSettings::userKey) : QString();
|
|
|
|
|
const QString password = hasAuth ? settings()->stringValue(SubversionSettings::passwordKey) : QString();
|
|
|
|
|
args = addAuthenticationOptions(args, userName, password);
|
|
|
|
|
|
|
|
|
|
VcsBaseClient::diff(workingDir, files, args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString SubversionClient::findTopLevelForFile(const QFileInfo &file) const
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(file)
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList SubversionClient::revisionSpec(const QString &revision) const
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(revision)
|
|
|
|
|
return QStringList();
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsBaseClient::StatusItem SubversionClient::parseStatusLine(const QString &line) const
|
2013-09-27 15:39:16 +02:00
|
|
|
{
|
|
|
|
|
Q_UNUSED(line)
|
2014-08-27 18:55:41 +02:00
|
|
|
return VcsBaseClient::StatusItem();
|
2013-09-27 15:39:16 +02:00
|
|
|
}
|
|
|
|
|
|
2014-08-27 18:55:41 +02:00
|
|
|
VcsBaseEditorParameterWidget *SubversionClient::createDiffEditor(
|
2013-09-27 15:39:16 +02:00
|
|
|
const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(extraOptions)
|
|
|
|
|
SubversionDiffParameters p;
|
|
|
|
|
p.workingDir = workingDir;
|
|
|
|
|
p.files = files;
|
|
|
|
|
p.extraOptions = extraOptions;
|
|
|
|
|
return new SubversionDiffParameterWidget(this, p);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace Internal
|
|
|
|
|
} // namespace Subversion
|
|
|
|
|
|
|
|
|
|
#include "subversionclient.moc"
|