feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Introduce configureable timeout to vcs,svn, p4.

Browse Source 
as already present for git, mercurial.

Task-number: QTCREATORBUG-475
This commit is contained in:
Friedemann Kleint
2009-12-14 12:45:45 +01:00
parent e600c0ddba
commit dde46ec1eb
16 changed files with 159 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/subversion/subversionsettings.cpp
View File

@@ -41,6 +41,9 @@ static const char *authenticationKeyC = "Authentication";
static const char *userNameOptionC = "--username";
static const char *passwordOptionC = "--password";
static const char *promptToSubmitKeyC = "PromptForSubmit";
static const char *timeOutKeyC = "TimeOut";
enum { defaultTimeOutS = 30 };
static QString defaultCommand()
{
@@ -57,6 +60,7 @@ using namespace Subversion::Internal;
SubversionSettings::SubversionSettings() :
svnCommand(defaultCommand()),
useAuthentication(false),
timeOutS(defaultTimeOutS),
promptToSubmit(true)
{
}
@@ -68,6 +72,7 @@ void SubversionSettings::fromSettings(QSettings *settings)
useAuthentication = settings->value(QLatin1String(authenticationKeyC), QVariant(false)).toBool();
user = settings->value(QLatin1String(userKeyC), QString()).toString();
password = settings->value(QLatin1String(passwordKeyC), QString()).toString();
timeOutS = settings->value(QLatin1String(timeOutKeyC), defaultTimeOutS).toInt();
promptToSubmit = settings->value(QLatin1String(promptToSubmitKeyC), true).toBool();
settings->endGroup();
}
@@ -80,6 +85,7 @@ void SubversionSettings::toSettings(QSettings *settings) const
settings->setValue(QLatin1String(userKeyC), user);
settings->setValue(QLatin1String(passwordKeyC), password);
settings->setValue(QLatin1String(promptToSubmitKeyC), promptToSubmit);
settings->setValue(QLatin1String(timeOutKeyC), timeOutS);
settings->endGroup();
}
@@ -89,7 +95,8 @@ bool SubversionSettings::equals(const SubversionSettings &s) const
&& useAuthentication == s.useAuthentication
&& user == s.user
&& password == s.password
&& promptToSubmit == s.promptToSubmit;
&& timeOutS == s.timeOutS
&& promptToSubmit == s.promptToSubmit;
}
QStringList SubversionSettings::addOptions(const QStringList &args) const