Reviewers: hinoka, jarin,

Message:
PTAL. When I said "it's the last CL" in my last CL... well never mind.

Apparently gclient sync doesn't fetch the remotes of subprojects.

Description:
Fix chromium update in auto-roller.

BUG=

Please review this at https://codereview.chromium.org/511803002/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+9, -0 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 fe389efb37096343963ab982a9dac67bb8c1bb93..6d9e5bd8d81e91fbec543ff53b4c91e51ece4529 100755
--- a/tools/push-to-trunk/chromium_roll.py
+++ b/tools/push-to-trunk/chromium_roll.py
@@ -73,6 +73,12 @@ class UpdateChromiumCheckout(Step):
     os.chdir(self["chrome_path"])
     self.GitCheckout("master")
     self._side_effect_handler.Command("gclient", "sync --nohooks")
+    try:
+      # TODO(machenbach): Add cwd to git calls.
+      os.chdir(os.path.join(self["chrome_path"], "v8"))
+      self.GitFetchOrigin()
+    finally:
+      os.chdir(self["chrome_path"])
     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 5dcc79692f5cf320e8905f528e54b52e523db95d..01fedd04408f18c1370e0eeb9235e109e48a121d 100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -834,6 +834,8 @@ def get_list():
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     if not os.path.exists(TEST_CONFIG[CHROMIUM]):
       os.makedirs(TEST_CONFIG[CHROMIUM])
+    if not os.path.exists(os.path.join(TEST_CONFIG[CHROMIUM], "v8")):
+      os.makedirs(os.path.join(TEST_CONFIG[CHROMIUM], "v8"))
     TextToFile("Some line\n   \"v8_revision\": \"123444\",\n  some line",
                TEST_CONFIG[DEPS_FILE])
     def WriteDeps():
@@ -855,6 +857,7 @@ def get_list():
       Git("status -s -uno", ""),
       Git("checkout -f master", ""),
       Git("sync --nohooks", "syncing..."),
+      Git("fetch origin", ""),
       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