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

Git: Check remote port for isValid in GitRemote

Browse Source 
Change-Id: Iab922abcde0ac055417467f3c63a31dffa721986
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2018-10-07 15:26:22 +02:00
committed by André Hartmann
parent 0dfb2938ed
commit 96f982a016
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitclient.cpp
View File

@@ -3403,12 +3403,13 @@ GitRemote::GitRemote(const QString &url)
if (!match.hasMatch()) if (!match.hasMatch())
return; return;
bool ok = false;
protocol = match.captured("protocol"); protocol = match.captured("protocol");
userName = match.captured("user"); userName = match.captured("user");
host = match.captured("host"); host = match.captured("host");
port = match.captured("port").toUShort(); port = match.captured("port").toUShort(&ok);
path = match.captured("path"); path = match.captured("path");
isValid = true; isValid = ok || match.captured("port").isEmpty();
} }
} // namespace Internal } // namespace Internal

6
src/plugins/git/gitplugin.cpp
View File

@@ -1599,6 +1599,12 @@ void GitPlugin::testGitRemote_data()
.host("code.qt.io") .host("code.qt.io")
.port(80) .port(80)
.path("/qt-creator/qt-creator.git"); .path("/qt-creator/qt-creator.git");
QTest::newRow("invalid-port")
<< RemoteTest("https://code.qt.io:99999/qt-creator/qt-creator.git")
.protocol("https")
.host("code.qt.io")
.path("/qt-creator/qt-creator.git")
.isValid(false);
QTest::newRow("ssh-user-foo") QTest::newRow("ssh-user-foo")
<< RemoteTest("ssh://foo@codereview.qt-project.org:29418/qt-creator/qt-creator.git") << RemoteTest("ssh://foo@codereview.qt-project.org:29418/qt-creator/qt-creator.git")
.protocol("ssh") .protocol("ssh")