| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 116 |
| 117 | 117 |
| 118 class UpdateChromiumCheckout(Step): | 118 class UpdateChromiumCheckout(Step): |
| 119 MESSAGE = "Update the checkout and create a new branch." | 119 MESSAGE = "Update the checkout and create a new branch." |
| 120 | 120 |
| 121 def RunStep(self): | 121 def RunStep(self): |
| 122 self['json_output']['monitoring_state'] = 'update_chromium' | 122 self['json_output']['monitoring_state'] = 'update_chromium' |
| 123 cwd = self._options.chromium | 123 cwd = self._options.chromium |
| 124 self.GitCheckout("master", cwd=cwd) | 124 self.GitCheckout("master", cwd=cwd) |
| 125 self.DeleteBranch("work-branch", cwd=cwd) | 125 self.DeleteBranch("work-branch", cwd=cwd) |
| 126 self.Command("gclient", "sync --nohooks", cwd=cwd) | |
| 127 self.GitPull(cwd=cwd) | 126 self.GitPull(cwd=cwd) |
| 128 | 127 |
| 129 # Update v8 remotes. | 128 # Update v8 remotes. |
| 130 self.GitFetchOrigin() | 129 self.GitFetchOrigin() |
| 131 | 130 |
| 132 self.GitCreateBranch("work-branch", cwd=cwd) | 131 self.GitCreateBranch("work-branch", cwd=cwd) |
| 133 | 132 |
| 134 | 133 |
| 135 class UploadCL(Step): | 134 class UploadCL(Step): |
| 136 MESSAGE = "Create and upload CL." | 135 MESSAGE = "Create and upload CL." |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 PrepareRollCandidate, | 219 PrepareRollCandidate, |
| 221 SwitchChromium, | 220 SwitchChromium, |
| 222 UpdateChromiumCheckout, | 221 UpdateChromiumCheckout, |
| 223 UploadCL, | 222 UploadCL, |
| 224 CleanUp, | 223 CleanUp, |
| 225 ] | 224 ] |
| 226 | 225 |
| 227 | 226 |
| 228 if __name__ == "__main__": # pragma: no cover | 227 if __name__ == "__main__": # pragma: no cover |
| 229 sys.exit(AutoRoll().Run()) | 228 sys.exit(AutoRoll().Run()) |
| OLD | NEW |