Reviewers: jarin, hinoka,
Message:
PTAL
Description:
Keep chromium checkout up to date in auto roller.
BUG=
Please review this at https://codereview.chromium.org/504443005/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+3, -2 lines):
M tools/push-to-trunk/chromium_roll.py
M tools/push-to-trunk/test_scripts.py
Index: tools/push-to-trunk/chromium_roll.py
diff --git a/tools/push-to-trunk/chromium_roll.py
b/tools/push-to-trunk/chromium_roll.py
index
c5687d1bc29caeff9865e5fa5fcea38995e12a9d..6b00429e72bd73c562f7eaee18e53268b3f5c0a7
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"])
Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py
b/tools/push-to-trunk/test_scripts.py
index
39f002f17df4183b512aeccf840c2edf47212842..4b36ba900c5ea0fe5d98c2dcaa166e52bac9986a
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 "
--
--
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.
