summaryrefslogtreecommitdiffstats
path: root/subcmds
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds')
-rw-r--r--subcmds/forall.py4
-rw-r--r--subcmds/manifest.py5
2 files changed, 9 insertions, 0 deletions
diff --git a/subcmds/forall.py b/subcmds/forall.py
index a13793d0..55d61ecb 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -179,6 +179,8 @@ without iterating through the remaining projects.
179 'annotations': dict((a.name, a.value) for a in project.annotations), 179 'annotations': dict((a.name, a.value) for a in project.annotations),
180 'gitdir': project.gitdir, 180 'gitdir': project.gitdir,
181 'worktree': project.worktree, 181 'worktree': project.worktree,
182 'upstream': project.upstream,
183 'dest_branch': project.dest_branch,
182 } 184 }
183 185
184 def ValidateOptions(self, opt, args): 186 def ValidateOptions(self, opt, args):
@@ -317,6 +319,8 @@ def DoWork(project, mirror, opt, cmd, shell, cnt, config):
317 setenv('REPO_REMOTE', project['remote_name']) 319 setenv('REPO_REMOTE', project['remote_name'])
318 setenv('REPO_LREV', project['lrev']) 320 setenv('REPO_LREV', project['lrev'])
319 setenv('REPO_RREV', project['rrev']) 321 setenv('REPO_RREV', project['rrev'])
322 setenv('REPO_UPSTREAM', project['upstream'])
323 setenv('REPO_DEST_BRANCH', project['dest_branch'])
320 setenv('REPO_I', str(cnt + 1)) 324 setenv('REPO_I', str(cnt + 1))
321 for name in project['annotations']: 325 for name in project['annotations']:
322 setenv("REPO__%s" % (name), project['annotations'][name]) 326 setenv("REPO__%s" % (name), project['annotations'][name])
diff --git a/subcmds/manifest.py b/subcmds/manifest.py
index d9f242ee..399e241e 100644
--- a/subcmds/manifest.py
+++ b/subcmds/manifest.py
@@ -34,6 +34,11 @@ The manifest and (if present) local_manifest.xml are combined
34together to produce a single manifest file. This file can be stored 34together to produce a single manifest file. This file can be stored
35in a Git repository for use during future 'repo init' invocations. 35in a Git repository for use during future 'repo init' invocations.
36 36
37The -r option can be used to generate a manifest file with project
38revisions set to the current commit hash. These are known as
39"revision locked manifests", as they don't follow a particular branch.
40In this case, the 'upstream' attribute is set to the ref we were on
41when the manifest was generated.
37""" 42"""
38 43
39 @property 44 @property