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

fix svn browse command external directory

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-10-07 17:37:59 +02:00
parent 90580e902d
commit 9271da85a5
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
View File

@@ -46,7 +46,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import static java.util.Comparator.comparing;
import static org.tmatesoft.svn.core.SVNErrorCode.FS_NO_SUCH_REVISION;
import static sonia.scm.ContextEntry.ContextBuilder.entity;
import static sonia.scm.NotFoundException.notFound;
@@ -196,21 +195,30 @@ public class SvnBrowseCommand extends AbstractSvnCommand
String externals = properties.getStringValue(SVNProperty.EXTERNALS).replaceAll("[\\r\\n]+", "");
String[] externalsArray = externals.split(" ");
String subRepoName = "";
for (String external : externalsArray) {
if (shouldSetExternal(external)) {
externals = external;
} else if (!external.contains("-r") && !external.isEmpty()) {
subRepoName = external;
}
}
if (Util.isNotEmpty(externals)) {
SubRepository subRepository = new SubRepository(externals);
FileObject subRepositoryDirectory = new FileObject();
subRepositoryDirectory.setSubRepository(subRepository);
fileObject.addChild(subRepositoryDirectory);
fileObject.addChild(createSubRepoDirectory(subRepository, subRepoName));
}
} catch (SVNException ex) {
logger.error("could not fetch file properties", ex);
}
}
private FileObject createSubRepoDirectory(SubRepository subRepository, String subRepoName) {
FileObject subRepositoryDirectory = new FileObject();
subRepositoryDirectory.setPath(subRepoName);
subRepositoryDirectory.setName(subRepoName);
subRepositoryDirectory.setDirectory(true);
subRepositoryDirectory.setSubRepository(subRepository);
return subRepositoryDirectory;
}
}