From 5f3c8a11faec7aec16b450dad107e88790b45769 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Thu, 3 Apr 2014 12:57:33 +0000 Subject: [PATCH] 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= R=jarin@chromium.org Review URL: https://codereview.chromium.org/223753002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20482 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/push-to-trunk/merge_to_branch.py | 26 +++++++++++++------------- tools/push-to-trunk/test_scripts.py | 4 +--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/tools/push-to-trunk/merge_to_branch.py b/tools/push-to-trunk/merge_to_branch.py index 87ba02b..7137689 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)) diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 0e70afd..b7f6e8b 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 -- 2.7.4