From: machenbach@chromium.org <machenbach@chromium.org>
Date: Wed, 27 Aug 2014 13:13:40 +0000 (+0000)
Subject: Fix chromium update in auto-roller.
X-Git-Tag: upstream/4.7.83~7325
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c21026c816e702e1889afff7d89e7fd603160471;p=platform%2Fupstream%2Fv8.git

Fix chromium update in auto-roller.

BUG=
R=hinoka@google.com

Review URL: https://codereview.chromium.org/511803002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23455 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/push-to-trunk/chromium_roll.py
index fe389ef..6d9e5bd 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"])
 
 
diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py
index 5dcc796..01fedd0 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 "