Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 21:45:43 +01:00
Code Issues Packages Projects Releases Activity

Remove duplication

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-28 11:18:36 +02:00
parent e35ec519cb
commit 964f2eab2e
1 changed files with 31 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
View File

@@ -63,8 +63,12 @@ import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import static java.util.Optional.of;
import static java.util.Optional.ofNullable;
//~--- JDK imports ------------------------------------------------------------
/**
@@ -500,76 +504,16 @@ public final class GitUtil
}
public static String getRepositoryHeadBranchName(org.eclipse.jgit.lib.Repository repo) {
Map<String, Ref> refs = repo.getAllRefs();
Ref lastHeadRef = null;
for (Map.Entry<String, Ref> e : refs.entrySet()) {
String key = e.getKey();
if (REF_HEAD.equals(key)) {
if (e.getValue().isSymbolic() && isBranch(e.getValue().getTarget().getName())) {
return getBranch(e.getValue().getTarget());
}
} else if (key.startsWith(REF_HEAD_PREFIX)) {
if (REF_MASTER.equals(key.substring(REF_HEAD_PREFIX.length()))) {
return REF_MASTER;
} else {
lastHeadRef = e.getValue();
}
}
}
if (lastHeadRef == null) {
return null;
} else {
return getBranch(lastHeadRef);
}
return getRepositoryHeadRef(repo).map(GitUtil::getBranch).orElse(null);
}
/**
* Method description
*
*
* @param repo
*
* @return
*
* @throws IOException
*/
public static ObjectId getRepositoryHead(org.eclipse.jgit.lib.Repository repo)
throws IOException
{
ObjectId id = null;
String head = null;
Map<String, Ref> refs = repo.getAllRefs();
Optional<Ref> headRef = getRepositoryHeadRef(repo);
for (Map.Entry<String, Ref> e : refs.entrySet())
{
String key = e.getKey();
if (REF_HEAD.equals(key))
{
head = REF_HEAD;
id = e.getValue().getObjectId();
break;
}
else if (key.startsWith(REF_HEAD_PREFIX))
{
id = e.getValue().getObjectId();
head = key.substring(REF_HEAD_PREFIX.length());
if (REF_MASTER.equals(head))
{
break;
}
}
}
if (id == null)
{
id = repo.resolve(Constants.HEAD);
}
String head = headRef.map(GitUtil::getBranch).orElse(null);
ObjectId id = headRef.map(Ref::getObjectId).orElse(repo.resolve(Constants.HEAD));
if (logger.isDebugEnabled())
{
@@ -590,6 +534,29 @@ public final class GitUtil
return id;
}
public static Optional<Ref> getRepositoryHeadRef(org.eclipse.jgit.lib.Repository repo) {
Map<String, Ref> refs = repo.getAllRefs();
Ref lastHeadRef = null;
for (Map.Entry<String, Ref> e : refs.entrySet()) {
String key = e.getKey();
if (REF_HEAD.equals(key)) {
if (e.getValue().isSymbolic() && isBranch(e.getValue().getTarget().getName())) {
return of(e.getValue().getTarget());
}
} else if (key.startsWith(REF_HEAD_PREFIX)) {
if (REF_MASTER.equals(key.substring(REF_HEAD_PREFIX.length()))) {
return of(e.getValue());
} else {
lastHeadRef = e.getValue();
}
}
}
return ofNullable(lastHeadRef);
}
/**
* Method description
*