Mercurial > hg > mercurial
changeset 825:5fbc0d51bea3
cleanup
author | eugene.petrenko@jetbrains.com |
---|---|
date | Fri, 30 May 2014 12:16:35 +0200 |
parents | f86c06f4ab8a |
children | 6f76b2e5afdc |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
diffstat | 3 files changed, 11 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java Fri May 30 11:49:44 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java Fri May 30 12:16:35 2014 +0200 @@ -48,12 +48,14 @@ return myWorkDirectory; } + @NotNull protected MercurialCommandLine createCommandLine() { MercurialCommandLine cli = createCL(); cli.setWorkDirectory(myWorkDirectory.getAbsolutePath()); return cli; } + @NotNull protected MercurialCommandLine createCL() { final MercurialCommandLine cl = new MercurialCommandLine(getPrivateData()); cl.setExePath(myHgPath);
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java Fri May 30 11:49:44 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java Fri May 30 12:16:35 2014 +0200 @@ -33,10 +33,6 @@ private final Set<String> myPrivateData; private Charset myCharset; - public MercurialCommandLine() { - this(Collections.<String>emptySet()); - } - public MercurialCommandLine(@NotNull final Set<String> privateData) { myPrivateData = privateData; } @@ -78,11 +74,6 @@ myEnvPatch.putAll(hgEnv); } - @NotNull - public Map<String, String> getEnvParams() { - return new TreeMap<String, String>(myEnvPatch); - } - public void addEnvParam(@NotNull final String key, @NotNull final String value) { myEnvPatch.put(key, value); }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri May 30 11:49:44 2014 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri May 30 12:16:35 2014 +0200 @@ -264,7 +264,7 @@ assertEquals(actualTag, "new_tag"); // check the tag is pushed to the parent repository - MercurialCommandLine cli = new MercurialCommandLine(); + MercurialCommandLine cli = new MercurialCommandLine(Collections.<String>emptySet()); cli.setExePath(vcsRoot.getProperty(Constants.HG_COMMAND_PATH_PROP)); cli.setWorkDirectory(vcsRoot.getProperty(Constants.REPOSITORY_PROP)); cli.setEnvParams(map("HGRCPATH", "")); @@ -281,7 +281,7 @@ assertEquals(actualTag, "branch_tag"); // check the tag is pushed to the parent repository - MercurialCommandLine cli = new MercurialCommandLine(); + MercurialCommandLine cli = new MercurialCommandLine(Collections.<String>emptySet()); cli.setExePath(vcsRoot.getProperty(Constants.HG_COMMAND_PATH_PROP)); cli.setWorkDirectory(vcsRoot.getProperty(Constants.REPOSITORY_PROP)); cli.addParameter("tags"); @@ -630,17 +630,14 @@ VersionCommand russianLocalVersion = new VersionCommand(new TestCommandSettingsFactory().create(), Util.getHgPath(), new File(simpleRepo())) { @Override + @NotNull protected MercurialCommandLine createCommandLine() { - MercurialCommandLine commandLine = super.createCommandLine(); - Map<String, String> env = commandLine.getEnvParams(); - if (env == null) - env = new HashMap<String, String>(); - env.put("LANG", "ru_RU"); - env.put("LANGUAGE", "ru_RU"); - env.put("LC_MESSAGE", "ru_RU"); - env.put("HGRCPATH", ""); - commandLine.setEnvParams(env); - return commandLine; + final MercurialCommandLine env = super.createCommandLine(); + env.addEnvParam("LANG", "ru_RU"); + env.addEnvParam("LANGUAGE", "ru_RU"); + env.addEnvParam("LC_MESSAGE", "ru_RU"); + env.addEnvParam("HGRCPATH", ""); + return env; } };