Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-06 12:20:56 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into feature/hg_hooks_over_tcp

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Sebastian Sdorra
2020-11-27 08:57:09 +01:00
parent 3e19f28cc0 aaeeed0ea5
commit 8ee8c8b351
68 changed files with 1134 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.aragost.javahg.Changeset;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import sonia.scm.repository.Branch;
@@ -63,14 +62,8 @@ public class HgBranchesCommand extends AbstractCommand
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.Branch,
Branch>()
{
@Override
public Branch apply(com.aragost.javahg.Branch hgBranch)
{
return Lists.transform(hgBranches,
hgBranch -> {
String node = null;
Changeset changeset = hgBranch.getBranchTip();
@@ -79,14 +72,12 @@ public class HgBranchesCommand extends AbstractCommand
node = changeset.getNode();
}
long lastCommitDate = changeset.getTimestamp().getDate().getTime();
if (DEFAULT_BRANCH_NAME.equals(hgBranch.getName())) {
return Branch.defaultBranch(hgBranch.getName(), node);
return Branch.defaultBranch(hgBranch.getName(), node, lastCommitDate);
} else {
return Branch.normalBranch(hgBranch.getName(), node);
return Branch.normalBranch(hgBranch.getName(), node, lastCommitDate);
}
}
});
return branches;
});
}
}