Don't run git add/rm after rebaseline commands for rebaseline-cl.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A command to fetch new baselines from try jobs for a Rietveld issue.
 
 This command interacts with the Rietveld API to get information about try jobs
 with layout test results.
 """
 
@@ skipping 48 matching lines @@
             builds = [Build(j.builder_name, j.build_number) for j in try_jobs]
             for test in args:
                 test_prefix_list[test] = {b: BASELINE_SUFFIX_LIST for b in builds}
         else:
             test_prefix_list = self._test_prefix_list(
                 issue_number, only_changed_tests=options.only_changed_tests)
         self._log_test_prefix_list(test_prefix_list)
 
         if options.dry_run:
             return
-        self._rebaseline(options, test_prefix_list)
+        self._rebaseline(options, test_prefix_list, update_scm=False)

[wkorman, 2016/08/19 22:54:07]

So in terms of addressing the bug, after this change, what is the behavior?
Nothing will be auto-staged for the developer, but they'll see newly
pulled/optimized baselines in their directory and can manually add them? Just
want to make sure I am following re: this patch and the bug.

[qyearsley, 2016/08/19 23:32:27]

Right, exactly. Changes will be made but not staged. So, if you run webkit-patch
rebaseline-cl and it modifies an existing CL, you can still commit your changes
with `git commit -a`, but if you're adding a new baseline, you must `git add`
the new file before committing.

This may be an extra step, but it's less confusing than the current behavior,
where `git status` shows a bunch of files being both added and deleted.

 
     def _get_issue_number(self, options):
         """Gets the Rietveld CL number from either |options| or from the current local branch."""
         if options.issue:
             return options.issue
         issue_number = self.git().get_issue_number()
         _log.debug('Issue number for current branch: %s', issue_number)
         if not issue_number.isdigit():
             _log.error('No issue number given and no issue for current branch.')
             return None
@@ skipping 62 matching lines @@
     @staticmethod
     def _log_test_prefix_list(test_prefix_list):
         """Logs the tests to download new baselines for."""
         if not test_prefix_list:
             _log.info('No tests to rebaseline.')
             return
         _log.info('Tests to rebaseline:')
         for test, builds in test_prefix_list.iteritems():
             builds_str = ', '.join(sorted('%s (%s)' % (b.builder_name, b.build_number) for b in builds))
             _log.info('  %s: %s', test, builds_str)