summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/manifest-format.md4
-rw-r--r--manifest_xml.py5
2 files changed, 9 insertions, 0 deletions
diff --git a/docs/manifest-format.md b/docs/manifest-format.md
index a39f97e8..b439dcb7 100644
--- a/docs/manifest-format.md
+++ b/docs/manifest-format.md
@@ -89,6 +89,7 @@ following DTD:
89 <!ATTLIST extend-project path CDATA #IMPLIED> 89 <!ATTLIST extend-project path CDATA #IMPLIED>
90 <!ATTLIST extend-project groups CDATA #IMPLIED> 90 <!ATTLIST extend-project groups CDATA #IMPLIED>
91 <!ATTLIST extend-project revision CDATA #IMPLIED> 91 <!ATTLIST extend-project revision CDATA #IMPLIED>
92 <!ATTLIST extend-project remote CDATA #IMPLIED>
92 93
93 <!ELEMENT remove-project EMPTY> 94 <!ELEMENT remove-project EMPTY>
94 <!ATTLIST remove-project name CDATA #REQUIRED> 95 <!ATTLIST remove-project name CDATA #REQUIRED>
@@ -306,6 +307,9 @@ belongs. Same syntax as the corresponding element of `project`.
306Attribute `revision`: If specified, overrides the revision of the original 307Attribute `revision`: If specified, overrides the revision of the original
307project. Same syntax as the corresponding element of `project`. 308project. Same syntax as the corresponding element of `project`.
308 309
310Attribute `remote`: If specified, overrides the remote of the original
311project. Same syntax as the corresponding element of `project`.
312
309### Element annotation 313### Element annotation
310 314
311Zero or more annotation elements may be specified as children of a 315Zero or more annotation elements may be specified as children of a
diff --git a/manifest_xml.py b/manifest_xml.py
index 4f7bd498..035cc61b 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -599,6 +599,9 @@ class XmlManifest(object):
599 if groups: 599 if groups:
600 groups = self._ParseGroups(groups) 600 groups = self._ParseGroups(groups)
601 revision = node.getAttribute('revision') 601 revision = node.getAttribute('revision')
602 remote = node.getAttribute('remote')
603 if remote:
604 remote = self._get_remote(node)
602 605
603 for p in self._projects[name]: 606 for p in self._projects[name]:
604 if path and p.relpath != path: 607 if path and p.relpath != path:
@@ -607,6 +610,8 @@ class XmlManifest(object):
607 p.groups.extend(groups) 610 p.groups.extend(groups)
608 if revision: 611 if revision:
609 p.revisionExpr = revision 612 p.revisionExpr = revision
613 if remote:
614 p.remote = remote.ToRemoteSpec(name)
610 if node.nodeName == 'repo-hooks': 615 if node.nodeName == 'repo-hooks':
611 # Get the name of the project and the (space-separated) list of enabled. 616 # Get the name of the project and the (space-separated) list of enabled.
612 repo_hooks_project = self._reqatt(node, 'in-project') 617 repo_hooks_project = self._reqatt(node, 'in-project')