This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 86fd295 [MERGE SCRIPT] remove authors section
86fd295 is described below
commit 86fd29525266dbdb8fcb7950321d99c1b565bebf
Author: Sijie Guo <[email protected]>
AuthorDate: Sun Oct 28 21:05:28 2018 +0800
[MERGE SCRIPT] remove authors section
Descriptions of the changes in this PR:
*Motivation*
We are using github api to merge pull requests now.
So the authors section is not correct, remove that section and rely on
github merge api.
*Changes*
remove authors section in the commit log.
Reviewers: Enrico Olivelli <[email protected]>
This closes #1758 from sijie/fix_merge_scripts
---
dev/bk-merge-pr.py | 14 --------------
dev/bk-merge-pr3.py | 14 --------------
2 files changed, 28 deletions(-)
diff --git a/dev/bk-merge-pr.py b/dev/bk-merge-pr.py
index 4dec84d..e48b119 100755
--- a/dev/bk-merge-pr.py
+++ b/dev/bk-merge-pr.py
@@ -152,16 +152,6 @@ def merge_pr(pr_num, target_ref, title, body,
default_pr_reviewers, pr_repo_desc
pr_branch_name = "%s_MERGE_PR_%s" % (TEMP_BRANCH_PREFIX, pr_num)
run_cmd("git fetch %s pull/%s/head:%s" % (PR_REMOTE_NAME, pr_num,
pr_branch_name))
- 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(
- "Enter primary author in the format of \"name <email>\" [%s]: " %
- distinct_authors[0])
- if primary_author == "":
- primary_author = distinct_authors[0]
-
reviewers = raw_input("Enter reviewers [%s]: " %
default_pr_reviewers).strip()
if reviewers == '':
reviewers = default_pr_reviewers
@@ -185,10 +175,6 @@ def merge_pr(pr_num, target_ref, title, body,
default_pr_reviewers, pr_repo_desc
# to people every time someone creates a public fork of the project.
merge_message_flags += [body.replace("@", "")]
- authors = "\n".join(["Author: %s" % a for a in distinct_authors])
-
- merge_message_flags += [authors]
-
if (reviewers != ""):
merge_message_flags += ["Reviewers: %s" % reviewers]
diff --git a/dev/bk-merge-pr3.py b/dev/bk-merge-pr3.py
index 4f755f9..069358f 100755
--- a/dev/bk-merge-pr3.py
+++ b/dev/bk-merge-pr3.py
@@ -153,16 +153,6 @@ def merge_pr(pr_num, target_ref, title, body,
default_pr_reviewers, pr_repo_desc
pr_branch_name = "%s_MERGE_PR_%s" % (TEMP_BRANCH_PREFIX, pr_num)
run_cmd("git fetch %s pull/%s/head:%s" % (PR_REMOTE_NAME, pr_num,
pr_branch_name))
- 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 = input(
- "Enter primary author in the format of \"name <email>\" [%s]: " %
- distinct_authors[0])
- if primary_author == "":
- primary_author = distinct_authors[0]
-
reviewers = input("Enter reviewers [%s]: " % default_pr_reviewers).strip()
if reviewers == '':
reviewers = default_pr_reviewers
@@ -186,10 +176,6 @@ def merge_pr(pr_num, target_ref, title, body,
default_pr_reviewers, pr_repo_desc
# to people every time someone creates a public fork of the project.
merge_message_flags += [body.replace("@", "")]
- authors = "\n".join(["Author: %s" % a for a in distinct_authors])
-
- merge_message_flags += [authors]
-
if (reviewers != ""):
merge_message_flags += ["Reviewers: %s" % reviewers]
