# HG changeset patch # User Dmitry Neverov # Date 1401114418 -7200 # Node ID d94cdfbd9e1c13e41d2e21a8b2a575f525acf08e # Parent 8f7862c1846e3525a968140d60aa6953304f67dc TW-36403 strip trailing whitespaces in .hgsub diff -r 8f7862c1846e -r d94cdfbd9e1c mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java --- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Mon May 19 19:06:56 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Mon May 26 16:26:58 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(); } } diff -r 8f7862c1846e -r d94cdfbd9e1c mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepoTest.java --- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepoTest.java Mon May 19 19:06:56 2014 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepoTest.java Mon May 26 16:26:58 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) {