diff options
| -rw-r--r-- | project.py | 11 | ||||
| -rw-r--r-- | subcmds/upload.py | 13 |
2 files changed, 23 insertions, 1 deletions
| @@ -176,11 +176,15 @@ class ReviewableBranch(object): | |||
| 176 | def UploadForReview(self, people, | 176 | def UploadForReview(self, people, |
| 177 | auto_topic=False, | 177 | auto_topic=False, |
| 178 | draft=False, | 178 | draft=False, |
| 179 | private=False, | ||
| 180 | wip=False, | ||
| 179 | dest_branch=None): | 181 | dest_branch=None): |
| 180 | self.project.UploadForReview(self.name, | 182 | self.project.UploadForReview(self.name, |
| 181 | people, | 183 | people, |
| 182 | auto_topic=auto_topic, | 184 | auto_topic=auto_topic, |
| 183 | draft=draft, | 185 | draft=draft, |
| 186 | private=private, | ||
| 187 | wip=wip, | ||
| 184 | dest_branch=dest_branch) | 188 | dest_branch=dest_branch) |
| 185 | 189 | ||
| 186 | def GetPublishedRefs(self): | 190 | def GetPublishedRefs(self): |
| @@ -1107,6 +1111,8 @@ class Project(object): | |||
| 1107 | people=([], []), | 1111 | people=([], []), |
| 1108 | auto_topic=False, | 1112 | auto_topic=False, |
| 1109 | draft=False, | 1113 | draft=False, |
| 1114 | private=False, | ||
| 1115 | wip=False, | ||
| 1110 | dest_branch=None): | 1116 | dest_branch=None): |
| 1111 | """Uploads the named branch for code review. | 1117 | """Uploads the named branch for code review. |
| 1112 | """ | 1118 | """ |
| @@ -1158,9 +1164,14 @@ class Project(object): | |||
| 1158 | dest_branch) | 1164 | dest_branch) |
| 1159 | if auto_topic: | 1165 | if auto_topic: |
| 1160 | ref_spec = ref_spec + '/' + branch.name | 1166 | ref_spec = ref_spec + '/' + branch.name |
| 1167 | |||
| 1161 | if not url.startswith('ssh://'): | 1168 | if not url.startswith('ssh://'): |
| 1162 | rp = ['r=%s' % p for p in people[0]] + \ | 1169 | rp = ['r=%s' % p for p in people[0]] + \ |
| 1163 | ['cc=%s' % p for p in people[1]] | 1170 | ['cc=%s' % p for p in people[1]] |
| 1171 | if private: | ||
| 1172 | rp = rp + ['private'] | ||
| 1173 | if wip: | ||
| 1174 | rp = rp + ['wip'] | ||
| 1164 | if rp: | 1175 | if rp: |
| 1165 | ref_spec = ref_spec + '%' + ','.join(rp) | 1176 | ref_spec = ref_spec + '%' + ','.join(rp) |
| 1166 | cmd.append(ref_spec) | 1177 | cmd.append(ref_spec) |
diff --git a/subcmds/upload.py b/subcmds/upload.py index fa80c3d2..61b18bc2 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py | |||
| @@ -154,6 +154,12 @@ Gerrit Code Review: http://code.google.com/p/gerrit/ | |||
| 154 | p.add_option('-d', '--draft', | 154 | p.add_option('-d', '--draft', |
| 155 | action='store_true', dest='draft', default=False, | 155 | action='store_true', dest='draft', default=False, |
| 156 | help='If specified, upload as a draft.') | 156 | help='If specified, upload as a draft.') |
| 157 | p.add_option('-p', '--private', | ||
| 158 | action='store_true', dest='private', default=False, | ||
| 159 | help='If specified, upload as a private change.') | ||
| 160 | p.add_option('-w', '--wip', | ||
| 161 | action='store_true', dest='wip', default=False, | ||
| 162 | help='If specified, upload as a work-in-progress change.') | ||
| 157 | p.add_option('-D', '--destination', '--dest', | 163 | p.add_option('-D', '--destination', '--dest', |
| 158 | type='string', action='store', dest='dest_branch', | 164 | type='string', action='store', dest='dest_branch', |
| 159 | metavar='BRANCH', | 165 | metavar='BRANCH', |
| @@ -378,7 +384,12 @@ Gerrit Code Review: http://code.google.com/p/gerrit/ | |||
| 378 | branch.uploaded = False | 384 | branch.uploaded = False |
| 379 | continue | 385 | continue |
| 380 | 386 | ||
| 381 | branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination) | 387 | branch.UploadForReview(people, |
| 388 | auto_topic=opt.auto_topic, | ||
| 389 | draft=opt.draft, | ||
| 390 | private=opt.private, | ||
| 391 | wip=opt.wip, | ||
| 392 | dest_branch=destination) | ||
| 382 | branch.uploaded = True | 393 | branch.uploaded = True |
| 383 | except UploadError as e: | 394 | except UploadError as e: |
| 384 | branch.error = e | 395 | branch.error = e |
