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

Gerrit: Support REST query for HTTP servers

Browse Source 
Change-Id: Icc164b9d84abe4efc34deaa5d19dca167fdb14e1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-02-23 23:03:30 +02:00
committed by Orgad Shaneh
parent be204a125e
commit f7a778690d
10 changed files with 662 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -240,13 +240,9 @@ void GerritDialog::updateRemotes()
while (mapIt.hasNext()) {
mapIt.next();
GerritServer server;
if (!server.fillFromRemote(mapIt.value(), m_parameters->server.user.userName))
if (!server.fillFromRemote(mapIt.value(), *m_parameters))
continue;
// Only Ssh is currently supported. In order to extend support for http[s],
// we need to move this logic to the model, and attempt connection to each
// remote (do it only on refresh, not on each path change)
if (server.type == GerritServer::Ssh)
addRemote(server, mapIt.key());
addRemote(server, mapIt.key());
}
addRemote(m_parameters->server, tr("Fallback"));
m_updatingRemotes = false;
@@ -257,7 +253,7 @@ void GerritDialog::addRemote(const GerritServer &server, const QString &name)
{
for (int i = 0, total = m_ui->remoteComboBox->count(); i < total; ++i) {
const GerritServer s = m_ui->remoteComboBox->itemData(i).value<GerritServer>();
if (s.host == server.host)
if (s == server)
return;
}
m_ui->remoteComboBox->addItem(server.host + QString(" (%1)").arg(name),