AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Infra] Add ability to specify a cc_list to git_utils.py

Browse Source 
Bug: skia:7310
Change-Id: I8ef505025e2cf0b7859e54e85293efed16704398
Reviewed-on: https://skia-review.googlesource.com/82200
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Ravi Mistry 2017-12-07 14:46:40 -05:00 committed by Skia Commit-Bot
parent 15f46c3c1f
commit a4ceaa1e5a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infra/bots/git_utils.py
View File

@ -47,13 +47,14 @@ class GitBranch(object):
created temporary branch upon exit. created temporary branch upon exit.
""" """
def __init__(self, branch_name, commit_msg, upload=True, commit_queue=False, def __init__(self, branch_name, commit_msg, upload=True, commit_queue=False,
delete_when_finished=True): delete_when_finished=True, cc_list=None):
self._branch_name = branch_name self._branch_name = branch_name
self._commit_msg = commit_msg self._commit_msg = commit_msg
self._upload = upload self._upload = upload
self._commit_queue = commit_queue self._commit_queue = commit_queue
self._patch_set = 0 self._patch_set = 0
self._delete_when_finished = delete_when_finished self._delete_when_finished = delete_when_finished
self._cc_list = cc_list
def __enter__(self): def __enter__(self):
subprocess.check_call(['git', 'reset', '--hard', 'HEAD']) subprocess.check_call(['git', 'reset', '--hard', 'HEAD'])
@ -76,6 +77,8 @@ class GitBranch(object):
upload_cmd.append('--use-commit-queue') upload_cmd.append('--use-commit-queue')
# Need the --send-mail flag to publish the CL and remove WIP bit. # Need the --send-mail flag to publish the CL and remove WIP bit.
upload_cmd.append('--send-mail') upload_cmd.append('--send-mail')
if self._cc_list:
upload_cmd.extend(['--cc=%s' % ','.join(self._cc_list)])
subprocess.check_call(upload_cmd) subprocess.check_call(upload_cmd)
output = subprocess.check_output(['git', 'cl', 'issue']).rstrip() output = subprocess.check_output(['git', 'cl', 'issue']).rstrip()
return re.match('^Issue number: (?P<issue>\d+) \((?P<issue_url>.+)\)$', return re.match('^Issue number: (?P<issue>\d+) \((?P<issue_url>.+)\)$',