Respect remote aliases
Previously, change I7150e449341ed8655d398956a095261978d95870
had broken alias support in order to fix the manifest command to keep
it from spitting projects that point to an alias that wasn't recorded.
This commit reverts that commit and instead solves the issue more
correctly, outputting the alias in the remote node of the manifest and
respecting that alias when outputting the list of projects.
Change-Id: I941fc4adb7121d2e61cedc5838e80d3918c977c3
diff --git a/manifest_xml.py b/manifest_xml.py
index e40e6fa..bdbb1d4 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -91,6 +91,8 @@
def ToRemoteSpec(self, projectName):
url = self.resolvedFetchUrl.rstrip('/') + '/' + projectName
remoteName = self.name
+ if self.remoteAlias:
+ remoteName = self.remoteAlias
return RemoteSpec(remoteName, url, self.reviewUrl)
class XmlManifest(object):
@@ -145,6 +147,8 @@
root.appendChild(e)
e.setAttribute('name', r.name)
e.setAttribute('fetch', r.fetchUrl)
+ if r.remoteAlias is not None:
+ e.setAttribute('alias', r.remoteAlias)
if r.reviewUrl is not None:
e.setAttribute('review', r.reviewUrl)
@@ -223,7 +227,8 @@
e.setAttribute('name', name)
if relpath != name:
e.setAttribute('path', relpath)
- if not d.remote or p.remote.name != d.remote.name:
+ remoteName = d.remote.remoteAlias or d.remote.name
+ if not d.remote or p.remote.name != remoteName:
e.setAttribute('remote', p.remote.name)
if peg_rev:
if self.IsMirror: