implement diff command for mercurial

This commit is contained in:
Sebastian Sdorra
2012-06-13 12:25:19 +02:00
parent 67c6eef808
commit b1fcfa5328
2 changed files with 119 additions and 1 deletions

View File

@@ -0,0 +1,105 @@
/**
* 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.HgContext;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryException;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
/**
*
* @author Sebastian Sdorra
*/
public class HgDiffCommand extends AbstractHgCommand implements DiffCommand
{
/**
* Constructs ...
*
*
* @param handler
* @param context
* @param repository
* @param repositoryDirectory
*/
public HgDiffCommand(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 getDiffResult(DiffCommandRequest request, OutputStream output)
throws IOException, RepositoryException
{
Process p = createHgProcess("diff", "-c", request.getRevision(),
Util.nonNull(request.getPath()));
InputStream input = null;
try
{
handleErrorStream(p.getErrorStream());
input = p.getInputStream();
ByteStreams.copy(input, output);
}
finally
{
Closeables.closeQuietly(input);
}
}
}

View File

@@ -56,7 +56,7 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
/** Field description */
private static final Set<Command> COMMANDS = ImmutableSet.of(Command.BROWSE,
Command.CAT);
Command.CAT, Command.DIFF);
//~--- constructors ---------------------------------------------------------
@@ -107,6 +107,19 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
repositoryDirectory);
}
/**
* Method description
*
*
* @return
*/
@Override
public HgDiffCommand getDiffCommand()
{
return new HgDiffCommand(handler, hgContextProvider.get(), repository,
repositoryDirectory);
}
/**
* Method description
*