| OLD | NEW |
| 1 # Copyright (c) 2010 Google Inc. All rights reserved. | 1 # Copyright (c) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 def __init__(self): | 90 def __init__(self): |
| 91 super(BaseInternalRebaselineCommand, self).__init__(options=[ | 91 super(BaseInternalRebaselineCommand, self).__init__(options=[ |
| 92 self.results_directory_option, | 92 self.results_directory_option, |
| 93 self.suffixes_option, | 93 self.suffixes_option, |
| 94 optparse.make_option("--builder", help="Builder to pull new baseline
s from."), | 94 optparse.make_option("--builder", help="Builder to pull new baseline
s from."), |
| 95 optparse.make_option("--test", help="Test to rebaseline."), | 95 optparse.make_option("--test", help="Test to rebaseline."), |
| 96 ]) | 96 ]) |
| 97 | 97 |
| 98 def _baseline_directory(self, builder_name): | 98 def _baseline_directory(self, builder_name): |
| 99 port = self._tool.port_factory.get_from_builder_name(builder_name) | 99 port = self._tool.port_factory.get_from_builder_name(builder_name) |
| 100 override_dir = self._tool.builders.rebaseline_override_dir(builder_name) | |
| 101 if override_dir: | |
| 102 return self._tool.filesystem.join(port.layout_tests_dir(), 'platform
', override_dir) | |
| 103 return port.baseline_version_dir() | 100 return port.baseline_version_dir() |
| 104 | 101 |
| 105 def _test_root(self, test_name): | 102 def _test_root(self, test_name): |
| 106 return self._tool.filesystem.splitext(test_name)[0] | 103 return self._tool.filesystem.splitext(test_name)[0] |
| 107 | 104 |
| 108 def _file_name_for_actual_result(self, test_name, suffix): | 105 def _file_name_for_actual_result(self, test_name, suffix): |
| 109 return "%s-actual.%s" % (self._test_root(test_name), suffix) | 106 return "%s-actual.%s" % (self._test_root(test_name), suffix) |
| 110 | 107 |
| 111 def _file_name_for_expected_result(self, test_name, suffix): | 108 def _file_name_for_expected_result(self, test_name, suffix): |
| 112 return "%s-expected.%s" % (self._test_root(test_name), suffix) | 109 return "%s-expected.%s" % (self._test_root(test_name), suffix) |
| (...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 941 issue_already_closed = tool.executive.run_command( | 938 issue_already_closed = tool.executive.run_command( |
| 942 ['git', 'config', 'branch.%s.rietveldissue' % rebaseline
_branch_name], | 939 ['git', 'config', 'branch.%s.rietveldissue' % rebaseline
_branch_name], |
| 943 return_exit_code=True) | 940 return_exit_code=True) |
| 944 if not issue_already_closed: | 941 if not issue_already_closed: |
| 945 self._run_git_cl_command(options, ['set_close']) | 942 self._run_git_cl_command(options, ['set_close']) |
| 946 | 943 |
| 947 tool.scm().ensure_cleanly_tracking_remote_master() | 944 tool.scm().ensure_cleanly_tracking_remote_master() |
| 948 if old_branch_name_or_ref: | 945 if old_branch_name_or_ref: |
| 949 tool.scm().checkout_branch(old_branch_name_or_ref) | 946 tool.scm().checkout_branch(old_branch_name_or_ref) |
| 950 tool.scm().delete_branch(rebaseline_branch_name) | 947 tool.scm().delete_branch(rebaseline_branch_name) |
| OLD | NEW |