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

Feature Partial Diff (#1581)

Browse Source 
With this pull request, diffs for Git are loaded in chunks. This means, that for diffs with a lot of files only a part of them are loaded. In the UI a button will be displayed to load more. In the REST API, the number of files can be specified. This only works for diffs, that are delivered as "parsed" diffs. Currently, this is only available for Git.

Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
This commit is contained in:
René Pfeuffer
2021-03-12 13:52:17 +01:00
committed by GitHub
parent e66553705f
commit 84c8e02bf1
37 changed files with 900 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffResultCommand.java
View File

@@ -36,7 +36,11 @@ import javax.inject.Inject;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Iterator;
import java.util.stream.Collectors;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import static java.util.Optional.ofNullable;
public class GitDiffResultCommand extends AbstractGitCommand implements DiffResultCommand {
@@ -47,17 +51,31 @@ public class GitDiffResultCommand extends AbstractGitCommand implements DiffResu
public DiffResult getDiffResult(DiffCommandRequest diffCommandRequest) throws IOException {
org.eclipse.jgit.lib.Repository repository = open();
return new GitDiffResult(repository, Differ.diff(repository, diffCommandRequest));
return new GitDiffResult(repository, Differ.diff(repository, diffCommandRequest), 0, null);
}
@Override
public DiffResult getDiffResult(DiffResultCommandRequest request) throws IOException {
org.eclipse.jgit.lib.Repository repository = open();
int offset = request.getOffset() == null ? 0 : request.getOffset();
return new GitDiffResult(repository, Differ.diff(repository, request), offset, request.getLimit());
}
private class GitDiffResult implements DiffResult {
private final org.eclipse.jgit.lib.Repository repository;
private final Differ.Diff diff;
private final List<DiffEntry> diffEntries;
private GitDiffResult(org.eclipse.jgit.lib.Repository repository, Differ.Diff diff) {
private final int offset;
private final Integer limit;
private GitDiffResult(org.eclipse.jgit.lib.Repository repository, Differ.Diff diff, int offset, Integer limit) {
this.repository = repository;
this.diff = diff;
this.offset = offset;
this.limit = limit;
this.diffEntries = diff.getEntries();
}
@Override
@@ -70,12 +88,32 @@ public class GitDiffResultCommand extends AbstractGitCommand implements DiffResu
return GitUtil.getId(diff.getCommit().getId());
}
@Override
public boolean isPartial() {
return limit != null && limit + offset < diffEntries.size();
}
@Override
public int getOffset() {
return offset;
}
@Override
public Optional<Integer> getLimit() {
return ofNullable(limit);
}
@Override
public Iterator<DiffFile> iterator() {
return diff.getEntries()
Stream<DiffEntry> diffEntryStream = diffEntries
.stream()
.skip(offset);
if (limit != null) {
diffEntryStream = diffEntryStream.limit(limit);
}
return diffEntryStream
.map(diffEntry -> new GitDiffFile(repository, diffEntry))
.collect(Collectors.<DiffFile>toList())
.map(DiffFile.class::cast)
.iterator();
}
}