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

Implement simple implicit directories

Browse Source
This commit is contained in:
René Pfeuffer
2020-03-04 11:47:30 +01:00
parent cb1d9334bb
commit 7aa91bf846
2 changed files with 97 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommandResultReader.java
View File

@@ -7,6 +7,8 @@ import sonia.scm.repository.FileObject;
import sonia.scm.repository.SubRepository;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Deque;
import java.util.LinkedList;
@@ -34,6 +36,15 @@ class HgFileviewCommandResultReader {
if (isParent(current, file)) {
current.addChild(file);
break;
} else if (isAncestor(current, file)) {
Collection<FileObject> missingParents = createMissingParents(current, file);
for (FileObject subDir : missingParents) {
current.addChild(subDir);
stack.push(subDir);
current = stack.peek();
}
current.addChild(file);
break;
} else {
stack.pop();
}
@@ -82,6 +93,30 @@ class HgFileviewCommandResultReader {
return child.getParentPath().equals(parentPath);
}
private boolean isAncestor(FileObject ancestor, FileObject child) {
String ancestorPath = ancestor.getPath();
return child.getParentPath().startsWith(ancestorPath);
}
private Collection<FileObject> createMissingParents(FileObject current, FileObject file) {
String missingPath = file.getPath().substring(current.getPath().length(), file.getPath().lastIndexOf('/'));
FileObject directory = new FileObject();
directory.setName(getNameFromPath(missingPath));
directory.setDirectory(true);
directory.setPath(missingPath);
Collection<FileObject> parents = new ArrayList<>();
if (!isParent(current, directory)) {
parents.addAll(createMissingParents(current, directory));
}
parents.add(directory);
return parents;
}
private FileObject readDirectory(HgInputStream stream) throws IOException {
FileObject directory = new FileObject();
String path = removeTrailingSlash(stream.textUpTo('\0'));

62
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/javahg/HgFileviewCommandResultReaderTest.java
View File

@@ -118,6 +118,68 @@ class HgFileviewCommandResultReaderTest {
.containsExactly(false);
}
@Test
void shouldCreateDirectoriesImplicitly() throws IOException {
HgFileviewCommandResultReader reader = new MockInput()
.dir("")
.file("dir/a.txt")
.file("dir/b.txt")
.file("d.txt")
.build();
FileObject fileObject = reader.parseResult();
assertThat(fileObject.getChildren())
.extracting("name")
.containsExactly("dir", "d.txt");
assertThat(fileObject.getChildren())
.extracting("directory")
.containsExactly(true, false);
FileObject subDir = fileObject.getChildren().iterator().next();
assertThat(subDir.getChildren())
.extracting("name")
.containsExactly("a.txt", "b.txt");
assertThat(subDir.getChildren())
.extracting("directory")
.containsExactly(false, false);
}
@Test
void shouldCreateSubSubDirectoriesImplicitly() throws IOException {
HgFileviewCommandResultReader reader = new MockInput()
.dir("")
.file("dir/more/a.txt")
.file("dir/b.txt")
.file("d.txt")
.build();
FileObject fileObject = reader.parseResult();
assertThat(fileObject.getChildren())
.extracting("name")
.containsExactly("dir", "d.txt");
assertThat(fileObject.getChildren())
.extracting("directory")
.containsExactly(true, false);
FileObject subDir = fileObject.getChildren().iterator().next();
assertThat(subDir.getChildren())
.extracting("name")
.containsExactly("more", "b.txt");
assertThat(subDir.getChildren())
.extracting("directory")
.containsExactly(true, false);
FileObject subSubDir = subDir.getChildren().iterator().next();
assertThat(subSubDir.getChildren())
.extracting("name")
.containsExactly("a.txt");
assertThat(subSubDir.getChildren())
.extracting("directory")
.containsExactly(false);
}
@Test
void shouldIgnoreTimeAndCommentWhenDisabled() throws IOException {
HgFileviewCommandResultReader reader = new MockInput()