Mercurial > hg > mercurial
diff mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Settings.java @ 46:13d5f0f56e70
compatibility with TeamCity 3.x
author | Pavel.Sher |
---|---|
date | Tue, 07 Oct 2008 15:22:57 +0400 |
parents | 4059fcc5473e |
children | 99e757f2527b |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Settings.java Sat Sep 06 17:46:28 2008 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Settings.java Tue Oct 07 15:22:57 2008 +0400 @@ -17,15 +17,14 @@ import jetbrains.buildServer.buildTriggers.vcs.mercurial.Constants; import jetbrains.buildServer.buildTriggers.vcs.mercurial.PathUtil; -import jetbrains.buildServer.util.FileUtil; import jetbrains.buildServer.util.Hash; import jetbrains.buildServer.util.StringUtil; import jetbrains.buildServer.vcs.VcsRoot; import org.jetbrains.annotations.NotNull; import java.io.File; +import java.util.HashSet; import java.util.Set; -import java.util.HashSet; /** * Represents Mercurial repository settings @@ -107,7 +106,7 @@ } public void setWorkingDir(@NotNull final File workingDir) { - myWorkingDir = FileUtil.getCanonicalFile(workingDir); + myWorkingDir = PathUtil.getCanonicalFile(workingDir); } /** @@ -136,7 +135,7 @@ private static File getDefaultWorkDir(@NotNull File workFolderParentDir, @NotNull String repPath) { String workingDirname = DEFAULT_WORK_DIR_PREFIX + String.valueOf(Hash.calc(normalize(repPath))); - return FileUtil.getCanonicalFile(new File(workFolderParentDir, workingDirname)); + return PathUtil.getCanonicalFile(new File(workFolderParentDir, workingDirname)); } private static String normalize(final String path) {