From f435a218a5149fe246e29b1b7bdcb2fe667761e5 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Wed, 27 Aug 2014 09:38:55 +0000 Subject: [PATCH] Keep chromium checkout up to date in auto roller. R=hinoka@google.com Review URL: https://codereview.chromium.org/504443005 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23438 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/push-to-trunk/chromium_roll.py | 2 +- tools/push-to-trunk/test_scripts.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/push-to-trunk/chromium_roll.py index c5687d1..6b00429 100755 --- a/tools/push-to-trunk/chromium_roll.py +++ b/tools/push-to-trunk/chromium_roll.py @@ -72,7 +72,7 @@ class UpdateChromiumCheckout(Step): def RunStep(self): os.chdir(self["chrome_path"]) self.GitCheckout("master") - self.GitPull() + self._side_effect_handler.Command("gclient", "sync --no-hooks") self.GitCreateBranch("v8-roll-%s" % self["trunk_revision"]) diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 39f002f..4b36ba9 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/push-to-trunk/test_scripts.py @@ -368,6 +368,7 @@ class ScriptTest(unittest.TestCase): print "Log: %s %s" % (cmd, args) MOCKS = { + "gclient": GitMock, # TODO(machenbach): Yet another hack. Unify all mocks. "git": GitMock, "roll-dep": GitMock, # TODO(machenbach): Yet another hack. Unify all mocks. # TODO(machenbach): Little hack to reuse the git mock for the one svn call @@ -853,7 +854,7 @@ def get_list(): "Version 3.22.5 (based on bleeding_edge revision r123454)\n"), Git("status -s -uno", ""), Git("checkout -f master", ""), - Git("pull", ""), + Git("sync --no-hooks", "syncing..."), Git("checkout -b v8-roll-123455", ""), Git("v8 123455", "rolled", cb=WriteDeps), Git(("commit -am \"Update V8 to version 3.22.5 " -- 2.7.4