Mercurial > hg > mercurial

changeset 374:5525f6f23f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use url without credentials to choose local mirror dir
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 09 Feb 2012 14:00:14 +0400
parents 1350f99b43bc
children feea4e033b5a
files mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTestCase.java
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java	Thu Feb 09 13:29:09 2012 +0400
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java	Thu Feb 09 14:00:14 2012 +0400
@@ -132,7 +132,7 @@
 
   private void updateLocalMirror() throws VcsException, IOException {
     Settings settings = new Settings(myHgPathProvider, myRoot);
-    File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepositoryUrlWithCredentials());
+    File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepository());
     myLogger.message("Update local mirror at " + mirrorDir);
     if (!Settings.isValidRepository(mirrorDir)) {
       initRepository(settings, mirrorDir, false);
@@ -305,7 +305,7 @@
 
   private String getDefaultPullUrl(Settings settings, boolean useLocalMirror) throws IOException {
     if (useLocalMirror) {
-      File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepositoryUrlWithCredentials());
+      File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepository());
       return mirrorDir.getCanonicalPath();
     } else {
       return settings.getRepositoryUrlWithCredentials();
@@ -324,7 +324,7 @@
 
   public boolean isClonedFromLocalMirror(@NotNull final File workingDir) {
     try {
-      File mirrorDir = myMirrorManager.getMirrorDir(mySettings.getRepositoryUrlWithCredentials());
+      File mirrorDir = myMirrorManager.getMirrorDir(mySettings.getRepository());
       File hgrc = new File(workingDir, ".hg" + File.separator + "hgrc");
       String config = FileUtil.readText(hgrc);
       return config.contains("default = " + mirrorDir.getCanonicalPath());
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Thu Feb 09 13:29:09 2012 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Thu Feb 09 14:00:14 2012 +0400
@@ -745,7 +745,7 @@
 
   private File getWorkingDir(Settings s) {
     File customDir = s.getCustomWorkingDir();
-    return customDir != null ? customDir : myMirrorManager.getMirrorDir(s.getRepositoryUrlWithCredentials());
+    return customDir != null ? customDir : myMirrorManager.getMirrorDir(s.getRepository());
   }
 
   private Settings createSettings(final VcsRoot root) throws VcsException {
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTestCase.java	Thu Feb 09 13:29:09 2012 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTestCase.java	Thu Feb 09 14:00:14 2012 +0400
@@ -73,7 +73,7 @@
     ServerPluginConfig config = new ServerPluginConfigBuilder().cachesDir(tf.createTempDir()).build();
     MirrorManager mirrorManager = new MirrorManagerImpl(config);
     Settings settings = new Settings(new ServerHgPathProvider(config), vcsRoot);
-    final File workingDir = mirrorManager.getMirrorDir(settings.getRepositoryUrlWithCredentials());
+    final File workingDir = mirrorManager.getMirrorDir(settings.getRepository());
     settings.setCustomWorkingDir(workingDir);
     try {
       if (myCloneRequired) {