mirror of https://github.com/apache/kafka.git
MINOR; Update merge script to work against Python3
Made the following changes so that it works in Python3: 1. Use `print()` instead of `print` 2. Use urllib instead of urllib2 3. Decode all of the cmd outputs from binary to string using UTF-8 4. Use `input` instead of `raw_input` 5. Use `next()` on the iterator returned by `filter()` instead `__get_item__()` 6. Fix any error returned by `pylint`. Author: José Armando García Sancio <jsancio@gmail.com> Reviewers: David Jacot <djacot@confluent.io> Closes #11536 from jsancio/minor-merge-pr-script
This commit is contained in:
José Armando García Sancio
José Armando García Sancio
parent
d565c969f3
commit
0c01ab67a0
|
|
@ -32,7 +32,7 @@ import os
|
|||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
import urllib2
|
||||
import urllib
|
||||
|
||||
try:
|
||||
import jira.client
|
||||
|
|
@ -72,55 +72,62 @@ DEV_BRANCH_NAME = "trunk"
|
|||
|
||||
DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.2.0")
|
||||
|
||||
ORIGINAL_HEAD = ""
|
||||
|
||||
def get_json(url):
|
||||
try:
|
||||
request = urllib2.Request(url)
|
||||
request = urllib.request.Request(url)
|
||||
if GITHUB_OAUTH_KEY:
|
||||
request.add_header('Authorization', 'token %s' % GITHUB_OAUTH_KEY)
|
||||
return json.load(urllib2.urlopen(request))
|
||||
except urllib2.HTTPError as e:
|
||||
if "X-RateLimit-Remaining" in e.headers and e.headers["X-RateLimit-Remaining"] == '0':
|
||||
print "Exceeded the GitHub API rate limit; see the instructions in " + \
|
||||
"kafka-merge-pr.py to configure an OAuth token for making authenticated " + \
|
||||
"GitHub requests."
|
||||
return json.load(urllib.request.urlopen(request))
|
||||
except urllib.error.HTTPError as error:
|
||||
if "X-RateLimit-Remaining" in error.headers and error.headers["X-RateLimit-Remaining"] == '0':
|
||||
print("Exceeded the GitHub API rate limit; see the instructions in " +
|
||||
"kafka-merge-pr.py to configure an OAuth token for making authenticated " +
|
||||
"GitHub requests.")
|
||||
else:
|
||||
print "Unable to fetch URL, exiting: %s" % url
|
||||
print("Unable to fetch URL, exiting: %s" % url)
|
||||
sys.exit(-1)
|
||||
|
||||
|
||||
def fail(msg):
|
||||
print msg
|
||||
print(msg)
|
||||
clean_up()
|
||||
sys.exit(-1)
|
||||
|
||||
|
||||
def run_cmd(cmd):
|
||||
print cmd
|
||||
print(cmd)
|
||||
if isinstance(cmd, list):
|
||||
return subprocess.check_output(cmd)
|
||||
result = subprocess.check_output(cmd)
|
||||
else:
|
||||
return subprocess.check_output(cmd.split(" "))
|
||||
result = subprocess.check_output(cmd.split(" "))
|
||||
|
||||
return result.decode("utf-8")
|
||||
|
||||
|
||||
def continue_maybe(prompt):
|
||||
result = raw_input("\n%s (y/n): " % prompt)
|
||||
result = input("\n%s (y/n): " % prompt)
|
||||
if result.lower() != "y":
|
||||
fail("Okay, exiting")
|
||||
|
||||
|
||||
def clean_up():
|
||||
if original_head != get_current_branch():
|
||||
print "Restoring head pointer to %s" % original_head
|
||||
run_cmd("git checkout %s" % original_head)
|
||||
if ORIGINAL_HEAD != get_current_branch():
|
||||
print("Restoring head pointer to %s" % ORIGINAL_HEAD)
|
||||
run_cmd("git checkout %s" % ORIGINAL_HEAD)
|
||||
|
||||
branches = run_cmd("git branch").replace(" ", "").split("\n")
|
||||
|
||||
for branch in filter(lambda x: x.startswith(TEMP_BRANCH_PREFIX), branches):
|
||||
print "Deleting local branch %s" % branch
|
||||
print("Deleting local branch %s" % branch)
|
||||
run_cmd("git branch -D %s" % branch)
|
||||
|
||||
|
||||
def get_current_branch():
|
||||
return run_cmd("git rev-parse --abbrev-ref HEAD").replace("\n", "")
|
||||
|
||||
|
||||
# merge the requested PR and return the merge hash
|
||||
def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
|
||||
pr_branch_name = "%s_MERGE_PR_%s" % (TEMP_BRANCH_PREFIX, pr_num)
|
||||
|
|
@ -132,24 +139,23 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
|
|||
had_conflicts = False
|
||||
try:
|
||||
run_cmd(['git', 'merge', pr_branch_name, '--squash'])
|
||||
except Exception as e:
|
||||
msg = "Error merging: %s\nWould you like to manually fix-up this merge?" % e
|
||||
except Exception as error:
|
||||
msg = "Error merging: %s\nWould you like to manually fix-up this merge?" % error
|
||||
continue_maybe(msg)
|
||||
msg = "Okay, please fix any conflicts and 'git add' conflicting files... Finished?"
|
||||
continue_maybe(msg)
|
||||
had_conflicts = True
|
||||
|
||||
commit_authors = run_cmd(['git', 'log', 'HEAD..%s' % pr_branch_name,
|
||||
'--pretty=format:%an <%ae>']).split("\n")
|
||||
distinct_authors = sorted(set(commit_authors),
|
||||
key=lambda x: commit_authors.count(x), reverse=True)
|
||||
primary_author = raw_input(
|
||||
commit_authors = run_cmd(
|
||||
['git', 'log', 'HEAD..%s' % pr_branch_name, '--pretty=format:%an <%ae>']).split("\n")
|
||||
distinct_authors = sorted(set(commit_authors), key=commit_authors.count, reverse=True)
|
||||
primary_author = input(
|
||||
"Enter primary author in the format of \"name <email>\" [%s]: " %
|
||||
distinct_authors[0])
|
||||
if primary_author == "":
|
||||
primary_author = distinct_authors[0]
|
||||
|
||||
reviewers = raw_input(
|
||||
reviewers = input(
|
||||
"Enter reviewers in the format of \"name1 <email1>, name2 <email2>\": ").strip()
|
||||
|
||||
run_cmd(['git', 'log', 'HEAD..%s' % pr_branch_name, '--pretty=format:%h [%an] %s']).split("\n")
|
||||
|
|
@ -157,7 +163,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
|
|||
merge_message_flags = []
|
||||
|
||||
merge_message_flags += ["-m", title]
|
||||
|
||||
|
||||
if body is not None:
|
||||
# Remove "Committer Checklist" section
|
||||
checklist_index = body.find("### Committer Checklist")
|
||||
|
|
@ -193,9 +199,9 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
|
|||
|
||||
try:
|
||||
run_cmd('git push %s %s:%s' % (PUSH_REMOTE_NAME, target_branch_name, target_ref))
|
||||
except Exception as e:
|
||||
except Exception as error:
|
||||
clean_up()
|
||||
fail("Exception while pushing: %s" % e)
|
||||
fail("Exception while pushing: %s" % error)
|
||||
|
||||
merge_hash = run_cmd("git rev-parse %s" % target_branch_name)[:8]
|
||||
clean_up()
|
||||
|
|
@ -205,7 +211,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
|
|||
|
||||
|
||||
def cherry_pick(pr_num, merge_hash, default_branch):
|
||||
pick_ref = raw_input("Enter a branch name [%s]: " % default_branch)
|
||||
pick_ref = input("Enter a branch name [%s]: " % default_branch)
|
||||
if pick_ref == "":
|
||||
pick_ref = default_branch
|
||||
|
||||
|
|
@ -216,8 +222,8 @@ def cherry_pick(pr_num, merge_hash, default_branch):
|
|||
|
||||
try:
|
||||
run_cmd("git cherry-pick -sx %s" % merge_hash)
|
||||
except Exception as e:
|
||||
msg = "Error cherry-picking: %s\nWould you like to manually fix-up this merge?" % e
|
||||
except Exception as error:
|
||||
msg = "Error cherry-picking: %s\nWould you like to manually fix-up this merge?" % error
|
||||
continue_maybe(msg)
|
||||
msg = "Okay, please fix any conflicts and finish the cherry-pick. Finished?"
|
||||
continue_maybe(msg)
|
||||
|
|
@ -227,9 +233,9 @@ def cherry_pick(pr_num, merge_hash, default_branch):
|
|||
|
||||
try:
|
||||
run_cmd('git push %s %s:%s' % (PUSH_REMOTE_NAME, pick_branch_name, pick_ref))
|
||||
except Exception as e:
|
||||
except Exception as error:
|
||||
clean_up()
|
||||
fail("Exception while pushing: %s" % e)
|
||||
fail("Exception while pushing: %s" % error)
|
||||
|
||||
pick_hash = run_cmd("git rev-parse %s" % pick_branch_name)[:8]
|
||||
clean_up()
|
||||
|
|
@ -245,28 +251,28 @@ def fix_version_from_branch(branch, versions):
|
|||
versions = filter(lambda x: x == DEFAULT_FIX_VERSION, versions)
|
||||
if len(versions) > 0:
|
||||
return versions[0]
|
||||
else:
|
||||
return None
|
||||
else:
|
||||
versions = filter(lambda x: x.startswith(branch), versions)
|
||||
if len(versions) > 0:
|
||||
return versions[-1]
|
||||
else:
|
||||
return None
|
||||
|
||||
return None
|
||||
|
||||
versions = filter(lambda x: x.startswith(branch), versions)
|
||||
if len(versions) > 0:
|
||||
return versions[-1]
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
|
||||
asf_jira = jira.client.JIRA({'server': JIRA_API_BASE},
|
||||
basic_auth=(JIRA_USERNAME, JIRA_PASSWORD))
|
||||
|
||||
jira_id = raw_input("Enter a JIRA id [%s]: " % default_jira_id)
|
||||
jira_id = input("Enter a JIRA id [%s]: " % default_jira_id)
|
||||
if jira_id == "":
|
||||
jira_id = default_jira_id
|
||||
|
||||
try:
|
||||
issue = asf_jira.issue(jira_id)
|
||||
except Exception as e:
|
||||
fail("ASF JIRA could not find %s\n%s" % (jira_id, e))
|
||||
except Exception as error:
|
||||
fail("ASF JIRA could not find %s\n%s" % (jira_id, error))
|
||||
|
||||
cur_status = issue.fields.status.name
|
||||
cur_summary = issue.fields.summary
|
||||
|
|
@ -276,10 +282,10 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
|
|||
else:
|
||||
cur_assignee = cur_assignee.displayName
|
||||
|
||||
if cur_status == "Resolved" or cur_status == "Closed":
|
||||
if cur_status in ("Resolved", "Closed"):
|
||||
fail("JIRA issue %s already has status '%s'" % (jira_id, cur_status))
|
||||
print ("=== JIRA %s ===" % jira_id)
|
||||
print ("summary\t\t%s\nassignee\t%s\nstatus\t\t%s\nurl\t\t%s/%s\n" % (
|
||||
print("=== JIRA %s ===" % jira_id)
|
||||
print("summary\t\t%s\nassignee\t%s\nstatus\t\t%s\nurl\t\t%s/%s\n" % (
|
||||
cur_summary, cur_assignee, cur_status, JIRA_BASE, jira_id))
|
||||
|
||||
versions = asf_jira.project_versions(CAPITALIZED_PROJECT_NAME)
|
||||
|
|
@ -288,26 +294,26 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
|
|||
|
||||
version_names = map(lambda x: x.name, versions)
|
||||
default_fix_versions = map(lambda x: fix_version_from_branch(x, version_names), merge_branches)
|
||||
default_fix_versions = filter(lambda x: x != None, default_fix_versions)
|
||||
default_fix_versions = filter(lambda x: x is not None, default_fix_versions)
|
||||
default_fix_versions = ",".join(default_fix_versions)
|
||||
|
||||
fix_versions = raw_input("Enter comma-separated fix version(s) [%s]: " % default_fix_versions)
|
||||
fix_versions = input("Enter comma-separated fix version(s) [%s]: " % default_fix_versions)
|
||||
if fix_versions == "":
|
||||
fix_versions = default_fix_versions
|
||||
fix_versions = fix_versions.replace(" ", "").split(",")
|
||||
|
||||
def get_version_json(version_str):
|
||||
return filter(lambda v: v.name == version_str, versions)[0].raw
|
||||
return next(filter(lambda v: v.name == version_str, versions)).raw
|
||||
|
||||
jira_fix_versions = map(lambda v: get_version_json(v), fix_versions)
|
||||
jira_fix_versions = map(get_version_json, fix_versions)
|
||||
|
||||
resolve = filter(lambda a: a['name'] == "Resolve Issue", asf_jira.transitions(jira_id))[0]
|
||||
resolution = filter(lambda r: r.raw['name'] == "Fixed", asf_jira.resolutions())[0]
|
||||
resolve = next(filter(lambda a: a['name'] == "Resolve Issue", asf_jira.transitions(jira_id)))
|
||||
resolution = next(filter(lambda r: r.raw['name'] == "Fixed", asf_jira.resolutions()))
|
||||
asf_jira.transition_issue(
|
||||
jira_id, resolve["id"], fixVersions = jira_fix_versions,
|
||||
comment = comment, resolution = {'id': resolution.raw['id']})
|
||||
jira_id, resolve["id"], fixVersions=jira_fix_versions,
|
||||
comment=comment, resolution={'id': resolution.raw['id']})
|
||||
|
||||
print "Successfully resolved %s with fixVersions=%s!" % (jira_id, fix_versions)
|
||||
print("Successfully resolved %s with fixVersions=%s!" % (jira_id, fix_versions))
|
||||
|
||||
|
||||
def resolve_jira_issues(title, merge_branches, comment):
|
||||
|
|
@ -363,7 +369,7 @@ def standardize_jira_ref(text):
|
|||
|
||||
# Cleanup any remaining symbols:
|
||||
pattern = re.compile(r'^\W+(.*)', re.IGNORECASE)
|
||||
if (pattern.search(text) is not None):
|
||||
if pattern.search(text) is not None:
|
||||
text = pattern.search(text).groups()[0]
|
||||
|
||||
# Assemble full text (JIRA ref(s), module(s), remaining text)
|
||||
|
|
@ -377,73 +383,73 @@ def standardize_jira_ref(text):
|
|||
|
||||
return clean_text
|
||||
|
||||
def main():
|
||||
global original_head
|
||||
|
||||
original_head = get_current_branch()
|
||||
def main():
|
||||
global ORIGINAL_HEAD
|
||||
ORIGINAL_HEAD = get_current_branch()
|
||||
|
||||
branches = get_json("%s/branches" % GITHUB_API_BASE)
|
||||
branch_names = filter(lambda x: x[0].isdigit(), [x['name'] for x in branches])
|
||||
# Assumes branch names can be sorted lexicographically
|
||||
latest_branch = sorted(branch_names, reverse=True)[0]
|
||||
|
||||
pr_num = raw_input("Which pull request would you like to merge? (e.g. 34): ")
|
||||
pr = get_json("%s/pulls/%s" % (GITHUB_API_BASE, pr_num))
|
||||
pr_num = input("Which pull request would you like to merge? (e.g. 34): ")
|
||||
pull_request = get_json("%s/pulls/%s" % (GITHUB_API_BASE, pr_num))
|
||||
pr_events = get_json("%s/issues/%s/events" % (GITHUB_API_BASE, pr_num))
|
||||
|
||||
url = pr["url"]
|
||||
url = pull_request["url"]
|
||||
|
||||
pr_title = pr["title"]
|
||||
commit_title = raw_input("Commit title [%s]: " % pr_title.encode("utf-8")).decode("utf-8")
|
||||
pr_title = pull_request["title"]
|
||||
commit_title = input("Commit title [%s]: " % pr_title)
|
||||
if commit_title == "":
|
||||
commit_title = pr_title
|
||||
|
||||
# Decide whether to use the modified title or not
|
||||
modified_title = standardize_jira_ref(commit_title)
|
||||
if modified_title != commit_title:
|
||||
print "I've re-written the title as follows to match the standard format:"
|
||||
print "Original: %s" % commit_title
|
||||
print "Modified: %s" % modified_title
|
||||
result = raw_input("Would you like to use the modified title? (y/n): ")
|
||||
print("I've re-written the title as follows to match the standard format:")
|
||||
print("Original: %s" % commit_title)
|
||||
print("Modified: %s" % modified_title)
|
||||
result = input("Would you like to use the modified title? (y/n): ")
|
||||
if result.lower() == "y":
|
||||
commit_title = modified_title
|
||||
print "Using modified title:"
|
||||
print("Using modified title:")
|
||||
else:
|
||||
print "Using original title:"
|
||||
print commit_title
|
||||
print("Using original title:")
|
||||
print(commit_title)
|
||||
|
||||
body = pr["body"]
|
||||
target_ref = pr["base"]["ref"]
|
||||
user_login = pr["user"]["login"]
|
||||
base_ref = pr["head"]["ref"]
|
||||
body = pull_request["body"]
|
||||
target_ref = pull_request["base"]["ref"]
|
||||
user_login = pull_request["user"]["login"]
|
||||
base_ref = pull_request["head"]["ref"]
|
||||
pr_repo_desc = "%s/%s" % (user_login, base_ref)
|
||||
|
||||
# Merged pull requests don't appear as merged in the GitHub API;
|
||||
# Instead, they're closed by asfgit.
|
||||
merge_commits = \
|
||||
[e for e in pr_events if e["actor"]["login"] == "asfgit" and e["event"] == "closed"]
|
||||
[event for event in pr_events if event["actor"]["login"] == "asfgit" and event["event"] == "closed"]
|
||||
|
||||
if merge_commits:
|
||||
merge_hash = merge_commits[0]["commit_id"]
|
||||
message = get_json("%s/commits/%s" % (GITHUB_API_BASE, merge_hash))["commit"]["message"]
|
||||
|
||||
print "Pull request %s has already been merged, assuming you want to backport" % pr_num
|
||||
commit_is_downloaded = run_cmd(['git', 'rev-parse', '--quiet', '--verify',
|
||||
"%s^{commit}" % merge_hash]).strip() != ""
|
||||
print("Pull request %s has already been merged, assuming you want to backport" % pr_num)
|
||||
commit_is_downloaded = run_cmd(
|
||||
['git', 'rev-parse', '--quiet', '--verify', "%s^{commit}" % merge_hash]).strip() != ""
|
||||
if not commit_is_downloaded:
|
||||
fail("Couldn't find any merge commit for #%s, you may need to update HEAD." % pr_num)
|
||||
|
||||
print "Found commit %s:\n%s" % (merge_hash, message)
|
||||
print("Found commit %s:\n%s" % (merge_hash, message))
|
||||
cherry_pick(pr_num, merge_hash, latest_branch)
|
||||
sys.exit(0)
|
||||
|
||||
if not bool(pr["mergeable"]):
|
||||
if not bool(pull_request["mergeable"]):
|
||||
msg = "Pull request %s is not mergeable in its current form.\n" % pr_num + \
|
||||
"Continue? (experts only!)"
|
||||
continue_maybe(msg)
|
||||
|
||||
print ("\n=== Pull Request #%s ===" % pr_num)
|
||||
print ("PR title\t%s\nCommit title\t%s\nSource\t\t%s\nTarget\t\t%s\nURL\t\t%s" % (
|
||||
print("\n=== Pull Request #%s ===" % pr_num)
|
||||
print("PR title\t%s\nCommit title\t%s\nSource\t\t%s\nTarget\t\t%s\nURL\t\t%s" % (
|
||||
pr_title, commit_title, pr_repo_desc, target_ref, url))
|
||||
continue_maybe("Proceed with merging pull request #%s?" % pr_num)
|
||||
|
||||
|
|
@ -452,7 +458,7 @@ def main():
|
|||
merge_hash = merge_pr(pr_num, target_ref, commit_title, body, pr_repo_desc)
|
||||
|
||||
pick_prompt = "Would you like to pick %s into another branch?" % merge_hash
|
||||
while raw_input("\n%s (y/n): " % pick_prompt).lower() == "y":
|
||||
while input("\n%s (y/n): " % pick_prompt).lower() == "y":
|
||||
merged_refs = merged_refs + [cherry_pick(pr_num, merge_hash, latest_branch)]
|
||||
|
||||
if JIRA_IMPORTED:
|
||||
|
|
@ -461,16 +467,17 @@ def main():
|
|||
jira_comment = "Issue resolved by pull request %s\n[%s/%s]" % (pr_num, GITHUB_BASE, pr_num)
|
||||
resolve_jira_issues(commit_title, merged_refs, jira_comment)
|
||||
else:
|
||||
print "JIRA_USERNAME and JIRA_PASSWORD not set"
|
||||
print "Exiting without trying to close the associated JIRA."
|
||||
print("JIRA_USERNAME and JIRA_PASSWORD not set")
|
||||
print("Exiting without trying to close the associated JIRA.")
|
||||
else:
|
||||
print "Could not find jira-python library. Run 'sudo pip install jira' to install."
|
||||
print "Exiting without trying to close the associated JIRA."
|
||||
print("Could not find jira-python library. Run 'sudo pip install jira' to install.")
|
||||
print("Exiting without trying to close the associated JIRA.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import doctest
|
||||
(failure_count, test_count) = doctest.testmod()
|
||||
if (failure_count):
|
||||
exit(-1)
|
||||
(FAILURE_COUNT, TEST_COUNT) = doctest.testmod()
|
||||
if FAILURE_COUNT:
|
||||
sys.exit(-1)
|
||||
|
||||
main()
|
||||
|
|
|
|||
Loading…
Reference in New Issue