Mercurial > hg > mercurial
changeset 857:b11ace800435
Enable local mirrors when 'share mirrors' property is set
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Wed, 09 Jul 2014 20:59:49 +0200 |
| parents | a11bcfb63f4f |
| children | 61a373476058 |
| files | mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentPluginConfigImpl.java mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentPluginConfigImpl.java Tue Jul 08 16:15:55 2014 +0200 +++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentPluginConfigImpl.java Wed Jul 09 20:59:49 2014 +0200 @@ -39,7 +39,8 @@ } public boolean isUseLocalMirrors(@NotNull AgentRunningBuild build) { - return Boolean.valueOf(build.getSharedConfigParameters().get("teamcity.hg.use.local.mirrors")); + return Boolean.valueOf(build.getSharedConfigParameters().get("teamcity.hg.use.local.mirrors")) + || shareLocalMirrors(build); } @SuppressWarnings("ConstantConditions")
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java Tue Jul 08 16:15:55 2014 +0200 +++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java Wed Jul 09 20:59:49 2014 +0200 @@ -50,7 +50,7 @@ public IncludeRuleUpdater getUpdater(@NotNull final VcsRoot vcsRoot, @NotNull final CheckoutRules checkoutRules, @NotNull final String toVersion, @NotNull final File checkoutDirectory, @NotNull final AgentRunningBuild build, boolean cleanCheckoutRequested) throws VcsException { MercurialIncludeRuleUpdater updater; - if (myConfig.isUseLocalMirrors(build) && myConfig.shareLocalMirrors(build)) { + if (myConfig.shareLocalMirrors(build)) { updater = new SharingMercurialUpdater(myConfig, myMirrorManager, myRepoFactory, vcsRoot, toVersion, build); } else { updater = new MercurialIncludeRuleUpdater(myConfig, myMirrorManager, myRepoFactory, vcsRoot, toVersion, build);