Mercurial > hg > mercurial
changeset 819:c07406e13b8d
use base method for max commandline size
author | eugene.petrenko@jetbrains.com |
---|---|
date | Fri, 30 May 2014 11:22:11 +0200 |
parents | f7ddd9d373d0 |
children | 121a54182f5b |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java |
diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java Fri May 30 11:16:38 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java Fri May 30 11:22:11 2014 +0200 @@ -29,7 +29,6 @@ */ package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; -import jetbrains.buildServer.buildTriggers.vcs.mercurial.OS; import jetbrains.buildServer.util.FileUtil; import jetbrains.buildServer.vcs.VcsException; import org.jetbrains.annotations.NotNull; @@ -70,7 +69,7 @@ final MercurialCommandLine cmd = createCmd(); final int cmdSize = cmd.getCommandLineString().length(); - if (cmdSize + rule.length() + (myIncludeRules.isEmpty() ? 0 : "-I ".length()) > OS.getMaxCommandLineSize()) { + if (cmdSize + rule.length() + (myIncludeRules.isEmpty() ? 0 : "-I ".length()) > getMaxCommandLineSize()) { return false; }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java Fri May 30 11:16:38 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java Fri May 30 11:22:11 2014 +0200 @@ -15,6 +15,7 @@ */ package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; +import jetbrains.buildServer.buildTriggers.vcs.mercurial.OS; import jetbrains.buildServer.vcs.VcsException; import org.jetbrains.annotations.NotNull; @@ -40,6 +41,9 @@ myWorkDirectory = workingDir; } + protected final int getMaxCommandLineSize() { + return OS.getMaxCommandLineSize(); + } public File getWorkDirectory() { return myWorkDirectory;
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java Fri May 30 11:16:38 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java Fri May 30 11:22:11 2014 +0200 @@ -16,7 +16,6 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; import jetbrains.buildServer.buildTriggers.vcs.mercurial.HgFileUtil; -import jetbrains.buildServer.buildTriggers.vcs.mercurial.OS; import jetbrains.buildServer.log.Loggers; import jetbrains.buildServer.vcs.VcsException; import org.jetbrains.annotations.NotNull; @@ -117,7 +116,7 @@ String path = paths.poll(); cli.addParameter(path); cmdSize += path.length() + 3; //quotes + space - } while (cmdSize < OS.getMaxCommandLineSize() && !paths.isEmpty()); + } while (cmdSize < getMaxCommandLineSize() && !paths.isEmpty()); runCommand(cli, myCommandSettings.setCheckForFailure(checkFailure)); }