Updated Branches: refs/heads/master fe94aa814 -> 438ae025e
Add rb/jira review tool Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/438ae025 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/438ae025 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/438ae025 Branch: refs/heads/master Commit: 438ae025e67beca5df012e0e7b086e9d315cfcf7 Parents: fe94aa8 Author: Timothy Chen <[email protected]> Authored: Tue Sep 24 18:53:19 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Wed Oct 30 15:47:31 2013 -0700 ---------------------------------------------------------------------- tools/drill-patch-review.py | 109 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/438ae025/tools/drill-patch-review.py ---------------------------------------------------------------------- diff --git a/tools/drill-patch-review.py b/tools/drill-patch-review.py new file mode 100755 index 0000000..7552533 --- /dev/null +++ b/tools/drill-patch-review.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python + +# Modified based on Kafka's patch review tool + +import argparse +import sys +import os +import time +import datetime +import tempfile +from jira.client import JIRA + +def get_jira(): + options = { + 'server': 'https://issues.apache.org/jira' + } + # read the config file + home=jira_home=os.getenv('HOME') + home=home.rstrip('/') + jira_config = dict(line.strip().split('=') for line in open(home + '/jira.ini')) + jira = JIRA(options,basic_auth=(jira_config['user'], jira_config['password'])) + return jira + +def main(): + ''' main(), shut up, pylint ''' + popt = argparse.ArgumentParser(description='Drill patch review tool') + popt.add_argument('-b', '--branch', action='store', dest='branch', required=True, help='Tracking branch to create diff against') + popt.add_argument('-j', '--jira', action='store', dest='jira', required=True, help='JIRA corresponding to the reviewboard') + popt.add_argument('-s', '--summary', action='store', dest='summary', required=False, help='Summary for the reviewboard') + popt.add_argument('-d', '--description', action='store', dest='description', required=False, help='Description for reviewboard') + popt.add_argument('-r', '--rb', action='store', dest='reviewboard', required=False, help='Review board that needs to be updated') + popt.add_argument('-t', '--testing-done', action='store', dest='testing', required=False, help='Text for the Testing Done section of the reviewboard') + popt.add_argument('-db', '--debug', action='store_true', required=False, help='Enable debug mode') + popt.add_argument('-rbu', '--reviewboard-user', action='store', dest='reviewboard_user', required=True, help='Review board user name') + popt.add_argument('-rbp', '--reviewboard-password', action='store', dest='reviewboard_password', required=True, help='Review board user password') + opt = popt.parse_args() + + patch_file=tempfile.gettempdir() + "/" + opt.jira + ".patch" + if opt.reviewboard: + ts = time.time() + st = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d_%H:%M:%S') + patch_file=tempfile.gettempdir() + "/" + opt.jira + '_' + st + '.patch' + + git_remote_update="git remote update" + print "Updating your remote branches to pull the latest changes" + p=os.popen(git_remote_update) + p.close() + + rb_command="post-review --publish --tracking-branch " + opt.branch + " --target-groups=drill-git --bugs-closed=" + opt.jira + rb_command=rb_command + " --username " + opt.reviewboard_user + " --password " + opt.reviewboard_password + + if opt.debug: + rb_command=rb_command + " --debug" + summary="Patch for " + opt.jira + if opt.summary: + summary=opt.summary + rb_command=rb_command + " --summary \"" + summary + "\"" + if opt.description: + rb_command=rb_command + " --description \"" + opt.description + "\"" + if opt.reviewboard: + rb_command=rb_command + " -r " + opt.reviewboard + if opt.testing: + rb_command=rb_command + " --testing-done=" + opt.testing + if opt.debug: + print rb_command + p=os.popen(rb_command) + rb_url="" + for line in p: + print line + if line.startswith('http'): + rb_url = line + elif line.startswith("There don't seem to be any diffs"): + print 'ERROR: Your reviewboard was not created/updated since there was no diff to upload. The reasons that can cause this issue are 1) Your diff is not checked into your local branch. Please check in the diff to the local branch and retry 2) You are not specifying the local branch name as part of the --branch option. Please specify the remote branch name obtained from git branch -r' + p.close() + sys.exit(1) + elif line.startswith("Your review request still exists, but the diff is not attached") and not opt.debug: + print 'ERROR: Your reviewboard was not created/updated. Please run the script with the --debug option to troubleshoot the problem' + p.close() + sys.exit(1) + p.close() + if opt.debug: + print 'rb url=',rb_url + + git_command="git diff " + opt.branch + " > " + patch_file + if opt.debug: + print git_command + p=os.popen(git_command) + p.close() + + print 'Creating diff against', opt.branch, 'and uploading patch to JIRA',opt.jira + jira=get_jira() + issue = jira.issue(opt.jira) + attachment=open(patch_file) + jira.add_attachment(issue,attachment) + attachment.close() + + comment="Created reviewboard " + if not opt.reviewboard: + print 'Created a new reviewboard ',rb_url + else: + print 'Updated reviewboard',opt.reviewboard + comment="Updated reviewboard " + + comment = comment + rb_url + jira.add_comment(opt.jira, comment) + +if __name__ == '__main__': + sys.exit(main()) +
