Revision: 20483
Author: [email protected]
Date: Thu Apr 3 13:01:22 2014 UTC
Log: Fix bug entry and quotation marks in merge-to-branch.
This fixes usage of quotation marks inside titles of merged patches.
This also fixes aggregation of empty or "none" BUG entries.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/223463003
http://code.google.com/p/v8/source/detail?r=20483
Modified:
/branches/bleeding_edge/tools/push-to-trunk/git_recipes.py
/branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Wed Mar 19
13:10:41 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Thu Apr 3
13:01:22 2014 UTC
@@ -85,7 +85,7 @@
if format:
args.append("--format=%s" % format)
if grep:
- args.append("--grep=\"%s\"" % grep)
+ args.append("--grep=\"%s\"" % grep.replace("\"", "\\\""))
if reverse:
args.append("--reverse")
if git_hash:
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py Thu Apr
3 12:57:33 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py Thu Apr
3 13:01:22 2014 UTC
@@ -147,7 +147,7 @@
for bug in re.findall(r"^[ \t]*BUG[ \t]*=[ \t]*(.*?)[ \t]*$", msg,
re.M):
bugs.extend(map(lambda s: s.strip(), bug.split(",")))
- bug_aggregate = ",".join(sorted(bugs))
+ bug_aggregate = ",".join(sorted(filter(lambda s: s and s != "none",
bugs)))
if bug_aggregate:
self["new_commit_msg"] += "BUG=%s\nLOG=N\n" % bug_aggregate
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Thu Apr 3
12:57:33 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Thu Apr 3
13:01:22 2014 UTC
@@ -995,7 +995,7 @@
Title1
-Title5
+Revert "Something"
BUG=123,234,345,456,567,v8:123
LOG=N
@@ -1043,12 +1043,12 @@
Git("log -1 --format=%s hash2", "Title2"),
Git("log -1 --format=%s hash3", "Title3"),
Git("log -1 --format=%s hash1", "Title1"),
- Git("log -1 --format=%s hash5", "Title5"),
+ Git("log -1 --format=%s hash5", "Revert \"Something\""),
Git("log -1 hash4", "Title4\nBUG=123\nBUG=234"),
Git("log -1 hash2", "Title2\n BUG = v8:123,345"),
Git("log -1 hash3", "Title3\nLOG=n\nBUG=567, 456"),
- Git("log -1 hash1", "Title1"),
- Git("log -1 hash5", "Title5"),
+ Git("log -1 hash1", "Title1\nBUG="),
+ Git("log -1 hash5", "Revert \"Something\"\nBUG=none"),
Git("log -1 -p hash4", "patch4"),
Git("apply --index --reject \"%s\"" %
TEST_CONFIG[TEMPORARY_PATCH_FILE],
"", cb=VerifyPatch("patch4")),
@@ -1071,7 +1071,8 @@
Git("cl presubmit", "Presubmit successfull\n"),
Git("cl dcommit -f --bypass-hooks", "Closing issue\n",
cb=VerifySVNCommit),
Git("svn fetch", ""),
- Git("log -1 --format=%%H --grep=\"%s\" svn/trunk" % msg, "hash6"),
+ Git(("log -1 --format=%%H --grep=\"%s\" svn/trunk"
+ % msg.replace("\"", "\\\"")), "hash6"),
Git("svn find-rev hash6", "1324"),
Git(("copy -r 1324 https://v8.googlecode.com/svn/trunk "
"https://v8.googlecode.com/svn/tags/3.22.5.1 -m "
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
