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 "Enable transferring of attribute using command 'repo manifest -o -'"

Browse Source
This commit is contained in:
Conley Owens 2014-08-22 16:13:16 +00:00 committed by Gerrit Code Review
commit 3a10968a70
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/manifest-format.txt
View File

@ -137,14 +137,14 @@ Project elements not setting their own `dest-branch` will inherit
this value. If this value is not set, projects will use `revision`
by default instead.
Attribute `sync_j`: Number of parallel jobs to use when synching.
Attribute `sync-j`: Number of parallel jobs to use when synching.
Attribute `sync_c`: Set to true to only sync the given Git
Attribute `sync-c`: Set to true to only sync the given Git
branch (specified in the `revision` attribute) rather than the
whole ref space. Project elements lacking a sync_c element of
whole ref space. Project elements lacking a sync-c element of
their own will use this value.
Attribute `sync_s`: Set to true to also sync sub-projects.
Attribute `sync-s`: Set to true to also sync sub-projects.
Element manifest-server
@ -232,11 +232,11 @@ group "notdefault", it will not be automatically downloaded by repo.
If the project has a parent element, the `name` and `path` here
are the prefixed ones.
Attribute `sync_c`: Set to true to only sync the given Git
Attribute `sync-c`: Set to true to only sync the given Git
branch (specified in the `revision` attribute) rather than the
whole ref space.
Attribute `sync_s`: Set to true to also sync sub-projects.
Attribute `sync-s`: Set to true to also sync sub-projects.
Attribute `upstream`: Name of the Git branch in which a sha1
can be found. Used when syncing a revision locked manifest in

2
manifest_xml.py
View File

@ -261,6 +261,8 @@ class XmlManifest(object):
revision = self.remotes[remoteName].revision or d.revisionExpr
if not revision or revision != p.revisionExpr:
e.setAttribute('revision', p.revisionExpr)
if p.upstream and p.upstream != p.revisionExpr:
e.setAttribute('upstream', p.upstream)
for c in p.copyfiles:
ce = doc.createElement('copyfile')