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

Gerrit: Minor cleanup

Browse Source 
Change-Id: I7bfa74053c41c68b956929b73a9b50bf77cbf6e4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Orgad Shaneh
2017-03-12 23:55:11 +02:00
committed by Orgad Shaneh
parent f9b556621c
commit dbe77890cd
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gerrit/gerritserver.cpp
View File

@@ -131,7 +131,8 @@ bool GerritServer::fillFromRemote(const QString &remote, const GerritParameters
host = r.host; host = r.host;
port = r.port; port = r.port;
user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName; user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
if (type != GerritServer::Ssh) { if (type == GerritServer::Ssh)
return true;
curlBinary = parameters.curl; curlBinary = parameters.curl;
if (curlBinary.isEmpty() || !QFile::exists(curlBinary)) if (curlBinary.isEmpty() || !QFile::exists(curlBinary))
return false; return false;
@@ -140,10 +141,7 @@ bool GerritServer::fillFromRemote(const QString &remote, const GerritParameters
// The rest of the path needs to be inspected to find the root path // The rest of the path needs to be inspected to find the root path
// (can be http://example.net/review) // (can be http://example.net/review)
ascendPath(); ascendPath();
if (!resolveRoot()) return resolveRoot();
return false;
}
return true;
} }
QStringList GerritServer::curlArguments() QStringList GerritServer::curlArguments()