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

Gerrit: Factor out server settings

Browse Source 
Preparing for gerrit determination by git remote.

Task-number: QTCREATORBUG-8381
Change-Id: Ic862210f40124cd2fb4bb4aa125c7b8e534cd764
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-01-14 23:30:16 +02:00
committed by Orgad Shaneh
parent 5035807f89
commit 2e2c3c39af
6 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -87,7 +87,7 @@ QDebug operator<<(QDebug d, const GerritChange &c)
static inline QString defaultUrl(const QSharedPointer<GerritParameters> &p, int gerritNumber)
{
QString result = QLatin1String(p->https ? "https://" : "http://");
result += p->host;
result += p->server.host;
result += '/';
result += QString::number(gerritNumber);
return result;
@@ -197,8 +197,8 @@ QString GerritChange::filterString() const
QStringList GerritChange::gitFetchArguments(const QSharedPointer<GerritParameters> &p) const
{
QStringList arguments;
const QString url = "ssh://" + p->sshHostArgument()
+ ':' + QString::number(p->port) + '/'
const QString url = "ssh://" + p->server.sshHostArgument()
+ ':' + QString::number(p->server.port) + '/'
+ project;
arguments << "fetch" << url << currentPatchSet.ref;
return arguments;
@@ -258,7 +258,8 @@ QueryContext::QueryContext(const QStringList &queries,
: QObject(parent)
, m_queries(queries)
, m_currentQuery(0)
, m_baseArguments({ p->ssh, p->portFlag, QString::number(p->port), p->sshHostArgument(), "gerrit" })
, m_baseArguments({ p->ssh, p->portFlag, QString::number(p->server.port),
p->server.sshHostArgument(), "gerrit" })
{
connect(&m_process, &QProcess::readyReadStandardError,
this, &QueryContext::readyReadStandardError);
@@ -520,13 +521,13 @@ void GerritModel::refresh(const QString &query)
else
{
const QString statusOpenQuery = "status:open";
if (m_parameters->user.isEmpty()) {
if (m_parameters->server.user.isEmpty()) {
queries.push_back(statusOpenQuery);
} else {
// Owned by:
queries.push_back(statusOpenQuery + " owner:" + m_parameters->user);
queries.push_back(statusOpenQuery + " owner:" + m_parameters->server.user);
// For Review by:
queries.push_back(statusOpenQuery + " reviewer:" + m_parameters->user);
queries.push_back(statusOpenQuery + " reviewer:" + m_parameters->server.user);
}
}