Support --push-option in upload subcommand

Change-Id: I44836f8c66ded5a96cbf5431912e027e681f6529
This commit is contained in:
Masaya Suzuki 2017-11-13 10:48:34 -08:00
parent 84e7e16d35
commit 305a2d029f
2 changed files with 16 additions and 4 deletions

View File

@ -180,7 +180,8 @@ class ReviewableBranch(object):
private=False, private=False,
wip=False, wip=False,
dest_branch=None, dest_branch=None,
validate_certs=True): validate_certs=True,
push_options=None):
self.project.UploadForReview(self.name, self.project.UploadForReview(self.name,
people, people,
auto_topic=auto_topic, auto_topic=auto_topic,
@ -188,7 +189,8 @@ class ReviewableBranch(object):
private=private, private=private,
wip=wip, wip=wip,
dest_branch=dest_branch, dest_branch=dest_branch,
validate_certs=validate_certs) validate_certs=validate_certs,
push_options=push_options)
def GetPublishedRefs(self): def GetPublishedRefs(self):
refs = {} refs = {}
@ -1117,7 +1119,8 @@ class Project(object):
private=False, private=False,
wip=False, wip=False,
dest_branch=None, dest_branch=None,
validate_certs=True): validate_certs=True,
push_options=None):
"""Uploads the named branch for code review. """Uploads the named branch for code review.
""" """
if branch is None: if branch is None:
@ -1155,6 +1158,10 @@ class Project(object):
rp.append('--cc=%s' % sq(e)) rp.append('--cc=%s' % sq(e))
cmd.append('--receive-pack=%s' % " ".join(rp)) cmd.append('--receive-pack=%s' % " ".join(rp))
for push_option in (push_options or []):
cmd.append('-o')
cmd.append(push_option)
cmd.append(url) cmd.append(url)
if dest_branch.startswith(R_HEADS): if dest_branch.startswith(R_HEADS):

View File

@ -160,6 +160,10 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
p.add_option('-w', '--wip', p.add_option('-w', '--wip',
action='store_true', dest='wip', default=False, action='store_true', dest='wip', default=False,
help='If specified, upload as a work-in-progress change.') help='If specified, upload as a work-in-progress change.')
p.add_option('-o', '--push-option',
type='string', action='append', dest='push_options',
default=[],
help='Additional push options to transmit')
p.add_option('-D', '--destination', '--dest', p.add_option('-D', '--destination', '--dest',
type='string', action='store', dest='dest_branch', type='string', action='store', dest='dest_branch',
metavar='BRANCH', metavar='BRANCH',
@ -393,7 +397,8 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
private=opt.private, private=opt.private,
wip=opt.wip, wip=opt.wip,
dest_branch=destination, dest_branch=destination,
validate_certs=opt.validate_certs) validate_certs=opt.validate_certs,
push_options=opt.push_options)
branch.uploaded = True branch.uploaded = True
except UploadError as e: except UploadError as e: