diff options
Diffstat (limited to 'subcmds/manifest.py')
-rw-r--r-- | subcmds/manifest.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/subcmds/manifest.py b/subcmds/manifest.py index 399e241e..fb020d8c 100644 --- a/subcmds/manifest.py +++ b/subcmds/manifest.py | |||
@@ -38,7 +38,8 @@ The -r option can be used to generate a manifest file with project | |||
38 | revisions set to the current commit hash. These are known as | 38 | revisions set to the current commit hash. These are known as |
39 | "revision locked manifests", as they don't follow a particular branch. | 39 | "revision locked manifests", as they don't follow a particular branch. |
40 | In this case, the 'upstream' attribute is set to the ref we were on | 40 | In this case, the 'upstream' attribute is set to the ref we were on |
41 | when the manifest was generated. | 41 | when the manifest was generated. The 'dest-branch' attribute is set |
42 | to indicate the remote ref to push changes to via 'repo upload'. | ||
42 | """ | 43 | """ |
43 | 44 | ||
44 | @property | 45 | @property |
@@ -62,6 +63,11 @@ when the manifest was generated. | |||
62 | help='If in -r mode, do not write the upstream field. ' | 63 | help='If in -r mode, do not write the upstream field. ' |
63 | 'Only of use if the branch names for a sha1 manifest are ' | 64 | 'Only of use if the branch names for a sha1 manifest are ' |
64 | 'sensitive.') | 65 | 'sensitive.') |
66 | p.add_option('--suppress-dest-branch', dest='peg_rev_dest_branch', | ||
67 | default=True, action='store_false', | ||
68 | help='If in -r mode, do not write the dest-branch field. ' | ||
69 | 'Only of use if the branch names for a sha1 manifest are ' | ||
70 | 'sensitive.') | ||
65 | p.add_option('-o', '--output-file', | 71 | p.add_option('-o', '--output-file', |
66 | dest='output_file', | 72 | dest='output_file', |
67 | default='-', | 73 | default='-', |
@@ -79,7 +85,8 @@ when the manifest was generated. | |||
79 | fd = open(opt.output_file, 'w') | 85 | fd = open(opt.output_file, 'w') |
80 | self.manifest.Save(fd, | 86 | self.manifest.Save(fd, |
81 | peg_rev=opt.peg_rev, | 87 | peg_rev=opt.peg_rev, |
82 | peg_rev_upstream=opt.peg_rev_upstream) | 88 | peg_rev_upstream=opt.peg_rev_upstream, |
89 | peg_rev_dest_branch=opt.peg_rev_dest_branch) | ||
83 | fd.close() | 90 | fd.close() |
84 | if opt.output_file != '-': | 91 | if opt.output_file != '-': |
85 | print('Saved manifest to %s' % opt.output_file, file=sys.stderr) | 92 | print('Saved manifest to %s' % opt.output_file, file=sys.stderr) |