From 9b4afc647a8c2c5b6066377ac38cb9d87aa33e44 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 13 Jun 2012 12:16:18 +0200 Subject: [PATCH] implement cat command for mercurial --- .../scm/repository/spi/HgCatCommand.java | 108 ++++++++++++++++++ .../spi/HgRepositoryServiceProvider.java | 24 +++- .../spi/HgRepositoryServiceResolver.java | 13 ++- 3 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java new file mode 100644 index 0000000000..2e6ebc37c9 --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java @@ -0,0 +1,108 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.repository.spi; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.common.io.ByteStreams; +import com.google.common.io.Closeables; + +import sonia.scm.repository.AbstractHgHandler; +import sonia.scm.repository.HgContext; +import sonia.scm.repository.HgRepositoryHandler; +import sonia.scm.repository.Repository; +import sonia.scm.repository.RepositoryException; +import sonia.scm.util.Util; +import sonia.scm.web.HgUtil; + +//~--- JDK imports ------------------------------------------------------------ + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * + * @author Sebastian Sdorra + */ +public class HgCatCommand extends AbstractHgHandler implements CatCommand +{ + + /** + * Constructs ... + * + * + * @param handler + * @param context + * @param repository + * @param repositoryDirectory + */ + HgCatCommand(HgRepositoryHandler handler, HgContext context, + Repository repository, File repositoryDirectory) + { + super(handler, context, repository, repositoryDirectory); + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param request + * @param output + * + * @throws IOException + * @throws RepositoryException + */ + @Override + public void getCatResult(CatCommandRequest request, OutputStream output) + throws IOException, RepositoryException + { + String revision = HgUtil.getRevision(request.getRevision()); + Process p = createHgProcess("cat", "-r", revision, + Util.nonNull(request.getPath())); + InputStream input = null; + + try + { + handleErrorStream(p.getErrorStream()); + input = p.getInputStream(); + ByteStreams.copy(input, output); + } + finally + { + Closeables.closeQuietly(input); + } + } +} diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java index 6e02fba109..bbaf584674 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java @@ -34,7 +34,9 @@ package sonia.scm.repository.spi; //~--- non-JDK imports -------------------------------------------------------- import com.google.common.collect.ImmutableSet; +import com.google.inject.Provider; +import sonia.scm.repository.HgContext; import sonia.scm.repository.HgRepositoryHandler; import sonia.scm.repository.Repository; import sonia.scm.repository.api.Command; @@ -53,7 +55,7 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider { /** Field description */ - private static final Set COMMANDS = ImmutableSet.of(); + private static final Set COMMANDS = ImmutableSet.of(Command.CAT); //~--- constructors --------------------------------------------------------- @@ -61,12 +63,16 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider * Constructs ... * * + * + * @param hgContextProvider * @param handler * @param repository */ HgRepositoryServiceProvider(HgRepositoryHandler handler, + Provider hgContextProvider, Repository repository) { + this.hgContextProvider = hgContextProvider; this.handler = handler; this.repository = repository; this.repositoryDirectory = handler.getDirectory(repository); @@ -74,6 +80,19 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider //~--- get methods ---------------------------------------------------------- + /** + * Method description + * + * + * @return + */ + @Override + public HgCatCommand getCatCommand() + { + return new HgCatCommand(handler, hgContextProvider.get(), repository, + repositoryDirectory); + } + /** * Method description * @@ -91,6 +110,9 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider /** Field description */ private HgRepositoryHandler handler; + /** Field description */ + private Provider hgContextProvider; + /** Field description */ private Repository repository; diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java index ecc025056e..00981a2195 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java @@ -34,8 +34,10 @@ package sonia.scm.repository.spi; //~--- non-JDK imports -------------------------------------------------------- import com.google.inject.Inject; +import com.google.inject.Provider; import sonia.scm.plugin.ext.Extension; +import sonia.scm.repository.HgContext; import sonia.scm.repository.HgRepositoryHandler; import sonia.scm.repository.Repository; @@ -57,11 +59,14 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver * * * @param handler + * @param hgContextProvider */ @Inject - public HgRepositoryServiceResolver(HgRepositoryHandler handler) + public HgRepositoryServiceResolver(HgRepositoryHandler handler, + Provider hgContextProvider) { this.handler = handler; + this.hgContextProvider = hgContextProvider; } //~--- methods -------------------------------------------------------------- @@ -81,7 +86,8 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver if (TYPE.equalsIgnoreCase(repository.getType())) { - provider = new HgRepositoryServiceProvider(handler, repository); + provider = new HgRepositoryServiceProvider(handler, hgContextProvider, + repository); } return provider; @@ -91,4 +97,7 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver /** Field description */ private HgRepositoryHandler handler; + + /** Field description */ + private Provider hgContextProvider; }