| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """A command to download new baselines for NeedsRebaseline tests. | 5 """A command to download new baselines for NeedsRebaseline tests. |
| 6 | 6 |
| 7 This command checks the list of tests with NeedsRebaseline expectations, | 7 This command checks the list of tests with NeedsRebaseline expectations, |
| 8 and downloads the latest baselines for those tests from the results archived | 8 and downloads the latest baselines for those tests from the results archived |
| 9 by the continuous builders. | 9 by the continuous builders. |
| 10 """ | 10 """ |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 # Save the current branch name and check out a clean branch for the
patch. | 252 # Save the current branch name and check out a clean branch for the
patch. |
| 253 old_branch_name_or_ref = tool.scm().current_branch_or_ref() | 253 old_branch_name_or_ref = tool.scm().current_branch_or_ref() |
| 254 if old_branch_name_or_ref == self.AUTO_REBASELINE_BRANCH_NAME: | 254 if old_branch_name_or_ref == self.AUTO_REBASELINE_BRANCH_NAME: |
| 255 rebaseline_branch_name = self.AUTO_REBASELINE_ALT_BRANCH_NAME | 255 rebaseline_branch_name = self.AUTO_REBASELINE_ALT_BRANCH_NAME |
| 256 if not options.dry_run: | 256 if not options.dry_run: |
| 257 tool.scm().delete_branch(rebaseline_branch_name) | 257 tool.scm().delete_branch(rebaseline_branch_name) |
| 258 tool.scm().create_clean_branch(rebaseline_branch_name) | 258 tool.scm().create_clean_branch(rebaseline_branch_name) |
| 259 did_switch_branches = True | 259 did_switch_branches = True |
| 260 | 260 |
| 261 if test_prefix_list: | 261 if test_prefix_list: |
| 262 self._rebaseline(options, test_prefix_list) | 262 self.rebaseline(options, test_prefix_list) |
| 263 | 263 |
| 264 if options.dry_run: | 264 if options.dry_run: |
| 265 return | 265 return |
| 266 | 266 |
| 267 tool.scm().commit_locally_with_message( | 267 tool.scm().commit_locally_with_message( |
| 268 self.commit_message(author, revision, commit, bugs)) | 268 self.commit_message(author, revision, commit, bugs)) |
| 269 | 269 |
| 270 # FIXME: It would be nice if we could dcommit the patch without uplo
ading, but still | 270 # FIXME: It would be nice if we could dcommit the patch without uplo
ading, but still |
| 271 # go through all the precommit hooks. For rebaselines with lots of f
iles, uploading | 271 # go through all the precommit hooks. For rebaselines with lots of f
iles, uploading |
| 272 # takes a long time and sometimes fails, but we don't want to commit
if, e.g. the | 272 # takes a long time and sometimes fails, but we don't want to commit
if, e.g. the |
| (...skipping 16 matching lines...) Expand all Loading... |
| 289 issue_already_closed = tool.executive.run_command( | 289 issue_already_closed = tool.executive.run_command( |
| 290 ['git', 'config', 'branch.%s.rietveldissue' % rebaseline
_branch_name], | 290 ['git', 'config', 'branch.%s.rietveldissue' % rebaseline
_branch_name], |
| 291 return_exit_code=True) | 291 return_exit_code=True) |
| 292 if not issue_already_closed: | 292 if not issue_already_closed: |
| 293 self._run_git_cl_command(options, ['set_close']) | 293 self._run_git_cl_command(options, ['set_close']) |
| 294 | 294 |
| 295 tool.scm().ensure_cleanly_tracking_remote_master() | 295 tool.scm().ensure_cleanly_tracking_remote_master() |
| 296 if old_branch_name_or_ref: | 296 if old_branch_name_or_ref: |
| 297 tool.scm().checkout_branch(old_branch_name_or_ref) | 297 tool.scm().checkout_branch(old_branch_name_or_ref) |
| 298 tool.scm().delete_branch(rebaseline_branch_name) | 298 tool.scm().delete_branch(rebaseline_branch_name) |
| OLD | NEW |