Repository: incubator-gearpump-site Updated Branches: refs/heads/asf-site 19769c769 -> b5f0e574a
update config to 0.8.1 Author: manuzhang <[email protected]> Closes #5 from manuzhang/upgrade. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/commit/b5f0e574 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/tree/b5f0e574 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/diff/b5f0e574 Branch: refs/heads/asf-site Commit: b5f0e574adca68ea3b3ab3202d2c88960443066b Parents: 19769c7 Author: manuzhang <[email protected]> Authored: Mon Aug 15 08:59:46 2016 +0800 Committer: manuzhang <[email protected]> Committed: Mon Aug 15 08:59:46 2016 +0800 ---------------------------------------------------------------------- _config.yml | 2 +- content/2015/12/29/0.7.1_release.html | 2 +- content/blogs.html | 2 +- content/coding-style.html | 2 +- content/community.html | 2 +- content/downloads.html | 14 +- content/faq.html | 2 +- content/features.html | 2 +- content/how-to-contribute.html | 2 +- content/license.html | 2 +- content/overview.html | 6 +- content/performance-report.html | 2 +- content/publications.html | 2 +- content/roadmap.html | 2 +- content/usecases.html | 2 +- merge_gearpump_pr.py | 378 +++++++++++++++++++++++++++++ 16 files changed, 401 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/_config.yml ---------------------------------------------------------------------- diff --git a/_config.yml b/_config.yml index f16a14b..e65cffa 100644 --- a/_config.yml +++ b/_config.yml @@ -14,6 +14,6 @@ include: - _modules # These allow the documentation to be updated with newer releases of Gearpump -GEARPUMP_VERSION: 0.8.0 +GEARPUMP_VERSION: 0.8.1 SCALA_BINARY_VERSION: "2.11" SCALA_VERSION: "2.11.8" http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/2015/12/29/0.7.1_release.html ---------------------------------------------------------------------- diff --git a/content/2015/12/29/0.7.1_release.html b/content/2015/12/29/0.7.1_release.html index 474f747..4046b1e 100644 --- a/content/2015/12/29/0.7.1_release.html +++ b/content/2015/12/29/0.7.1_release.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/blogs.html ---------------------------------------------------------------------- diff --git a/content/blogs.html b/content/blogs.html index e1e73a3..8f9358d 100644 --- a/content/blogs.html +++ b/content/blogs.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/coding-style.html ---------------------------------------------------------------------- diff --git a/content/coding-style.html b/content/coding-style.html index 7c5fadd..1194a96 100644 --- a/content/coding-style.html +++ b/content/coding-style.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/community.html ---------------------------------------------------------------------- diff --git a/content/community.html b/content/community.html index daa80ca..4965a11 100644 --- a/content/community.html +++ b/content/community.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/downloads.html ---------------------------------------------------------------------- diff --git a/content/downloads.html b/content/downloads.html index d29f14b..dfa5341 100644 --- a/content/downloads.html +++ b/content/downloads.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> @@ -97,14 +97,14 @@ <h2 id="downloads">Downloads</h2> -<h3 id="latest-stable-release-v080-this-is-not-an-apache-release">Latest Stable Release (v0.8.0) (This is not an Apache release)</h3> +<h3 id="latest-stable-release-v081-this-is-not-an-apache-release">Latest Stable Release (v0.8.1) (This is not an Apache release)</h3> <p><a href="https://github.com/gearpump/gearpump/releases";>Release Notes</a></p> <ul> - <li><a href="https://github.com/gearpump/gearpump/releases/download/0.8.0/gearpump-2.11-0.8.0.zip";>Binary (for Scala 2.11)</a></li> - <li><a href="https://github.com/gearpump/gearpump/archive/0.8.0.zip";>Source code (.zip)</a></li> - <li><a href="https://github.com/gearpump/gearpump/archive/0.8.0.tar.gz";>Source code (.tar.gz)</a></li> + <li><a href="https://github.com/gearpump/gearpump/releases/download/0.8.1/gearpump-2.11-0.8.1.zip";>Binary (for Scala 2.11)</a></li> + <li><a href="https://github.com/gearpump/gearpump/archive/0.8.1.zip";>Source code (.zip)</a></li> + <li><a href="https://github.com/gearpump/gearpump/archive/0.8.1.tar.gz";>Source code (.tar.gz)</a></li> </ul> <p><em>Note that as we have upgraded the Akka library to 2.4.x, which has dropped the Scala 2.10 support, we do NOT provide Gearpump build for Scala 2.10 since Gearpump 0.8.0.</em></p> @@ -117,12 +117,12 @@ <span class="nt"><dependency></span> <span class="nt"><groupId></span>com.github.intel-hadoop<span class="nt"></groupId></span> <span class="nt"><artifactId></span>gearpump-core_2.11<span class="nt"></artifactId></span> - <span class="nt"><version></span>0.8.0<span class="nt"></version></span> + <span class="nt"><version></span>0.8.1<span class="nt"></version></span> <span class="nt"></dependency></span> <span class="nt"><dependency></span> <span class="nt"><groupId></span>com.github.intel-hadoop<span class="nt"></groupId></span> <span class="nt"><artifactId></span>gearpump-streaming_2.11<span class="nt"></artifactId></span> - <span class="nt"><version></span>0.8.0<span class="nt"></version></span> + <span class="nt"><version></span>0.8.1<span class="nt"></version></span> <span class="nt"></dependency></span> <span class="nt"></dependencies></span></code></pre></figure> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/faq.html ---------------------------------------------------------------------- diff --git a/content/faq.html b/content/faq.html index 8bceb16..2e54423 100644 --- a/content/faq.html +++ b/content/faq.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/features.html ---------------------------------------------------------------------- diff --git a/content/features.html b/content/features.html index 93443bc..a7dfa21 100644 --- a/content/features.html +++ b/content/features.html @@ -49,7 +49,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/how-to-contribute.html ---------------------------------------------------------------------- diff --git a/content/how-to-contribute.html b/content/how-to-contribute.html index fb7e058..dd5a60e 100644 --- a/content/how-to-contribute.html +++ b/content/how-to-contribute.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/license.html ---------------------------------------------------------------------- diff --git a/content/license.html b/content/license.html index c094b1d..05465ac 100644 --- a/content/license.html +++ b/content/license.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/overview.html ---------------------------------------------------------------------- diff --git a/content/overview.html b/content/overview.html index 27dc76e..d462e57 100644 --- a/content/overview.html +++ b/content/overview.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"/> <title>Apache Gearpump (Incubating): Overview</title> - <meta name="description" content="Apache Gearpump 0.8.0 documentation homepage"> + <meta name="description" content="Apache Gearpump 0.8.1 documentation homepage"> @@ -49,7 +49,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> @@ -98,7 +98,7 @@ <p><img src="/favicon.ico" alt="gearpump-logo" /> -<a href="http://www.gearpump.io/downloads.html";><img src="https://img.shields.io/badge/Latest%20Release-v0.8.0-blue.svg"; alt="Release" /></a></p> +<a href="http://www.gearpump.io/downloads.html";><img src="https://img.shields.io/badge/Latest%20Release-v0.8.1-blue.svg"; alt="Release" /></a></p> <p><strong>Apache Gearpump</strong> is a real-time big data streaming engine. The name Gearpump is a reference to the engineering term “gear pump” which is a super simple pump that consists of only two gears, but is very powerful at streaming water. Different to other streaming engines, Gearpump’s engine is event/message based. Per initial benchmarks we are able to process 18 million messages per second (message length is 100 bytes) with a 8ms latency on a 4-node cluster.</p> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/performance-report.html ---------------------------------------------------------------------- diff --git a/content/performance-report.html b/content/performance-report.html index 2795dce..573bc82 100644 --- a/content/performance-report.html +++ b/content/performance-report.html @@ -49,7 +49,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/publications.html ---------------------------------------------------------------------- diff --git a/content/publications.html b/content/publications.html index 59d02f8..e0122cf 100644 --- a/content/publications.html +++ b/content/publications.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/roadmap.html ---------------------------------------------------------------------- diff --git a/content/roadmap.html b/content/roadmap.html index cae1c92..d6ff1cc 100644 --- a/content/roadmap.html +++ b/content/roadmap.html @@ -47,7 +47,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/content/usecases.html ---------------------------------------------------------------------- diff --git a/content/usecases.html b/content/usecases.html index e16094c..1bed657 100644 --- a/content/usecases.html +++ b/content/usecases.html @@ -49,7 +49,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="releases/latest/index.html">Latest Release (0.8.0)</a></li> + <li><a href="releases/latest/index.html">Latest Release (0.8.1)</a></li> <li><a href="usecases.html">Use Cases</a></li> <li class="divider"></li> <li><a href="publications.html">Publications</a></li> http://git-wip-us.apache.org/repos/asf/incubator-gearpump-site/blob/b5f0e574/merge_gearpump_pr.py ---------------------------------------------------------------------- diff --git a/merge_gearpump_pr.py b/merge_gearpump_pr.py new file mode 100755 index 0000000..9684692 --- /dev/null +++ b/merge_gearpump_pr.py @@ -0,0 +1,378 @@ +#!/usr/bin/env python + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Modifed from the script written by the Apache Spark team: +# https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py + +# Utility for creating well-formed pull request merges and pushing them to Apache. +# usage: ./merge_gearpump_pr.py (see config env vars below) +# +# This utility assumes you already have a local Gearpump git folder and that you +# have added remotes corresponding to both +# (i) the github apache Gearpump mirror +# (ii) the apache git repo. + +import json +import os +import re +import subprocess +import sys +import urllib2 + +try: + import jira.client + JIRA_IMPORTED = True +except ImportError: + JIRA_IMPORTED = False + +# Location of your Gearpump git development area +GEARPUMP_HOME = os.environ.get("GEARPUMP_HOME", os.getcwd()) +# Remote name which points to git://github.com/apache/incubator-gearpump +PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github") +# Remote name which points to https://git-wip-us.apache.org/repos/asf/incubator-gearpump.git +PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache") +# ASF JIRA username +JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "mauzhang") +# ASF JIRA password +JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "jira$1024") + + +GITHUB_BASE = "https://github.com/apache/incubator-gearpump-site/pull"; +GITHUB_API_BASE = "https://api.github.com/repos/apache/incubator-gearpump-site"; +JIRA_BASE = "https://issues.apache.org/jira/browse"; +JIRA_API_BASE = "https://issues.apache.org/jira"; +# Prefix added to temporary branches +BRANCH_PREFIX = "PR_TOOL" + + +def get_json(url): + try: + return json.load(urllib2.urlopen(url)) + except urllib2.HTTPError as e: + print "Unable to fetch URL, exiting: %s" % url + sys.exit(-1) + + +def fail(msg): + print msg + clean_up() + sys.exit(-1) + + +def run_cmd(cmd): + print cmd + if isinstance(cmd, list): + return subprocess.check_output(cmd) + else: + return subprocess.check_output(cmd.split(" ")) + + +def continue_maybe(prompt): + result = raw_input("\n%s (y/n): " % prompt) + if result.lower() != "y": + fail("Okay, exiting") + +def clean_up(): + 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(BRANCH_PREFIX), branches): + print "Deleting local branch %s" % branch + run_cmd("git branch -D %s" % branch) + + +# 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" % (BRANCH_PREFIX, pr_num) + target_branch_name = "%s_MERGE_PR_%s_%s" % (BRANCH_PREFIX, pr_num, target_ref.upper()) + run_cmd("git fetch %s pull/%s/head:%s" % (PR_REMOTE_NAME, pr_num, pr_branch_name)) + run_cmd("git fetch %s %s:%s" % (PUSH_REMOTE_NAME, target_ref, target_branch_name)) + run_cmd("git checkout %s" % target_branch_name) + + 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 + 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 = distinct_authors[0] + + commits = 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 Gearpump. + 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 = raw_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 filter(lambda x: x.name.startswith(branch_ver), versions)[-1] + + +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) + 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)) + + cur_status = issue.fields.status.name + cur_summary = issue.fields.summary + cur_assignee = issue.fields.assignee + if cur_assignee is None: + cur_assignee = "NOT ASSIGNED!!!" + else: + cur_assignee = cur_assignee.displayName + + if cur_status == "Resolved" or cur_status == "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" % ( + cur_summary, cur_assignee, cur_status, JIRA_BASE, jira_id)) + + versions = asf_jira.project_versions("GEARPUMP") + versions = sorted(versions, key=lambda x: x.name, reverse=True) + versions = filter(lambda x: x.raw['released'] is False, versions) + # Consider only x.y.z versions + versions = filter(lambda x: re.match('\d+\.\d+\.\d+', x.name), versions) + + default_fix_versions = map(lambda x: fix_version_from_branch(x, versions).name, merge_branches) + for v in default_fix_versions: + # Handles the case where we have forked a release branch but not yet made the release. + # In this case, if the PR is committed to the master branch and the release branch, we + # only consider the release branch to be the fix version. E.g. it is not valid to have + # both 1.1.0 and 1.0.0 as fix versions. + (major, minor, patch) = v.split(".") + if patch == "0": + previous = "%s.%s.%s" % (major, int(minor) - 1, 0) + if previous in default_fix_versions: + default_fix_versions = filter(lambda x: x != v, default_fix_versions) + default_fix_versions = ",".join(default_fix_versions) + + fix_versions = raw_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 + + jira_fix_versions = map(lambda v: get_version_json(v), 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] + asf_jira.transition_issue( + 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) + + +def resolve_jira_issues(title, merge_branches, comment): + jira_ids = re.findall("GEARPUMP-[0-9]+", title) + + if len(jira_ids) == 0: + resolve_jira_issue(merge_branches, comment) + for jira_id in jira_ids: + resolve_jira_issue(merge_branches, comment, jira_id) + +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 + + os.chdir(GEARPUMP_HOME) + original_head = get_current_ref() + + branches = get_json("%s/branches" % GITHUB_API_BASE) + branch_names = filter(lambda x: True, [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_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) + cherry_pick(pr_num, merge_hash, latest_branch) + 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) + + merged_refs = [target_ref] + + merge_hash = merge_pr(pr_num, target_ref, 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": + merged_refs = merged_refs + [cherry_pick(pr_num, merge_hash, latest_branch)] + + if JIRA_IMPORTED: + if JIRA_USERNAME and JIRA_PASSWORD: + continue_maybe("Would you like to update an associated JIRA?") + jira_comment = "Issue resolved by pull request %s\n[%s/%s]" % (pr_num, GITHUB_BASE, pr_num) + resolve_jira_issues(title, merged_refs, jira_comment) + else: + 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." + +if __name__ == "__main__": + import doctest + (failure_count, test_count) = doctest.testmod() + if failure_count: + exit(-1) + try: + main() + except: + clean_up() + raise
![https://img.shields.io/badge/Latest%20Release-v0.8.0-blue.svg"](https://img.shields.io/badge/Latest%20Release-v0.8.0-blue.svg"){kind=link}
![https://img.shields.io/badge/Latest%20Release-v0.8.1-blue.svg"](https://img.shields.io/badge/Latest%20Release-v0.8.1-blue.svg"){kind=link}