Reviewers: jarin,
Message:
PTAL
Description:
Add merged patches to commit title in merge-to-branch.
This makes it easier to grep for patches in title in the revision history.
This also removes the redundant information into which branch was merged, as
this can be derived from the version number in the title now.
BUG=
Please review this at https://codereview.chromium.org/223753002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+14, -16 lines):
M tools/push-to-trunk/merge_to_branch.py
M tools/push-to-trunk/test_scripts.py
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..713768926b39c15df887c989132f3052c4e3ad29
100755
--- a/tools/push-to-trunk/merge_to_branch.py
+++ b/tools/push-to-trunk/merge_to_branch.py
@@ -134,16 +134,8 @@ class FindGitRevisions(Step):
if not self["revision_list"]: # pragma: no cover
self.Die("Revision list is empty.")
- if self._options.revert:
- if not self._options.revert_bleeding_edge:
- self["new_commit_msg"] = ("Rollback of %s in %s branch."
- % (self["revision_list"], self["merge_to_branch"]))
- else:
- self["new_commit_msg"] = "Revert %s." % self["revision_list"]
- else:
- self["new_commit_msg"] = ("Merged %s into %s branch."
- % (self["revision_list"], self["merge_to_branch"]))
- self["new_commit_msg"] += "\n\n"
+ # The commit message title is added below after the version is
specified.
+ self["new_commit_msg"] = ""
for commit_hash in self["patch_commit_hashes"]:
patch_merge_desc = self.GitLog(n=1, format="%s",
git_hash=commit_hash)
@@ -213,9 +205,17 @@ class CommitLocal(Step):
MESSAGE = "Commit to local branch."
def RunStep(self):
- if not self._options.revert_bleeding_edge:
- self["new_commit_msg"] = "Version %s\n\n%s" % (self["version"],
-
self["new_commit_msg"])
+ # Add a commit message title.
+ if self._options.revert:
+ if not self._options.revert_bleeding_edge:
+ title = ("Version %s (rollback of %s)"
+ % (self["version"], self["revision_list"]))
+ else:
+ title = "Revert %s." % self["revision_list"]
+ else:
+ title = ("Version %s (merged %s)"
+ % (self["version"], self["revision_list"]))
+ self["new_commit_msg"] = "%s\n\n%s" % (title, self["new_commit_msg"])
TextToFile(self["new_commit_msg"], self.Config(COMMITMSG_FILE))
self.GitCommit(file_name=self.Config(COMMITMSG_FILE))
Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py
b/tools/push-to-trunk/test_scripts.py
index
0e70afdc84708034cdf0c75d271e5c99519cf01c..b7f6e8b25b348e7401bd60cff3d1c50b80b57886
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -985,9 +985,7 @@ deps = {
return lambda: self.assertEquals(patch,
FileToText(TEST_CONFIG[TEMPORARY_PATCH_FILE]))
- msg = """Version 3.22.5.1
-
-Merged r12345, r23456, r34567, r45678, r56789 into trunk branch.
+ msg = """Version 3.22.5.1 (merged r12345, r23456, r34567, r45678,
r56789)
Title4
--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
