parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexleven...@apache.org
Subject parquet-mr git commit: Revert "PARQUET-376: Tolerate square brackets in PR titles"
Date Mon, 14 Sep 2015 23:41:56 GMT
Repository: parquet-mr
Updated Branches:
  refs/heads/master d24ecb32f -> 415761dc0


Revert "PARQUET-376: Tolerate square brackets in PR titles"

This reverts commit d24ecb32ff58d13c178991f0c8618980ff123080.


Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/415761dc
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/415761dc
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/415761dc

Branch: refs/heads/master
Commit: 415761dc0d7c86bc455608f6b12184ae7ff296ce
Parents: d24ecb3
Author: Alex Levenson <alexlevenson@twitter.com>
Authored: Mon Sep 14 16:40:52 2015 -0700
Committer: Alex Levenson <alexlevenson@twitter.com>
Committed: Mon Sep 14 16:40:52 2015 -0700

----------------------------------------------------------------------
 dev/merge_parquet_pr.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/415761dc/dev/merge_parquet_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py
index d8dbbc6..621fcde 100755
--- a/dev/merge_parquet_pr.py
+++ b/dev/merge_parquet_pr.py
@@ -141,9 +141,7 @@ def merge_pr(pr_num, target_ref):
 
     merge_message_flags = []
 
-    title_without_brackets = remove_brackets_from_pr_title(title)
-
-    merge_message_flags += ["-m", title_without_brackets]
+    merge_message_flags += ["-m", title]
     if body != None:
         merge_message_flags += ["-m", body]
 
@@ -219,15 +217,8 @@ def fix_version_from_branch(branch, versions):
         branch_ver = branch.replace("branch-", "")
         return filter(lambda x: x.name.startswith(branch_ver), versions)[-1]
 
-def remove_brackets_from_pr_title(title):
-    m = re.search(r'^\[?(PARQUET-[0-9]+)\]?(\s.*)$', title)
-    if m and len(m.groups()) == 2:
-        return m.group(1) + m.group(2)
-    else:
-        fail("PR title should be prefixed by a jira id \"PARQUET-XXX: ...\", found: \"%s\""
% title)  
-
 def exctract_jira_id(title):
-    m = re.search(r'^\[?(PARQUET-[0-9]+)\]?\s.*$', title)
+    m = re.search(r'^(PARQUET-[0-9]+)\b.*$', title)
     if m and m.groups > 0:
         return m.group(1)
     else:


Mime
View raw message