android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Respect remote aliases"

Browse Source
This commit is contained in:
Conley Owens 2013-10-10 16:08:42 +00:00 committed by Gerrit Code Review
commit b25ea555c3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifest_xml.py
View File

@ -91,6 +91,8 @@ class _XmlRemote(object):
def ToRemoteSpec(self, projectName): def ToRemoteSpec(self, projectName):
url = self.resolvedFetchUrl.rstrip('/') + '/' + projectName url = self.resolvedFetchUrl.rstrip('/') + '/' + projectName
remoteName = self.name remoteName = self.name
if self.remoteAlias:
remoteName = self.remoteAlias
return RemoteSpec(remoteName, url, self.reviewUrl) return RemoteSpec(remoteName, url, self.reviewUrl)
class XmlManifest(object): class XmlManifest(object):
@ -145,6 +147,8 @@ class XmlManifest(object):
root.appendChild(e) root.appendChild(e)
e.setAttribute('name', r.name) e.setAttribute('name', r.name)
e.setAttribute('fetch', r.fetchUrl) e.setAttribute('fetch', r.fetchUrl)
if r.remoteAlias is not None:
e.setAttribute('alias', r.remoteAlias)
if r.reviewUrl is not None: if r.reviewUrl is not None:
e.setAttribute('review', r.reviewUrl) e.setAttribute('review', r.reviewUrl)
@ -223,7 +227,8 @@ class XmlManifest(object):
e.setAttribute('name', name) e.setAttribute('name', name)
if relpath != name: if relpath != name:
e.setAttribute('path', relpath) 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) e.setAttribute('remote', p.remote.name)
if peg_rev: if peg_rev:
if self.IsMirror: if self.IsMirror: