# HG changeset patch # User eugene.petrenko@jetbrains.com # Date 1389641348 -3600 # Node ID e13f499adb6edfa18d2314faf78fbd60461b505d # Parent 2ab33390b801a809e2327c4c28cbd49bc1fe3041 normalize URL in constructor diff -r 2ab33390b801 -r e13f499adb6e mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java --- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Mon Jan 13 20:17:22 2014 +0100 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Mon Jan 13 20:29:08 2014 +0100 @@ -16,9 +16,18 @@ public SubRepo(@NotNull String path, @NotNull String url, @NotNull String revision) { myPath = path; - myUrl = url; myRevision = revision; - myVcsType = parseVcsType(); + + if (url.startsWith("[svn]")) { + myVcsType = VcsType.svn; + myUrl = url.substring(5); + } else if (url.startsWith("[git]")) { + myVcsType = VcsType.git; + myUrl = url.substring(5); + } else { + myVcsType = VcsType.hg; + myUrl = url; + } } @NotNull @@ -45,6 +54,7 @@ return !myUrl.equals(other.url()); } + @NotNull public String resolveUrl(@NotNull String parentRepoUrl) throws URISyntaxException { if (!parentRepoUrl.endsWith("/")) parentRepoUrl = parentRepoUrl + "/"; @@ -85,14 +95,6 @@ return myPath + " = " + myUrl + "#" + myRevision; } - private VcsType parseVcsType() { - if (myUrl.startsWith("[svn]")) - return VcsType.svn; - if (myUrl.startsWith("[git]")) - return VcsType.git; - return VcsType.hg; - } - public static enum VcsType { hg(Constants.VCS_NAME), git("jetbrains.git"), svn("svn") ;