OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2014 the V8 project authors. All rights reserved. | 2 # Copyright 2014 the V8 project authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import argparse | 6 import argparse |
7 import os | 7 import os |
8 import sys | 8 import sys |
9 | 9 |
10 from common_includes import * | 10 from common_includes import * |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 66 |
67 | 67 |
68 class UpdateChromiumCheckout(Step): | 68 class UpdateChromiumCheckout(Step): |
69 MESSAGE = "Update the checkout and create a new branch." | 69 MESSAGE = "Update the checkout and create a new branch." |
70 REQUIRES = "chrome_path" | 70 REQUIRES = "chrome_path" |
71 | 71 |
72 def RunStep(self): | 72 def RunStep(self): |
73 os.chdir(self["chrome_path"]) | 73 os.chdir(self["chrome_path"]) |
74 self.GitCheckout("master") | 74 self.GitCheckout("master") |
75 self._side_effect_handler.Command("gclient", "sync --nohooks") | 75 self._side_effect_handler.Command("gclient", "sync --nohooks") |
| 76 self.GitPull() |
76 try: | 77 try: |
77 # TODO(machenbach): Add cwd to git calls. | 78 # TODO(machenbach): Add cwd to git calls. |
78 os.chdir(os.path.join(self["chrome_path"], "v8")) | 79 os.chdir(os.path.join(self["chrome_path"], "v8")) |
79 self.GitFetchOrigin() | 80 self.GitFetchOrigin() |
80 finally: | 81 finally: |
81 os.chdir(self["chrome_path"]) | 82 os.chdir(self["chrome_path"]) |
82 self.GitCreateBranch("v8-roll-%s" % self["trunk_revision"]) | 83 self.GitCreateBranch("v8-roll-%s" % self["trunk_revision"]) |
83 | 84 |
84 | 85 |
85 class UploadCL(Step): | 86 class UploadCL(Step): |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 SwitchChromium, | 176 SwitchChromium, |
176 UpdateChromiumCheckout, | 177 UpdateChromiumCheckout, |
177 UploadCL, | 178 UploadCL, |
178 SwitchV8, | 179 SwitchV8, |
179 CleanUp, | 180 CleanUp, |
180 ] | 181 ] |
181 | 182 |
182 | 183 |
183 if __name__ == "__main__": # pragma: no cover | 184 if __name__ == "__main__": # pragma: no cover |
184 sys.exit(ChromiumRoll(CONFIG).Run()) | 185 sys.exit(ChromiumRoll(CONFIG).Run()) |
OLD | NEW |