Revision: 23438
Author:   [email protected]
Date:     Wed Aug 27 09:38:55 2014 UTC
Log:      Keep chromium checkout up to date in auto roller.

[email protected]

Review URL: https://codereview.chromium.org/504443005
https://code.google.com/p/v8/source/detail?r=23438

Modified:
 /branches/bleeding_edge/tools/push-to-trunk/chromium_roll.py
 /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py

=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/chromium_roll.py Mon Aug 25 20:04:23 2014 UTC +++ /branches/bleeding_edge/tools/push-to-trunk/chromium_roll.py Wed Aug 27 09:38:55 2014 UTC
@@ -72,7 +72,7 @@
   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"])


=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Mon Aug 25 20:04:23 2014 UTC +++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Wed Aug 27 09:38:55 2014 UTC
@@ -368,6 +368,7 @@
     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 @@
           "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 "

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to