Tools/git-repo
1
0
Fork 0
Code Activity

manifest: Support a default upstream value

Browse source 
It's convenient to set upstream for all projects in a manifest instead of
repeating the same value for each project.

Change-Id: I946b1de4efb01b351c332dfad108fa7d4f443cba
This commit is contained in:
Nasser Grainawi 2018-05-04 12:53:29 -06:00
parent 8d4b106642
commit da40341a3e
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
manifest_xml.py
View file

@ -59,6 +59,7 @@ class _Default(object):
revisionExpr = None
destBranchExpr = None
upstreamExpr = None
remote = None
sync_j = 1
sync_c = False
@ -230,6 +231,9 @@ class XmlManifest(object):
if d.destBranchExpr:
have_default = True
e.setAttribute('dest-branch', d.destBranchExpr)
if d.upstreamExpr:
have_default = True
e.setAttribute('upstream', d.upstreamExpr)
if d.sync_j > 1:
have_default = True
e.setAttribute('sync-j', '%d' % d.sync_j)
@ -295,7 +299,8 @@ class XmlManifest(object):
revision = self.remotes[p.remote.orig_name].revision or d.revisionExpr
if not revision or revision != p.revisionExpr:
e.setAttribute('revision', p.revisionExpr)
if p.upstream and p.upstream != p.revisionExpr:
if (p.upstream and (p.upstream != p.revisionExpr or
p.upstream != d.upstreamExpr)):
e.setAttribute('upstream', p.upstream)
if p.dest_branch and p.dest_branch != d.destBranchExpr:
@ -694,6 +699,7 @@ class XmlManifest(object):
d.revisionExpr = None
d.destBranchExpr = node.getAttribute('dest-branch') or None
d.upstreamExpr = node.getAttribute('upstream') or None
sync_j = node.getAttribute('sync-j')
if sync_j == '' or sync_j is None:
@ -830,7 +836,7 @@ class XmlManifest(object):
dest_branch = node.getAttribute('dest-branch') or self._default.destBranchExpr
upstream = node.getAttribute('upstream')
upstream = node.getAttribute('upstream') or self._default.upstreamExpr
groups = ''
if node.hasAttribute('groups'):