Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-07 17:23:08 +02:00
Code Issues Packages Projects Releases Activity

update javahg to version 0.15-scm1

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-06-29 15:15:03 +02:00
parent c924d73115
commit 813b8db3ca
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-hg-plugin/pom.xml
View File

@@ -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>

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBlameCommand.java
View File

@@ -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;

6
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchesCommand.java
View File

@@ -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();

6
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagsCommand.java
View File

@@ -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;