| Index: tools/push-to-trunk/auto_push.py
|
| diff --git a/tools/push-to-trunk/auto_push.py b/tools/push-to-trunk/auto_push.py
|
| index 31d39612bbbd935c8c7e85e1ded43b0b44cbd8c6..68fba55d59bae0b06cb5f7afc3f815f698a66bbc 100755
|
| --- a/tools/push-to-trunk/auto_push.py
|
| +++ b/tools/push-to-trunk/auto_push.py
|
| @@ -70,13 +70,12 @@ class CheckTreeStatus(Step):
|
| % self["tree_message"])
|
|
|
|
|
| -class FetchLKGR(Step):
|
| - MESSAGE = "Fetching V8 LKGR."
|
| +class FetchCandidate(Step):
|
| + MESSAGE = "Fetching V8 roll candidate ref."
|
|
|
| def RunStep(self):
|
| - lkgr_url = "https://v8-status.appspot.com/lkgr"
|
| - # Retry several times since app engine might have issues.
|
| - self["lkgr"] = self.ReadURL(lkgr_url, wait_plan=[5, 20, 300, 300])
|
| + self.Git("fetch origin +refs/heads/candidate:refs/heads/candidate")
|
| + self["candidate"] = self.Git("show-ref -s refs/heads/candidate")
|
|
|
|
|
| class CheckLastPush(Step):
|
| @@ -94,8 +93,8 @@ class CheckLastPush(Step):
|
| self.Die("Could not retrieve bleeding edge revision for trunk push %s"
|
| % last_push)
|
|
|
| - if self["lkgr"] == last_push_be:
|
| - print "Already pushed current lkgr %s" % last_push_be
|
| + if self["candidate"] == last_push_be:
|
| + print "Already pushed current candidate %s" % last_push_be
|
| return True
|
|
|
|
|
| @@ -103,12 +102,12 @@ class PushToCandidates(Step):
|
| MESSAGE = "Pushing to candidates if specified."
|
|
|
| def RunStep(self):
|
| - print "Pushing lkgr %s to candidates." % self["lkgr"]
|
| + print "Pushing candidate %s to candidates." % self["candidate"]
|
|
|
| args = [
|
| "--author", self._options.author,
|
| "--reviewer", self._options.reviewer,
|
| - "--revision", self["lkgr"],
|
| + "--revision", self["candidate"],
|
| "--force",
|
| ]
|
|
|
| @@ -144,7 +143,7 @@ class AutoPush(ScriptsBase):
|
| Preparation,
|
| CheckAutoPushSettings,
|
| CheckTreeStatus,
|
| - FetchLKGR,
|
| + FetchCandidate,
|
| CheckLastPush,
|
| PushToCandidates,
|
| ]
|
|
|