Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-26 08:06:09 +01:00
Code Issues Packages Projects Releases Activity

Fix NotFoundExceptions with SVN externals

Browse Source 
Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2023-03-21 16:10:04 +01:00
committed by SCM-Manager
parent b511789620
commit 796330f883
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/not_found_svn_externals.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Not found exception with SVN externals

2
scm-core/src/main/java/sonia/scm/repository/api/BrowserResultCollapser.java
View File

@@ -50,7 +50,7 @@ class BrowserResultCollapser {
List<FileObject> collapsedChildren = new ArrayList<>();
for (FileObject child : fo.getChildren()) {
if (child.isDirectory()) {
if (child.isDirectory() && child.getSubRepository() == null) {
child = traverseFolder(child);
}
collapsedChildren.add(child);

30
scm-core/src/test/java/sonia/scm/repository/api/BrowserResultCollapserTest.java
View File

@@ -30,6 +30,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import sonia.scm.NotFoundException;
import sonia.scm.repository.BrowserResult;
import sonia.scm.repository.FileObject;
import sonia.scm.repository.SubRepository;
@@ -42,6 +43,8 @@ import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -56,7 +59,7 @@ class BrowserResultCollapserTest {
@BeforeEach
void setUp() throws Exception {
browseResults = new HashMap<>();
when(browseCommand.getBrowserResult(any(BrowseCommandRequest.class)))
lenient().when(browseCommand.getBrowserResult(any(BrowseCommandRequest.class)))
.thenAnswer(
(Answer<BrowserResult>) invocation -> {
BrowseCommandRequest request = (BrowseCommandRequest) invocation.getArguments()[0];
@@ -202,6 +205,31 @@ class BrowserResultCollapserTest {
assertContains(children, "folder_b", "folder_b");
}
/*
For SVN, externals must not be "browsed" because this throws a not found exception.
/
└─ folder_b/external
*/
@Test
void collapseFoldersShouldNotCollapseSvnExternal() throws Exception {
FileObject root = createFolder(null, "");
FileObject external = createFolder(root, "folder_b/external");
external.setSubRepository(mock(SubRepository.class));
lenient().when(browseCommand.getBrowserResult(argThat(request -> request.getPath().equals("folder_b/external"))))
.thenThrow(NotFoundException.class);
BrowserResult result = new BrowserResult("revision", root);
BrowseCommandRequest request = new BrowseCommandRequest();
new BrowserResultCollapser().collapseFolders(browseCommand, request, result.getFile());
FileObject f = result.getFile();
Collection<FileObject> children = f.getChildren();
assertThat(children).hasSize(1);
assertContains(children, "folder_b/external", "folder_b/external");
}
/*
/
├─ scm-plugins