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

Git: Add new class GitRemote

Browse Source 
Allows to split a remote URL and performs
some validation checks on the elements.

Change-Id: I048373076b1a1553fdd7bed2986a41cc087138b0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2017-03-09 19:13:38 +01:00
committed by André Hartmann
parent 6e7d2a4001
commit b0ac6435b3
3 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,39 +113,27 @@ QString GerritServer::url(UrlType urlType) const
bool GerritServer::fillFromRemote(const QString &remote, const GerritParameters &parameters)
{
static const QRegularExpression remotePattern(
"^(?:(?<protocol>[^:]+)://)?(?:(?<user>[^@]+)@)?(?<host>[^:/]+)"
"(?::(?<port>\\d+))?:?(?<path>/.*)$");
const GitRemote r(remote);
if (!r.isValid)
return false;
// Skip local remotes (refer to the root or relative path)
if (remote.isEmpty() || remote.startsWith('/') || remote.startsWith('.'))
return false;
// On Windows, local paths typically starts with <drive>:
if (HostOsInfo::isWindowsHost() && remote[1] == ':')
return false;
QRegularExpressionMatch match = remotePattern.match(remote);
if (!match.hasMatch())
return false;
const QString protocol = match.captured("protocol");
if (protocol == "https")
if (r.protocol == "https")
type = GerritServer::Https;
else if (protocol == "http")
else if (r.protocol == "http")
type = GerritServer::Http;
else if (protocol.isEmpty() || protocol == "ssh")
else if (r.protocol.isEmpty() || r.protocol == "ssh")
type = GerritServer::Ssh;
else
return false;
const QString userName = match.captured("user");
user.userName = userName.isEmpty() ? parameters.server.user.userName : userName;
host = match.captured("host");
port = match.captured("port").toUShort();
if (host.contains("github.com")) // Clearly not gerrit
user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
if (r.host.contains("github.com")) // Clearly not gerrit
return false;
if (type != GerritServer::Ssh) {
curlBinary = parameters.curl;
if (curlBinary.isEmpty() || !QFile::exists(curlBinary))
return false;
rootPath = match.captured("path");
rootPath = r.path;
// Strip the last part of the path, which is always the repo name
// The rest of the path needs to be inspected to find the root path
// (can be http://example.net/review)