manifest: enable remove-project using path
A something.xml that gets included by two different
files, that both remove and add same shared project
to two different locations, would not work
prior to this change.
Reason is that remove killed all name keys, even
though reuse of same repo in different locations
is allowed.
Solve by adding optional attrib path to
<remove-project name="foo" path="only_this_path" />
and tweak remove-project.
Behaves as before without path, and deletes
more selectively when remove path is supplied.
As secondary feature, a project can now also be removed
by only using path, assuming a matching project name
can be found.
Change-Id: I502d9f949f5d858ddc1503846b170473f76dc8e2
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/375694
Tested-by: Fredrik de Groot <[email protected]>
Reviewed-by: Mike Frysinger <[email protected]>
diff --git a/docs/manifest-format.md b/docs/manifest-format.md
index edcb28cbd..36dae6d 100644
--- a/docs/manifest-format.md
+++ b/docs/manifest-format.md
@@ -109,8 +109,9 @@
<!ATTLIST extend-project upstream CDATA #IMPLIED>
<!ELEMENT remove-project EMPTY>
- <!ATTLIST remove-project name CDATA #REQUIRED>
- <!ATTLIST remove-project optional CDATA #IMPLIED>
+ <!ATTLIST remove-project name CDATA #IMPLIED>
+ <!ATTLIST remove-project path CDATA #IMPLIED>
+ <!ATTLIST remove-project optional CDATA #IMPLIED>
<!ELEMENT repo-hooks EMPTY>
<!ATTLIST repo-hooks in-project CDATA #REQUIRED>
@@ -473,7 +474,7 @@
### Element remove-project
-Deletes the named project from the internal manifest table, possibly
+Deletes a project from the internal manifest table, possibly
allowing a subsequent project element in the same manifest file to
replace the project with a different source.
@@ -481,6 +482,17 @@
the user can remove a project, and possibly replace it with their
own definition.
+The project `name` or project `path` can be used to specify the remove target
+meaning one of them is required. If only name is specified, all
+projects with that name are removed.
+
+If both name and path are specified, only projects with the same name and
+path are removed, meaning projects with the same name but in other
+locations are kept.
+
+If only path is specified, a matching project is removed regardless of its
+name. Logic otherwise behaves like both are specified.
+
Attribute `optional`: Set to true to ignore remove-project elements with no
matching `project` element.
