Browse Source

Support remove-project node in the manifest parser

This directive removes the projects added by other directives.

https://gerrit.googlesource.com/git-repo/+/65b0ba5aa0447f7ee25103828115662b1eb80ff9/manifest_xml.py#614
https://gerrit.googlesource.com/git-repo/+/e469a0c741832f6584513f4a382d6b93f417b8d2/docs/manifest-format.txt#339

Change-Id: I90d7b9fc711b586dec05f475422d34d67d909986
Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
stable-5.1
Masaya Suzuki 6 years ago
parent
commit
58a90f7a70
  1. 26
      org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java
  2. 3
      org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java

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

@ -43,6 +43,7 @@
package org.eclipse.jgit.gitrepo; package org.eclipse.jgit.gitrepo;
import static org.eclipse.jgit.lib.Constants.CHARSET; 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.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -51,6 +52,8 @@ import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.Test; import org.junit.Test;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@ -145,6 +148,29 @@ public class ManifestParserTest {
} }
} }
@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) { void testNormalize(String in, String want) {
URI got = ManifestParser.normalizeEmptyPath(URI.create(in)); URI got = ManifestParser.normalizeEmptyPath(URI.create(in));
if (!got.toString().equals(want)) { if (!got.toString().equals(want)) {

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

@ -252,6 +252,9 @@ public class ManifestParser extends DefaultHandler {
RepoText.get().errorIncludeFile, path), e); 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));
} }
} }

Loading…
Cancel
Save