Mercurial > hg > mercurial
changeset 801:ea4a75bf2324
Merge branch Gaya-8.1.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Mon, 26 May 2014 16:30:19 +0200 |
parents | b130c7d27c02 (current diff) d94cdfbd9e1c (diff) |
children | 005ea6b2dc0f |
files | |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Sat May 24 16:45:14 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Mon May 26 16:30:19 2014 +0200 @@ -40,13 +40,13 @@ if (url.startsWith("[svn]")) { myVcsType = VcsType.svn; - myUrl = url.substring(5); + myUrl = url.substring(5).trim(); } else if (url.startsWith("[git]")) { myVcsType = VcsType.git; - myUrl = url.substring(5); + myUrl = url.substring(5).trim(); } else { myVcsType = VcsType.hg; - myUrl = url; + myUrl = url.trim(); } }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepoTest.java Sat May 24 16:45:14 2014 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepoTest.java Mon May 26 16:30:19 2014 +0200 @@ -40,6 +40,7 @@ } assertEquals("ssh://acme.org//subrepo", subrepoWithUrl("../subrepo").resolveUrl("ssh://acme.org//mainrepo")); assertEquals("ssh://acme.org/subrepo", subrepoWithUrl("../subrepo").resolveUrl("ssh://acme.org/mainrepo")); + assertEquals("ssh://acme.org/subrepo", subrepoWithUrl("../subrepo ").resolveUrl("ssh://acme.org/mainrepo")); } private SubRepo subrepoWithUrl(@NotNull String subrepoUrl) {