From 813b8db3cae539a2f48f7b12b0df40aa468024e0 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 29 Jun 2020 15:15:03 +0200
Subject: [PATCH] update javahg to version 0.15-scm1

---
 scm-plugins/scm-hg-plugin/pom.xml                           | 2 +-
 .../main/java/sonia/scm/repository/spi/HgBlameCommand.java  | 2 +-
 .../java/sonia/scm/repository/spi/HgBranchesCommand.java    | 6 +++---
 .../main/java/sonia/scm/repository/spi/HgTagsCommand.java   | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml
index 4457eb202f..0c231fda9f 100644
--- a/scm-plugins/scm-hg-plugin/pom.xml
+++ b/scm-plugins/scm-hg-plugin/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.aragost.javahg</groupId>
       <artifactId>javahg</artifactId>
-      <version>0.13-java7</version>
+      <version>0.15-scm1</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.guava</groupId>
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 83732bb879..474d092840 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
@@ -28,7 +28,7 @@ package sonia.scm.repository.spi;
 
 import com.aragost.javahg.Changeset;
 import com.aragost.javahg.commands.AnnotateCommand;
-import com.aragost.javahg.commands.AnnotateLine;
+import com.aragost.javahg.AnnotateLine;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchesCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchesCommand.java
index 48b8ebc0a5..22cccbc8ae 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchesCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchesCommand.java
@@ -60,16 +60,16 @@ public class HgBranchesCommand extends AbstractCommand
 
   @Override
   public List<Branch> getBranches() {
-    List<com.aragost.javahg.commands.Branch> hgBranches =
+    List<com.aragost.javahg.Branch> hgBranches =
       com.aragost.javahg.commands.BranchesCommand.on(open()).execute();
 
     List<Branch> branches = Lists.transform(hgBranches,
-                              new Function<com.aragost.javahg.commands.Branch,
+                              new Function<com.aragost.javahg.Branch,
                                 Branch>()
     {
 
       @Override
-      public Branch apply(com.aragost.javahg.commands.Branch hgBranch)
+      public Branch apply(com.aragost.javahg.Branch hgBranch)
       {
         String node = null;
         Changeset changeset = hgBranch.getBranchTip();
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagsCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagsCommand.java
index 20bdac4ec1..309265617c 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagsCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagsCommand.java
@@ -69,7 +69,7 @@ public class HgTagsCommand extends AbstractCommand implements TagsCommand
     com.aragost.javahg.commands.TagsCommand cmd =
       com.aragost.javahg.commands.TagsCommand.on(open());
 
-    List<com.aragost.javahg.commands.Tag> tagList = cmd.includeTip().execute();
+    List<com.aragost.javahg.Tag> tagList = cmd.includeTip().execute();
 
     List<Tag> tags = null;
 
@@ -97,7 +97,7 @@ public class HgTagsCommand extends AbstractCommand implements TagsCommand
    * @author         Enter your name here...
    */
   private static class TagTransformer
-    implements Function<com.aragost.javahg.commands.Tag, Tag>
+    implements Function<com.aragost.javahg.Tag, Tag>
   {
 
     /**
@@ -109,7 +109,7 @@ public class HgTagsCommand extends AbstractCommand implements TagsCommand
      * @return
      */
     @Override
-    public Tag apply(com.aragost.javahg.commands.Tag f)
+    public Tag apply(com.aragost.javahg.Tag f)
     {
       Tag t = null;