Don't track SCM changes in rebaseline commands.

third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py

 # Copyright (C) 2011, Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 31 matching lines @@
         if inverted_dictionary.get(value):
             inverted_dictionary[value].append(key)
         else:
             inverted_dictionary[value] = [key]
     return inverted_dictionary
 
 
 class BaselineOptimizer(object):
     ROOT_LAYOUT_TESTS_DIRECTORY = 'LayoutTests'
 
-    def __init__(self, host, port, port_names, skip_scm_commands):
+    def __init__(self, host, port, port_names):
         self._filesystem = host.filesystem
-        self._skip_scm_commands = skip_scm_commands
-        self._files_to_delete = []
-        self._files_to_add = []
-        self._scm = host.scm()
         self._default_port = port
         self._ports = {}
         for port_name in port_names:
             self._ports[port_name] = host.port_factory.get(port_name)
 
         self._webkit_base = port.webkit_base()
         self._layout_tests_dir = port.layout_tests_dir()
 
         # Only used by unittests.
         self.new_results_by_directory = []
@@ skipping 151 matching lines @@
             return filename.replace(platform_dir, '').split(self._filesystem.sep)[0]
         return '(generic)'
 
     def _move_baselines(self, baseline_name, results_by_directory, new_results_by_directory):
         data_for_result = {}
         for directory, result in results_by_directory.items():
             if not result in data_for_result:
                 source = self._join_directory(directory, baseline_name)
                 data_for_result[result] = self._filesystem.read_binary_file(source)
 
-        scm_files = []
         fs_files = []
         for directory, result in results_by_directory.items():
             if new_results_by_directory.get(directory) != result:
                 file_name = self._join_directory(directory, baseline_name)
-                if self._scm.exists(file_name):
-                    scm_files.append(file_name)
-                elif self._filesystem.exists(file_name):
+                if self._filesystem.exists(file_name):
                     fs_files.append(file_name)
 
-        if scm_files or fs_files:
-            if scm_files:
-                _log.debug("    Deleting (SCM):")
-                for platform_dir in sorted(self._platform(filename) for filename in scm_files):
-                    _log.debug("      " + platform_dir)
-                if self._skip_scm_commands:
-                    self._files_to_delete.extend(scm_files)
-                else:
-                    self._scm.delete_list(scm_files)
-            if fs_files:
-                _log.debug("    Deleting (file system):")
-                for platform_dir in sorted(self._platform(filename) for filename in fs_files):
-                    _log.debug("      " + platform_dir)
-                for filename in fs_files:
-                    self._filesystem.remove(filename)
+        if fs_files:
+            _log.debug("    Deleting (file system):")
+            for platform_dir in sorted(self._platform(filename) for filename in fs_files):
+                _log.debug("      " + platform_dir)
+            for filename in fs_files:
+                self._filesystem.remove(filename)
         else:
             _log.debug("    (Nothing to delete)")
 
         file_names = []
         for directory, result in new_results_by_directory.items():
             if results_by_directory.get(directory) != result:
                 destination = self._join_directory(directory, baseline_name)
                 self._filesystem.maybe_make_directory(self._filesystem.split(destination)[0])
                 self._filesystem.write_binary_file(destination, data_for_result[result])
                 file_names.append(destination)
 
         if file_names:
             _log.debug("    Adding:")
             for platform_dir in sorted(self._platform(filename) for filename in file_names):
                 _log.debug("      " + platform_dir)
-            if self._skip_scm_commands:
-                # Have adds win over deletes.
-                self._files_to_delete = list(set(self._files_to_delete) - set(file_names))
-                self._files_to_add.extend(file_names)
-            else:
-                self._scm.add_list(file_names)
         else:
             _log.debug("    (Nothing to add)")
 
     def write_by_directory(self, results_by_directory, writer, indent):
         for path in sorted(results_by_directory):
             writer("%s%s: %s" % (indent, self._platform(path), results_by_directory[path][0:6]))
 
     def _optimize_subtree(self, baseline_name):
         basename = self._filesystem.basename(baseline_name)
         results_by_directory, new_results_by_directory = self._find_optimal_result_placement(baseline_name)
@@ skipping 36 matching lines @@
         for port in self._ports.values():
             directories = self._relative_baseline_search_paths(port, non_virtual_baseline_name)
             for directory in directories:
                 if directory not in results_by_directory:
                     continue
                 if results_by_directory[directory] != root_sha1:
                     return
                 break
 
         _log.debug("Deleting redundant virtual root expected result.")
-        if self._skip_scm_commands and virtual_root_expected_baseline_path in self._files_to_add:
-            self._files_to_add.remove(virtual_root_expected_baseline_path)
-        if self._scm.exists(virtual_root_expected_baseline_path):
-            _log.debug("    Deleting (SCM): " + virtual_root_expected_baseline_path)
-            if self._skip_scm_commands:
-                self._files_to_delete.append(virtual_root_expected_baseline_path)
-            else:
-                self._scm.delete(virtual_root_expected_baseline_path)
-        else:
-            _log.debug("    Deleting (file system): " + virtual_root_expected_baseline_path)
-            self._filesystem.remove(virtual_root_expected_baseline_path)
+        _log.debug("    Deleting (file system): " + virtual_root_expected_baseline_path)
+        self._filesystem.remove(virtual_root_expected_baseline_path)
 
     def optimize(self, baseline_name):
         # The virtual fallback path is the same as the non-virtual one tacked on to the bottom of the non-virtual path.
         # See https://docs.google.com/a/chromium.org/drawings/d/1eGdsIKzJ2dxDDBbUaIABrN4aMLD1bqJTfyxNGZsTdmg/edit for
         # a visual representation of this.
         #
         # So, we can optimize the virtual path, then the virtual root and then the regular path.
 
-        self._files_to_delete = []
-        self._files_to_add = []
         _log.debug("Optimizing regular fallback path.")
         result = self._optimize_subtree(baseline_name)
         non_virtual_baseline_name = self._virtual_base(baseline_name)
         if not non_virtual_baseline_name:
-            return result, self._files_to_delete, self._files_to_add
+            return result
 
         self._optimize_virtual_root(baseline_name, non_virtual_baseline_name)
 
         _log.debug("Optimizing non-virtual fallback path.")
         result |= self._optimize_subtree(non_virtual_baseline_name)
-        return result, self._files_to_delete, self._files_to_add
+        return result