# HG changeset patch # User Dmitry Neverov # Date 1313040800 -14400 # Node ID f80e17ac2da635dd6453e8e3ba6ddd65e10cb9a8 # Parent 8c10f5cec37d079e4dce247bad830a5531e45b98 Remove private data from the logs diff -r 8c10f5cec37d -r f80e17ac2da6 mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java --- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java Thu Aug 04 12:04:38 2011 +0400 +++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java Thu Aug 11 09:33:20 2011 +0400 @@ -32,6 +32,9 @@ import java.io.File; import java.io.IOException; +import java.util.Collections; + +import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandUtil.removePrivateData; public class MercurialAgentSideVcsSupport extends AgentVcsSupport implements UpdateByIncludeRules2 { @@ -87,7 +90,8 @@ private void initRepository(File workingDir, Settings settings, BuildProgressLogger logger, boolean useLocalMirrors) throws VcsException { try { String defaultPullUrl = getDefaultPullUrl(settings, useLocalMirrors); - logger.message("Init repository at " + workingDir.getAbsolutePath() + ", remote repository is " + defaultPullUrl); + logger.message("Init repository at " + workingDir.getAbsolutePath() + ", remote repository is " + + removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword()))); new Init(settings, workingDir, defaultPullUrl).execute(); } catch (IOException e) { throw new VcsException("Error while initializing repository at " + workingDir.getAbsolutePath(), e); @@ -100,7 +104,8 @@ } else { ensureUseRightRepository(workingDir, settings, logger, useLocalMirrors); } - logger.message("Start pulling changes from " + getDefaultPullUrl(settings, useLocalMirrors)); + String defaultPullUrl = getDefaultPullUrl(settings, useLocalMirrors); + logger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword()))); new PullCommand(settings, workingDir).execute(); logger.message("Changes successfully pulled"); } @@ -125,7 +130,8 @@ if (!Settings.isValidRepository(mirrorDir)) { initRepository(mirrorDir, settings, logger, false); } - logger.message("Start pulling changes from " + getDefaultPullUrl(settings, true)); + final String defaultPullUrl = getDefaultPullUrl(settings, true); + logger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword()))); new PullCommand(settings, mirrorDir).execute(); logger.message("Local mirror changes successfully pulled"); }