From 4b222fb69e97dc632ef8004b66efffb48a207875 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Fri, 4 Apr 2014 07:23:45 +0000 Subject: [PATCH] Make auto-roll script also roll patched trunk revisions. This will allow the auto-roll bot to roll the last trunk patches, e.g. "Version 3.4.5.1 ...". BUG= R=jarin@chromium.org Review URL: https://codereview.chromium.org/223863003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20497 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/push-to-trunk/auto_roll.py | 2 +- tools/push-to-trunk/chromium_roll.py | 3 ++- tools/push-to-trunk/common_includes.py | 8 ++++++-- tools/push-to-trunk/test_scripts.py | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/push-to-trunk/auto_roll.py b/tools/push-to-trunk/auto_roll.py index e6642f9..567f23b 100755 --- a/tools/push-to-trunk/auto_roll.py +++ b/tools/push-to-trunk/auto_roll.py @@ -47,7 +47,7 @@ class DetectLastPush(Step): MESSAGE = "Detect commit ID of the last push to trunk." def RunStep(self): - push_hash = self.FindLastTrunkPush() + push_hash = self.FindLastTrunkPush(include_patches=True) self["last_push"] = self.GitSVNFindSVNRev(push_hash) diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/push-to-trunk/chromium_roll.py index ef9b8bf..adae11d 100755 --- a/tools/push-to-trunk/chromium_roll.py +++ b/tools/push-to-trunk/chromium_roll.py @@ -30,7 +30,8 @@ class DetectLastPush(Step): MESSAGE = "Detect commit ID of last push to trunk." def RunStep(self): - self["last_push"] = self._options.last_push or self.FindLastTrunkPush() + self["last_push"] = self._options.last_push or self.FindLastTrunkPush( + include_patches=True) self["trunk_revision"] = self.GitSVNFindSVNRev(self["last_push"]) self["push_title"] = self.GitLog(n=1, format="%s", git_hash=self["last_push"]) diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py index 6368a27..efea54a 100644 --- a/tools/push-to-trunk/common_includes.py +++ b/tools/push-to-trunk/common_includes.py @@ -442,8 +442,12 @@ class Step(GitRecipesMixin): except GitFailedException: self.WaitForResolvingConflicts(patch_file) - def FindLastTrunkPush(self, parent_hash=""): - push_pattern = "^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based" + def FindLastTrunkPush(self, parent_hash="", include_patches=False): + push_pattern = "^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*" + if not include_patches: + # Non-patched versions only have three numbers followed by the "(based + # on...) comment." + push_pattern += " (based" branch = "" if parent_hash else "svn/trunk" return self.GitLog(n=1, format="%H", grep=push_pattern, parent_hash=parent_hash, branch=branch) diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 6fd30c7..bd19253 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/push-to-trunk/test_scripts.py @@ -784,7 +784,7 @@ Performance and stability improvements on all platforms.""", commit) Git("status -s -b -uno", "## some_branch\n"), Git("svn fetch", ""), Git(("log -1 --format=%H --grep=" - "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " + "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" " "svn/trunk"), "push_hash\n"), Git("svn find-rev push_hash", "123455\n"), Git("log -1 --format=%s push_hash", @@ -944,7 +944,7 @@ deps = { self.ExpectGit([ Git(("log -1 --format=%H --grep=" - "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " + "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" " "svn/trunk"), "push_hash\n"), Git("svn find-rev push_hash", "123455\n"), ]) @@ -964,7 +964,7 @@ deps = { self.ExpectGit([ Git(("log -1 --format=%H --grep=" - "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " + "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" " "svn/trunk"), "push_hash\n"), Git("svn find-rev push_hash", "123456\n"), ]) -- 2.7.4