From f01dffa835f75b1c90c50805d55073f2e7bfa762 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Thu, 25 Sep 2014 08:46:13 +0000 Subject: [PATCH] Fix auto roll after switching v8 mirror. BUG=chromium:411835 LOG=n TBR=tandrii@chromium.org Review URL: https://codereview.chromium.org/606553003 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24216 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/push-to-trunk/auto_roll.py | 2 +- tools/push-to-trunk/chromium_roll.py | 2 +- tools/push-to-trunk/test_scripts.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/push-to-trunk/auto_roll.py b/tools/push-to-trunk/auto_roll.py index 120e633b69..2cca070f9f 100755 --- a/tools/push-to-trunk/auto_roll.py +++ b/tools/push-to-trunk/auto_roll.py @@ -43,7 +43,7 @@ class DetectLastPush(Step): def RunStep(self): push_hash = self.FindLastTrunkPush( - branch="origin/master", include_patches=True) + branch="origin/candidates", include_patches=True) self["last_push"] = self.GetCommitPositionNumber(push_hash) diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/push-to-trunk/chromium_roll.py index dc5e6eba22..ceedbc179e 100755 --- a/tools/push-to-trunk/chromium_roll.py +++ b/tools/push-to-trunk/chromium_roll.py @@ -23,7 +23,7 @@ class DetectLastPush(Step): def RunStep(self): self["last_push"] = self._options.last_push or self.FindLastTrunkPush( - branch="origin/master", include_patches=True) + branch="origin/candidates", include_patches=True) self["trunk_revision"] = self.GetCommitPositionNumber(self["last_push"]) self["push_title"] = self.GitLog(n=1, format="%s", git_hash=self["last_push"]) diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 658e539318..3c5bfeb58f 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/push-to-trunk/test_scripts.py @@ -867,7 +867,7 @@ def get_list(): Cmd("git fetch origin", ""), Cmd(("git log -1 --format=%H --grep=" "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" " - "origin/master"), "push_hash\n"), + "origin/candidates"), "push_hash\n"), Cmd("git log -1 --format=%B push_hash", self.C_V8_22624_LOG), Cmd("git log -1 --format=%s push_hash", "Version 3.22.5 (based on bleeding_edge revision r22622)\n"), @@ -1005,7 +1005,7 @@ deps = { ("{\"results\": [{\"subject\": \"different\"}]}")), Cmd(("git log -1 --format=%H --grep=" "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" " - "origin/master"), "push_hash\n"), + "origin/candidates"), "push_hash\n"), Cmd("git log -1 --format=%B push_hash", self.C_V8_22624_LOG), Cmd("git log -1 --format=%B abcd123455", self.C_V8_123455_LOG), ]) @@ -1026,7 +1026,7 @@ deps = { ("{\"results\": [{\"subject\": \"different\"}]}")), Cmd(("git log -1 --format=%H --grep=" "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" " - "origin/master"), "push_hash\n"), + "origin/candidates"), "push_hash\n"), Cmd("git log -1 --format=%B push_hash", self.C_V8_123456_LOG), Cmd("git log -1 --format=%B abcd123455", self.C_V8_123455_LOG), ])