\" [%s]: " %
- distinct_authors[0])
- if primary_author == "":
- primary_author = distinct_authors[0]
-
- run_cmd(['git', 'log', 'HEAD..%s' % pr_branch_name,
- '--pretty=format:%h [%an] %s']).split("\n\n")
-
- merge_message_flags = []
-
- merge_message_flags += ["-m", title]
- if body is not None:
- # We remove @ symbols from the body to avoid triggering e-mails
- # to people every time someone creates a public fork of Spark.
- merge_message_flags += ["-m", body.replace("@", "")]
-
- authors = "\n".join(["Author: %s" % a for a in distinct_authors])
-
- merge_message_flags += ["-m", authors]
-
- if had_conflicts:
- committer_name = run_cmd("git config --get user.name").strip()
- committer_email = run_cmd("git config --get user.email").strip()
- message = "This patch had conflicts when merged, resolved by\nCommitter: %s <%s>" % (
- committer_name, committer_email)
- merge_message_flags += ["-m", message]
-
- # The string "Closes #%s" string is required for GitHub to correctly close the PR
- merge_message_flags += ["-m", "Closes #%s from %s." % (pr_num, pr_repo_desc)]
-
- run_cmd(['git', 'commit', '--author="%s"' % primary_author] + merge_message_flags)
-
- continue_maybe("Merge complete (local ref %s). Push to %s?" % (
- target_branch_name, PUSH_REMOTE_NAME))
-
- try:
- run_cmd('git push %s %s:%s' % (PUSH_REMOTE_NAME, target_branch_name, target_ref))
- except Exception as e:
- clean_up()
- fail("Exception while pushing: %s" % e)
-
- merge_hash = run_cmd("git rev-parse %s" % target_branch_name)[:8]
- clean_up()
- print("Pull request #%s merged!" % pr_num)
- print("Merge hash: %s" % merge_hash)
- return merge_hash
-
-
-def cherry_pick(pr_num, merge_hash, default_branch):
- pick_ref = input("Enter a branch name [%s]: " % default_branch)
- if pick_ref == "":
- pick_ref = default_branch
-
- pick_branch_name = "%s_PICK_PR_%s_%s" % (BRANCH_PREFIX, pr_num, pick_ref.upper())
-
- run_cmd("git fetch %s %s:%s" % (PUSH_REMOTE_NAME, pick_ref, pick_branch_name))
- run_cmd("git checkout %s" % pick_branch_name)
-
- 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
- continue_maybe(msg)
- msg = "Okay, please fix any conflicts and finish the cherry-pick. Finished?"
- continue_maybe(msg)
-
- continue_maybe("Pick complete (local ref %s). Push to %s?" % (
- pick_branch_name, PUSH_REMOTE_NAME))
-
- try:
- run_cmd('git push %s %s:%s' % (PUSH_REMOTE_NAME, pick_branch_name, pick_ref))
- except Exception as e:
- clean_up()
- fail("Exception while pushing: %s" % e)
-
- pick_hash = run_cmd("git rev-parse %s" % pick_branch_name)[:8]
- clean_up()
-
- print("Pull request #%s picked into %s!" % (pr_num, pick_ref))
- print("Pick hash: %s" % pick_hash)
- return pick_ref
-
-
-def fix_version_from_branch(branch, versions):
- # Note: Assumes this is a sorted (newest->oldest) list of un-released versions
- if branch == "master":
- return versions[0]
- else:
- branch_ver = branch.replace("branch-", "")
- return list(filter(lambda x: x.name.startswith(branch_ver), versions))[-1]
-
-
-def get_current_ref():
- ref = run_cmd("git rev-parse --abbrev-ref HEAD").strip()
- if ref == 'HEAD':
- # The current ref is a detached HEAD, so grab its SHA.
- return run_cmd("git rev-parse HEAD").strip()
- else:
- return ref
-
-
-def main():
- global original_head
-
- original_head = get_current_ref()
-
- pr_num = input("Which pull request would you like to merge? (e.g. 34): ")
- pr = 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"]
-
- title = pr["title"]
-
- body = pr["body"]
- target_ref = pr["base"]["ref"]
- user_login = pr["user"]["login"]
- base_ref = pr["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"]
-
- 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() != ""
- 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))
- sys.exit(0)
-
- if not bool(pr["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("title\t%s\nsource\t%s\ntarget\t%s\nurl\t%s" % (
- title, pr_repo_desc, target_ref, url))
- continue_maybe("Proceed with merging pull request #%s?" % pr_num)
-
- merge_pr(pr_num, target_ref, title, body, pr_repo_desc)
-
-
-if __name__ == "__main__":
- import doctest
- (failure_count, test_count) = doctest.testmod()
- if failure_count:
- exit(-1)
- try:
- main()
- except:
- clean_up()
- raise
diff --git a/site/committers.html b/site/committers.html
index bac471eb80..2476fe4cf5 100644
--- a/site/committers.html
+++ b/site/committers.html
@@ -711,28 +711,9 @@ Merge script
Merging website pull requests
-Pull requests to the Spark website (the
-apache/spark-website repository) are merged
-separately from the main Spark repo. Unlike apache/spark, this repository uses asf-site as its
-default branch, and there is no master branch.
-
-Website PRs are merged using the
-merge_pr.py script
-in the root of the spark-website repository, which squashes the pull request’s changes into one
-commit, just like merge_spark_pr.py does for the main repo.
-
-To use it, set up remotes in your local clone of spark-website the same way as for the main repo:
-an apache remote (the default PUSH_REMOTE_NAME, used for pushing the squashed commit) and an
-apache-github remote (the default PR_REMOTE_NAME, used for pulling the change), both pointing at
-git@github.com:apache/spark-website.git. Then run the script from the repository root:
-
-
+Pull requests to the Spark website repo are merged separately from the main Spark repo. Unlike the main repo, the website uses asf-site as its default branch; there is no master branch.
-The script is interactive and walks you through selecting the PR and pushing the merge to the
-asf-site branch. Before merging, make sure the pull request includes the regenerated HTML under
-site/ in addition to the Markdown/HTML source changes; see the repository’s README.md for how
-the site is built.
+The website repo does not use a merge script. Instead, use GitHub’s “Squash and merge” button to merge PRs.
Policy on backporting bug fixes