2009-02-25 09:15:00 +01:00
|
|
|
/**************************************************************************
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator
|
|
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2009-06-17 00:01:27 +10:00
|
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** Commercial Usage
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** Licensees holding valid Qt Commercial licenses may use this file in
|
|
|
|
|
** accordance with the Qt Commercial License Agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
|
** a written agreement between you and Nokia.
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** GNU Lesser General Public License Usage
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
|
|
** General Public License version 2.1 as published by the Free Software
|
|
|
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
|
|
|
** packaging of this file. Please review the following information to
|
|
|
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
|
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** If you are unsure which license is appropriate for your use, please
|
2009-08-14 09:30:56 +02:00
|
|
|
** contact the sales department at http://qt.nokia.com/contact.
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
**************************************************************************/
|
2008-12-02 16:19:05 +01:00
|
|
|
|
2008-12-02 12:01:29 +01:00
|
|
|
#include "subversionsettings.h"
|
|
|
|
|
|
|
|
|
|
#include <QtCore/QSettings>
|
|
|
|
|
#include <QtCore/QTextStream>
|
|
|
|
|
|
|
|
|
|
static const char *groupC = "Subversion";
|
|
|
|
|
static const char *commandKeyC = "Command";
|
|
|
|
|
static const char *userKeyC = "User";
|
|
|
|
|
static const char *passwordKeyC = "Password";
|
|
|
|
|
static const char *authenticationKeyC = "Authentication";
|
|
|
|
|
|
|
|
|
|
static const char *userNameOptionC = "--username";
|
|
|
|
|
static const char *passwordOptionC = "--password";
|
2009-06-19 16:34:38 +02:00
|
|
|
static const char *promptToSubmitKeyC = "PromptForSubmit";
|
2009-12-14 12:45:45 +01:00
|
|
|
static const char *timeOutKeyC = "TimeOut";
|
|
|
|
|
|
|
|
|
|
enum { defaultTimeOutS = 30 };
|
2008-12-02 12:01:29 +01:00
|
|
|
|
|
|
|
|
static QString defaultCommand()
|
|
|
|
|
{
|
|
|
|
|
QString rc;
|
|
|
|
|
rc = QLatin1String("svn");
|
|
|
|
|
#if defined(Q_OS_WIN32)
|
|
|
|
|
rc.append(QLatin1String(".exe"));
|
|
|
|
|
#endif
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2008-12-02 16:19:05 +01:00
|
|
|
using namespace Subversion::Internal;
|
2008-12-02 12:01:29 +01:00
|
|
|
|
|
|
|
|
SubversionSettings::SubversionSettings() :
|
|
|
|
|
svnCommand(defaultCommand()),
|
2009-06-19 16:34:38 +02:00
|
|
|
useAuthentication(false),
|
2009-12-14 12:45:45 +01:00
|
|
|
timeOutS(defaultTimeOutS),
|
2009-06-19 16:34:38 +02:00
|
|
|
promptToSubmit(true)
|
2008-12-02 12:01:29 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SubversionSettings::fromSettings(QSettings *settings)
|
|
|
|
|
{
|
|
|
|
|
settings->beginGroup(QLatin1String(groupC));
|
|
|
|
|
svnCommand = settings->value(QLatin1String(commandKeyC), defaultCommand()).toString();
|
|
|
|
|
useAuthentication = settings->value(QLatin1String(authenticationKeyC), QVariant(false)).toBool();
|
|
|
|
|
user = settings->value(QLatin1String(userKeyC), QString()).toString();
|
|
|
|
|
password = settings->value(QLatin1String(passwordKeyC), QString()).toString();
|
2009-12-14 12:45:45 +01:00
|
|
|
timeOutS = settings->value(QLatin1String(timeOutKeyC), defaultTimeOutS).toInt();
|
2009-06-19 16:34:38 +02:00
|
|
|
promptToSubmit = settings->value(QLatin1String(promptToSubmitKeyC), true).toBool();
|
2008-12-02 12:01:29 +01:00
|
|
|
settings->endGroup();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SubversionSettings::toSettings(QSettings *settings) const
|
|
|
|
|
{
|
|
|
|
|
settings->beginGroup(QLatin1String(groupC));
|
|
|
|
|
settings->setValue(QLatin1String(commandKeyC), svnCommand);
|
|
|
|
|
settings->setValue(QLatin1String(authenticationKeyC), QVariant(useAuthentication));
|
|
|
|
|
settings->setValue(QLatin1String(userKeyC), user);
|
|
|
|
|
settings->setValue(QLatin1String(passwordKeyC), password);
|
2009-06-19 16:34:38 +02:00
|
|
|
settings->setValue(QLatin1String(promptToSubmitKeyC), promptToSubmit);
|
2009-12-14 12:45:45 +01:00
|
|
|
settings->setValue(QLatin1String(timeOutKeyC), timeOutS);
|
2008-12-02 12:01:29 +01:00
|
|
|
settings->endGroup();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool SubversionSettings::equals(const SubversionSettings &s) const
|
|
|
|
|
{
|
|
|
|
|
return svnCommand == s.svnCommand
|
|
|
|
|
&& useAuthentication == s.useAuthentication
|
|
|
|
|
&& user == s.user
|
2009-06-19 16:34:38 +02:00
|
|
|
&& password == s.password
|
2009-12-14 12:45:45 +01:00
|
|
|
&& timeOutS == s.timeOutS
|
|
|
|
|
&& promptToSubmit == s.promptToSubmit;
|
2008-12-02 12:01:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList SubversionSettings::addOptions(const QStringList &args) const
|
|
|
|
|
{
|
|
|
|
|
if (!useAuthentication || user.isEmpty())
|
|
|
|
|
return args;
|
2009-07-29 08:48:21 +02:00
|
|
|
// 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.
|
|
|
|
|
if (!args.empty() && args.front() == QLatin1String("add"))
|
|
|
|
|
return args;
|
2008-12-02 12:01:29 +01:00
|
|
|
|
|
|
|
|
QStringList rc;
|
|
|
|
|
rc.push_back(QLatin1String(userNameOptionC));
|
|
|
|
|
rc.push_back(user);
|
|
|
|
|
if (!password.isEmpty()) {
|
|
|
|
|
rc.push_back(QLatin1String(passwordOptionC));
|
|
|
|
|
rc.push_back(password);
|
|
|
|
|
}
|
|
|
|
|
rc.append(args);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Format arguments for log windows hiding passwords, etc.
|
|
|
|
|
QString SubversionSettings::formatArguments(const QStringList &args)
|
|
|
|
|
{
|
|
|
|
|
QString rc;
|
|
|
|
|
QTextStream str(&rc);
|
|
|
|
|
const int size = args.size();
|
|
|
|
|
// Skip authentication options
|
|
|
|
|
for (int i = 0; i < size; i++) {
|
|
|
|
|
const QString &arg = args.at(i);
|
|
|
|
|
if (i)
|
|
|
|
|
str << ' ';
|
|
|
|
|
str << arg;
|
|
|
|
|
if (arg == QLatin1String(userNameOptionC) || arg == QLatin1String(passwordOptionC)) {
|
|
|
|
|
str << " ********";
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return rc;
|
|
|
|
|
}
|