Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 19:15:52 +01:00
Code Issues Packages Projects Releases Activity

Add multiple svn externals support

Browse Source
This commit is contained in:
Florian Scholdei
2020-10-08 00:43:17 +02:00
parent a2f1c88bfd
commit 622a9a0427
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,20 +193,22 @@ public class SvnBrowseCommand extends AbstractSvnCommand
repository.getDir(entry.getRelativePath(), revision, properties, (Collection) null); repository.getDir(entry.getRelativePath(), revision, properties, (Collection) null);
String externals = properties.getStringValue(SVNProperty.EXTERNALS).replaceAll("[\\r\\n]+", ""); String[] externals = properties.getStringValue(SVNProperty.EXTERNALS).split("\\r?\\n");
String subRepoUrl = ""; for (String external : externals) {
String subRepoPath = ""; String subRepoUrl = "";
for (String external : externals.split(" ")) { String subRepoPath = "";
if (shouldSetExternal(external)) { for (String externalPart : external.split(" ")) {
subRepoUrl = external; if (shouldSetExternal(externalPart)) {
} else if (!external.contains("-r") && !external.isEmpty()) { subRepoUrl = externalPart;
subRepoPath = external; } else if (!externalPart.contains("-r") && !externalPart.isEmpty()) {
subRepoPath = externalPart;
}
} }
}
if (Util.isNotEmpty(externals)) { if (Util.isNotEmpty(external)) {
SubRepository subRepository = new SubRepository(subRepoUrl); SubRepository subRepository = new SubRepository(subRepoUrl);
fileObject.addChild(createSubRepoDirectory(subRepository, subRepoPath)); fileObject.addChild(createSubRepoDirectory(subRepository, subRepoPath));
}
} }
} catch (SVNException ex) { } catch (SVNException ex) {
logger.error("could not fetch file properties", ex); logger.error("could not fetch file properties", ex);