commit bd0aae95f56d46cef665e11f2ee88581b88fcfce
author Kyunam Jo <kyunam.jo@gmail.com> Tue Feb 04 11:38:53 2020 +0900
committer Mike Frysinger <vapier@google.com> Tue Feb 04 22:42:28 2020 +0000
tree d071eff6faaf750ee88fa95804945d6b9bffe145
parent e6a202f790daaf204513b8c53b824fcc246f9972

Add a way to override the remote using <extend-project>

This commit supports for the 'remote' attribute in
<extend-project>. This avoids the need to perform a <remove-project>
followed by a <project> in local manifests.

Change-Id: I9f9347913337ec9d159bc264d15ce97881ae5398
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253092
Tested-by: Kyunam Jo <kyunam.jo@gmail.com>
Reviewed-by: Mike Frysinger <vapier@google.com>

docs/manifest-format.md

diff --git a/docs/manifest-format.md b/docs/manifest-format.md
index a39f97e..b439dcb 100644
--- a/docs/manifest-format.md
+++ b/docs/manifest-format.md
@@ -89,6 +89,7 @@
   <!ATTLIST extend-project path CDATA #IMPLIED>
   <!ATTLIST extend-project groups CDATA #IMPLIED>
   <!ATTLIST extend-project revision CDATA #IMPLIED>
+  <!ATTLIST extend-project remote CDATA #IMPLIED>
 
   <!ELEMENT remove-project EMPTY>
   <!ATTLIST remove-project name  CDATA #REQUIRED>
@@ -306,6 +307,9 @@
 Attribute `revision`: If specified, overrides the revision of the original
 project.  Same syntax as the corresponding element of `project`.
 
+Attribute `remote`: If specified, overrides the remote of the original
+project.  Same syntax as the corresponding element of `project`.
+
 ### Element annotation
 
 Zero or more annotation elements may be specified as children of a

manifest_xml.py

diff --git a/manifest_xml.py b/manifest_xml.py
index 4f7bd49..035cc61 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -599,6 +599,9 @@
         if groups:
           groups = self._ParseGroups(groups)
         revision = node.getAttribute('revision')
+        remote = node.getAttribute('remote')
+        if remote:
+          remote = self._get_remote(node)
 
         for p in self._projects[name]:
           if path and p.relpath != path:
@@ -607,6 +610,8 @@
             p.groups.extend(groups)
           if revision:
             p.revisionExpr = revision
+          if remote:
+            p.remote = remote.ToRemoteSpec(name)
       if node.nodeName == 'repo-hooks':
         # Get the name of the project and the (space-separated) list of enabled.
         repo_hooks_project = self._reqatt(node, 'in-project')