Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-04 13:49:13 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into bugfix/rest-download

Browse Source
This commit is contained in:
Konstantin Schaper
2020-11-02 13:28:44 +01:00
committed by GitHub
parent 22e0944377 66024f249d
commit 578e028d5b
64 changed files with 1415 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
View File

@@ -55,16 +55,18 @@ import sonia.scm.store.BlobStore;
import sonia.scm.util.Util;
import sonia.scm.web.lfs.LfsBlobStoreFactory;
import javax.annotation.Nullable;
import javax.inject.Inject;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Deque;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Stack;
import java.util.function.Consumer;
import static java.util.Optional.empty;
@@ -141,12 +143,12 @@ public class GitBrowseCommand extends AbstractGitCommand
if (Util.isEmpty(request.getRevision())) {
return getDefaultBranch(repo);
} else {
ObjectId revId = GitUtil.getRevisionId(repo, request.getRevision());
if (revId == null) {
ObjectId revisionId = GitUtil.getRevisionId(repo, request.getRevision());
if (revisionId == null) {
logger.error("could not find revision {}", request.getRevision());
throw notFound(entity("Revision", request.getRevision()).in(this.repository));
}
return revId;
return revisionId;
}
}
@@ -212,7 +214,9 @@ public class GitBrowseCommand extends AbstractGitCommand
private FileObject getEntry() throws IOException {
try (RevWalk revWalk = new RevWalk(repo); TreeWalk treeWalk = new TreeWalk(repo)) {
logger.debug("load repository browser for revision {}", revId.name());
if (logger.isDebugEnabled()) { // method call in logger call
logger.debug("load repository browser for revision {}", revId.name());
}
if (!isRootRequest()) {
treeWalk.setFilter(PathFilter.create(request.getPath()));
@@ -275,7 +279,7 @@ public class GitBrowseCommand extends AbstractGitCommand
}
private void createTree(TreeEntry parent, TreeWalk treeWalk) throws IOException {
Stack<TreeEntry> parents = new Stack<>();
Deque<TreeEntry> parents = new ArrayDeque<>();
parents.push(parent);
while (treeWalk.next()) {
final String currentPath = treeWalk.getPathString();
@@ -283,11 +287,15 @@ public class GitBrowseCommand extends AbstractGitCommand
parents.pop();
}
TreeEntry currentParent = parents.peek();
TreeEntry treeEntry = new TreeEntry(repo, treeWalk);
currentParent.addChild(treeEntry);
if (request.isRecursive() && treeEntry.getType() == TreeType.DIRECTORY) {
treeWalk.enterSubtree();
parents.push(treeEntry);
TreeEntry treeEntry = createTreeEntry(repo, treeWalk);
if (treeEntry != null) {
currentParent.addChild(treeEntry);
if (request.isRecursive() && treeEntry.getType() == TreeType.DIRECTORY) {
treeWalk.enterSubtree();
parents.push(treeEntry);
}
} else {
logger.warn("failed to find tree entry for {}", currentPath);
}
}
}
@@ -304,7 +312,12 @@ public class GitBrowseCommand extends AbstractGitCommand
currentDepth++;
if (currentDepth >= limit) {
return createFileObject(new TreeEntry(repo, treeWalk));
TreeEntry treeEntry = createTreeEntry(repo, treeWalk);
if (treeEntry != null) {
return createFileObject(treeEntry);
} else {
logger.warn("could not find tree entry at {}", name);
}
} else {
treeWalk.enterSubtree();
}
@@ -328,8 +341,12 @@ public class GitBrowseCommand extends AbstractGitCommand
}
}
private SubRepository getSubRepository(String path)
throws IOException {
@Nullable
private SubRepository getSubRepository(String path) throws IOException {
if (request.isDisableSubRepositoryDetection()) {
return null;
}
Map<String, SubRepository> subRepositories = subrepositoryCache.get(revId);
if (subRepositories == null) {
@@ -447,6 +464,23 @@ public class GitBrowseCommand extends AbstractGitCommand
FILE, DIRECTORY, SUB_REPOSITORY
}
@Nullable
TreeEntry createTreeEntry(org.eclipse.jgit.lib.Repository repo, TreeWalk treeWalk) throws IOException {
String pathString = treeWalk.getPathString();
ObjectId objectId = treeWalk.getObjectId(0);
SubRepository subRepository = getSubRepository(pathString);
if (subRepository != null) {
return new TreeEntry(pathString, treeWalk.getNameString(), objectId, subRepository);
} else if (repo.getObjectDatabase().has(objectId)) {
TreeType type = TreeType.FILE;
if (repo.open(objectId).getType() == Constants.OBJ_TREE) {
type = TreeType.DIRECTORY;
}
return new TreeEntry(pathString, treeWalk.getNameString(), objectId, type);
}
return null;
}
private class TreeEntry {
private final String pathString;
@@ -466,21 +500,20 @@ public class GitBrowseCommand extends AbstractGitCommand
type = TreeType.DIRECTORY;
}
TreeEntry(org.eclipse.jgit.lib.Repository repo, TreeWalk treeWalk) throws IOException {
this.pathString = treeWalk.getPathString();
this.nameString = treeWalk.getNameString();
this.objectId = treeWalk.getObjectId(0);
TreeEntry(String pathString, String nameString, ObjectId objectId, SubRepository subRepository) {
this.pathString = pathString;
this.nameString = nameString;
this.objectId = objectId;
this.type = TreeType.SUB_REPOSITORY;
this.subRepository = subRepository;
}
if (!request.isDisableSubRepositoryDetection() && GitBrowseCommand.this.getSubRepository(pathString) != null) {
subRepository = GitBrowseCommand.this.getSubRepository(pathString);
type = TreeType.SUB_REPOSITORY;
} else if (repo.open(objectId).getType() == Constants.OBJ_TREE) {
subRepository = null;
type = TreeType.DIRECTORY;
} else {
subRepository = null;
type = TreeType.FILE;
}
TreeEntry(String pathString, String nameString, ObjectId objectId, TreeType type) {
this.pathString = pathString;
this.nameString = nameString;
this.objectId = objectId;
this.type = type;
this.subRepository = null;
}
String getPathString() {