motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Support remove-project node in the manifest parser"

This commit is contained in:
Jonathan Nieder 2018-08-20 22:14:35 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 0c12df54f1 58a90f7a70
commit af75250a45
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.gitrepo;
import static org.eclipse.jgit.lib.Constants.CHARSET;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@ -51,6 +52,8 @@
import java.net.URI;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.Test;
import org.xml.sax.SAXException;
@ -145,6 +148,29 @@ public void testManifestParserWithMissingFetchOnRemote() throws Exception {
}
}
@Test
public void testRemoveProject() throws Exception {
StringBuilder xmlContent = new StringBuilder();
xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />")
.append("<project path=\"foo\" name=\"foo\" />")
.append("<project path=\"bar\" name=\"bar\" />")
.append("<remove-project name=\"foo\" />")
.append("<project path=\"foo\" name=\"baz\" />")
.append("</manifest>");
ManifestParser parser = new ManifestParser(null, null, "master",
"https://git.google.com/", null, null);
parser.read(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET)));
assertEquals(Stream.of("bar", "baz").collect(Collectors.toSet()),
parser.getProjects().stream().map(RepoProject::getName)
.collect(Collectors.toSet()));
}
void testNormalize(String in, String want) {
URI got = ManifestParser.normalizeEmptyPath(URI.create(in));
if (!got.toString().equals(want)) {

3
org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java
View File

@ -252,6 +252,9 @@ public void startElement(
RepoText.get().errorIncludeFile, path), e);
}
}
} else if ("remove-project".equals(qName)) { //$NON-NLS-1$
String name = attributes.getValue("name"); //$NON-NLS-1$
projects.removeIf((p) -> p.getName().equals(name));
}
}