tools/push-to-trunk/merge_to_branch.py - Issue 223463003: Fix bug entry and quotation marks in merge-to-branch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/push-to-trunk/merge_to_branch.py

Issue 223463003: Fix bug entry and quotation marks in merge-to-branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/push-to-trunk/merge_to_branch.py

diff --git a/tools/push-to-trunk/merge_to_branch.py b/tools/push-to-trunk/merge_to_branch.py

index 87ba02b5b32552a6fec3355f9c91a77c96f30dd4..02df5d8d61544c8d12397f04b11841094a218438 100755

--- a/tools/push-to-trunk/merge_to_branch.py

+++ b/tools/push-to-trunk/merge_to_branch.py

@@ -155,7 +155,7 @@ class FindGitRevisions(Step):

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