From 9a3d254af1141e4ba563d7dfc2a625b7277d9de1 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Jul 2012 11:31:29 +0200 Subject: [PATCH] fix not found in revision 00... errors --- .../java/sonia/scm/repository/spi/HgBlameCommand.java | 8 +++----- .../main/java/sonia/scm/repository/spi/HgCatCommand.java | 8 +++----- .../main/java/sonia/scm/repository/spi/HgDiffCommand.java | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBlameCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBlameCommand.java index 84382afec0..be5dbeda04 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBlameCommand.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBlameCommand.java @@ -50,6 +50,7 @@ import sonia.scm.repository.BlameResult; import sonia.scm.repository.Person; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryException; +import sonia.scm.web.HgUtil; //~--- JDK imports ------------------------------------------------------------ @@ -99,7 +100,7 @@ public class HgBlameCommand extends AbstractCommand implements BlameCommand */ @Override public BlameResult getBlameResult(BlameCommandRequest request) - throws IOException, RepositoryException + throws IOException, RepositoryException { if (logger.isDebugEnabled()) { @@ -108,10 +109,7 @@ public class HgBlameCommand extends AbstractCommand implements BlameCommand AnnotateCommand cmd = AnnotateCommand.on(open()); - if (!Strings.isNullOrEmpty(request.getRevision())) - { - cmd.rev(request.getRevision()); - } + cmd.rev(HgUtil.getRevision(request.getRevision())); List blameLines = Lists.newArrayList(); List lines = cmd.execute(request.getPath()); 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 index ae3a7071b4..ac07a46453 100644 --- 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 @@ -41,6 +41,7 @@ import com.google.common.io.Closeables; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryException; +import sonia.scm.web.HgUtil; //~--- JDK imports ------------------------------------------------------------ @@ -81,15 +82,12 @@ public class HgCatCommand extends AbstractCommand implements CatCommand */ @Override public void getCatResult(CatCommandRequest request, OutputStream output) - throws IOException, RepositoryException + throws IOException, RepositoryException { com.aragost.javahg.commands.CatCommand cmd = com.aragost.javahg.commands.CatCommand.on(open()); - if (!Strings.isNullOrEmpty(request.getRevision())) - { - cmd.rev(request.getRevision()); - } + cmd.rev(HgUtil.getRevision(request.getRevision())); InputStream input = null; diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgDiffCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgDiffCommand.java index 93f6f869d0..7222e4d86c 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgDiffCommand.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgDiffCommand.java @@ -39,6 +39,7 @@ import com.google.common.base.Strings; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryException; +import sonia.scm.web.HgUtil; //~--- JDK imports ------------------------------------------------------------ @@ -78,15 +79,12 @@ public class HgDiffCommand extends AbstractCommand implements DiffCommand */ @Override public void getDiffResult(DiffCommandRequest request, OutputStream output) - throws IOException, RepositoryException + throws IOException, RepositoryException { com.aragost.javahg.commands.DiffCommand cmd = com.aragost.javahg.commands.DiffCommand.on(open()); - if (!Strings.isNullOrEmpty(request.getRevision())) - { - cmd.change(request.getRevision()); - } + cmd.change(HgUtil.getRevision(request.getRevision())); String diff = null;