commit b25ea555c39cd500740acb74fa9f1dab71588266
author Conley Owens <cco3@android.com> Thu Oct 10 16:08:42 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 10 16:08:42 2013 +0000
tree 582f1552132c86f08b8934d81b59a8d743619cd7
parent 3bfd72158c11583213037ddfe5224c2038288383
parent 1e7ab2a63f7ec53aa649015dff8d46ad2501d993

Merge "Respect remote aliases"

manifest_xml.py

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: