From f94b1a43db5607c8a51e8abdeacebb0a82446480 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 27 Jul 2012 10:54:48 +0200
Subject: [PATCH] implement branch option for mercurial log command

---
 .../scm/repository/spi/HgLogCommand.java      | 33 ++++++++++++++++---
 .../spi/javahg/HgLogChangesetCommand.java     | 16 +++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
index dfa454e229..fa73bb10d7 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
@@ -110,9 +110,10 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
 
     com.aragost.javahg.Repository repository = open();
 
-    if (!Strings.isNullOrEmpty(request.getPath()))
+    if (!Strings.isNullOrEmpty(request.getPath())
+      ||!Strings.isNullOrEmpty(request.getBranch()))
     {
-      result = collectHistory(repository, request);
+      result = collectSafely(repository, request);
     }
     else
     {
@@ -177,7 +178,7 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
    *
    * @return
    */
-  private ChangesetPagingResult collectHistory(
+  private ChangesetPagingResult collectSafely(
     com.aragost.javahg.Repository repository, LogCommandRequest request)
   {
     HgLogChangesetCommand cmd = HgLogChangesetCommand.on(repository);
@@ -198,6 +199,11 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
       cmd.rev(startChangeset.concat(":0"));
     }
 
+    if (!Strings.isNullOrEmpty(request.getBranch()))
+    {
+      cmd.branch(request.getBranch());
+    }
+
     int start = request.getPagingStart();
     int limit = request.getPagingLimit();
 
@@ -206,14 +212,31 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
 
     if ((start == 0) && (limit < 0))
     {
-      changesets = cmd.execute(request.getPath());
+      if (!Strings.isNullOrEmpty(request.getPath()))
+      {
+        changesets = cmd.execute(request.getPath());
+      }
+      else
+      {
+        changesets = cmd.execute();
+      }
+
       total = changesets.size();
     }
     else
     {
       limit = limit + start;
 
-      List<Integer> revisionList = cmd.loadRevisions(request.getPath());
+      List<Integer> revisionList = null;
+
+      if (!Strings.isNullOrEmpty(request.getPath()))
+      {
+        revisionList = cmd.loadRevisions(request.getPath());
+      }
+      else
+      {
+        revisionList = cmd.loadRevisions();
+      }
 
       if ((limit > revisionList.size()) || (limit < 0))
       {
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java
index ec2d35343c..da84d9d7c7 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java
@@ -30,6 +30,7 @@
  */
 
 
+
 package sonia.scm.repository.spi.javahg;
 
 //~--- non-JDK imports --------------------------------------------------------
@@ -115,6 +116,21 @@ public class HgLogChangesetCommand extends AbstractCommand
     return new HgLogChangesetCommand(repository);
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param branch
+   *
+   * @return
+   */
+  public HgLogChangesetCommand branch(String branch)
+  {
+    cmdAppend("-b", branch);
+
+    return this;
+  }
+
   /**
    * Method description
    *