Add option to specify similarity level for git diff operations on commandline

tests/git_cl_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 75 matching lines @@
     expected_args, result = self.calls.pop(0)
     self.assertEquals(
         expected_args,
         args,
         '@%d  Expected: %r   Actual: %r' % (
           self._calls_done, expected_args, args))
     self._calls_done += 1
     return result
 
   @classmethod
-  def _upload_calls(cls):
-    return cls._git_base_calls() + cls._git_upload_calls()
+  def _upload_calls(cls, similarity):
+    return cls._git_base_calls(similarity) + cls._git_upload_calls()
 
   @staticmethod
-  def _git_base_calls():
+  def _git_base_calls(similarity):
+    if similarity is None:
+      similarity = '50'
+      similarity_call = ((['git', 'config', '--int', '--get',
+                         'branch.master.git-cl-similarity'],), '')
+    else:
+      similarity_call = ((['git', 'config', '--int',
+                         'branch.master.git-cl-similarity', similarity],), '')
     return [
       ((['git', 'config', 'gerrit.host'],), ''),
+      ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
+      ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
+      similarity_call,
       ((['git', 'update-index', '--refresh', '-q'],), ''),
       ((['git', 'diff-index', 'HEAD'],), ''),
-      ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       ((['git', 'config', 'branch.master.merge'],), 'master'),
       ((['git', 'config', 'branch.master.remote'],), 'origin'),
       ((['git', 'rev-parse', '--show-cdup'],), ''),
       ((['git', 'rev-parse', 'HEAD'],), '12345'),
       ((['git', 'diff', '--name-status', '-r', 'master...', '.'],),
         'M\t.gitignore\n'),
       ((['git', 'config', 'branch.master.rietveldissue'],), ''),
       ((['git', 'config', 'branch.master.rietveldpatchset'],), ''),
       ((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
       ((['git', 'config', 'user.email'],), 'me@example.com'),
       ((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
-         '-l100000', 'master...'],),
+         '-C'+similarity, '-l100000', 'master...'],),
        '+dat'),
       ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],), 'desc\n'),
     ]
 
   @staticmethod
   def _git_upload_calls():
     return [
       ((['git', 'config', 'rietveld.cc'],), ''),
       ((['git', 'config', 'branch.master.base-url'],), ''),
       ((['git', 'config', '--get-regexp', '^svn-remote\\.'],),
         (('', None), 0)),
       ((['git', 'rev-parse', '--show-cdup'],), ''),
       ((['git', 'svn', 'info'],), ''),
       ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
       ((['git', 'config', 'branch.master.rietveldserver',
           'https://codereview.example.com'],), ''),
       ((['git', 'config', 'branch.master.rietveldpatchset', '2'],), ''),
     ]
 
   @classmethod
   def _dcommit_calls_1(cls):
     return [
       ((['git', 'config', '--get-regexp', '^svn-remote\\.'],),
        ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
           'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
          None),
         0)),
       ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
       ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
+      ((['git', 'config', '--int', '--get',
+        'branch.working.git-cl-similarity'],), ''),
+      ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
       ((['git', 'config', 'branch.working.merge'],), 'refs/heads/master'),
       ((['git', 'config', 'branch.working.remote'],), 'origin'),
       ((['git', 'rev-list', '--merges',
          '--grep=^SVN changes up to revision [0-9]*$',
          'refs/remotes/origin/master^!'],), ''),
       ((['git', 'update-index', '--refresh', '-q'],), ''),
       ((['git', 'diff-index', 'HEAD'],), ''),
       ((['git', 'rev-list', '^refs/heads/working',
          'refs/remotes/origin/master'],),
          ''),
@@ skipping 28 matching lines @@
          'codereview.example.com'),
       (('GitClHooksBypassedCommit',
         'Issue https://codereview.example.com/12345 bypassed hook when '
         'committing'), None),
   ]
 
   @classmethod
   def _dcommit_calls_3(cls):
     return [
       ((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
-         '-l100000', 'refs/remotes/origin/master', 'refs/heads/working'],),
+         '-C50', '-l100000', 'refs/remotes/origin/master',
+         'refs/heads/working'],),
        (' PRESUBMIT.py |    2 +-\n'
         ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
       (('About to commit; enter to confirm.',), None),
       ((['git', 'show-ref', '--quiet', '--verify',
          'refs/heads/git-cl-commit'],),
        (('', None), 0)),
       ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
       ((['git', 'show-ref', '--quiet', '--verify',
          'refs/heads/git-cl-cherry-pick'],), ''),
       ((['git', 'rev-parse', '--show-cdup'],), '\n'),
       ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
       ((['git', 'reset', '--soft', 'refs/remotes/origin/master'],), ''),
       ((['git', 'commit', '-m',
          'Issue: 12345\n\nReview URL: https://codereview.example.com/12345'],),
        ''),
-      ((['git', 'svn', 'dcommit', '--no-rebase', '--rmdir'],), (('', None), 0)),
+      ((['git', 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
+       (('', None), 0)),
       ((['git', 'checkout', '-q', 'working'],), ''),
       ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
   ]
 
   @staticmethod
-  def _cmd_line(description, args):
+  def _cmd_line(description, args, similarity):
     """Returns the upload command line passed to upload.RealMain()."""
     return [
         'upload', '--assume_yes', '--server',
         'https://codereview.example.com',
         '--message', description
     ] + args + [
         '--cc', 'joe@example.com',
+        '--git_similarity', similarity or '50',
         'master...'
     ]
 
   def _run_reviewer_test(
       self,
       upload_args,
       expected_description,
       returned_description,
       final_description,
       reviewers):
     """Generic reviewer test framework."""
-    self.calls = self._upload_calls()
+    try:
+      similarity = upload_args[upload_args.index('--similarity')+1]
+    except ValueError:
+      similarity = None
+    self.calls = self._upload_calls(similarity)
     def RunEditor(desc, _):
       self.assertEquals(
           '# Enter a description of the change.\n'
           '# This will displayed on the codereview site.\n'
           '# The first line will also be used as the subject of the review.\n' +
           expected_description,
           desc)
       return returned_description
     self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
     def check_upload(args):
-      self.assertEquals(self._cmd_line(final_description, reviewers), args)
+      cmd_line = self._cmd_line(final_description, reviewers, similarity)
+      self.assertEquals(cmd_line, args)
       return 1, 2
     self.mock(git_cl.upload, 'RealMain', check_upload)
     git_cl.main(['upload'] + upload_args)
 
   def test_no_reviewer(self):
     self._run_reviewer_test(
         [],
         'desc\n\nBUG=\n',
         '# Blah blah comment.\ndesc\n\nBUG=\n',
         'desc\n\nBUG=\n',
         [])
 
+  def test_keep_similarity(self):
+    self._run_reviewer_test(
+        ['--similarity', '70'],
+        'desc\n\nBUG=\n',
+        '# Blah blah comment.\ndesc\n\nBUG=\n',
+        'desc\n\nBUG=\n',
+        [])
+
   def test_reviewers_cmd_line(self):
     # Reviewer is passed as-is
     description = 'desc\n\nR=foo@example.com\nBUG=\n'
     self._run_reviewer_test(
         ['-r' 'foo@example.com'],
         description,
         '\n%s\n' % description,
         description,
         ['--reviewers', 'foo@example.com'])
 
@@ skipping 31 matching lines @@
 
   def test_reviewer_send_mail_no_rev(self):
     # Fails without a reviewer.
     class FileMock(object):
       buf = StringIO.StringIO()
       def write(self, content):
         self.buf.write(content)
 
     mock = FileMock()
     try:
-      self.calls = self._git_base_calls()
+      self.calls = self._git_base_calls(None)
       def RunEditor(desc, _):
         return desc
       self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
       self.mock(sys, 'stderr', mock)
       git_cl.main(['upload', '--send-mail'])
       self.fail()
     except SystemExit:
       self.assertEquals(
           'Must specify reviewers to send email.\n', mock.buf.getvalue())
 
   def test_dcommit(self):
     self.calls = (
         self._dcommit_calls_1() +
         self._dcommit_calls_normal() +
         self._dcommit_calls_3())
     git_cl.main(['dcommit'])
 
   def test_dcommit_bypass_hooks(self):
     self.calls = (
         self._dcommit_calls_1() +
         self._dcommit_calls_bypassed() +
         self._dcommit_calls_3())
     git_cl.main(['dcommit', '--bypass-hooks'])
 
 
   @staticmethod
   def _gerrit_base_calls():
     return [
         ((['git', 'config', 'gerrit.host'],), 'gerrit.example.com'),
+        ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
+        ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
+        ((['git', 'config', '--int', '--get',
+          'branch.master.git-cl-similarity'],), ''),
         ((['git', 'update-index', '--refresh', '-q'],), ''),
         ((['git', 'diff-index', 'HEAD'],), ''),
-        ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
         ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
         ((['git', 'config', 'branch.master.merge'],), 'master'),
         ((['git', 'config', 'branch.master.remote'],), 'origin'),
         ((['git', 'rev-parse', '--show-cdup'],), ''),
         ((['git', 'rev-parse', 'HEAD'],), '12345'),
         ((['git', 'diff', '--name-status', '-r', 'master...', '.'],),
          'M\t.gitignore\n'),
         ((['git', 'config', 'branch.master.rietveldissue'],), ''),
         ((['git', 'config', 'branch.master.rietveldpatchset'],), ''),
         ((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
         ((['git', 'config', 'user.email'],), 'me@example.com'),
         ((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
-           '-l100000', 'master...'],),
+           '-C50', '-l100000', 'master...'],),
          '+dat'),
         ]
 
   @staticmethod
   def _gerrit_upload_calls(description, reviewers):
     calls = [
         ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],),
          description),
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
@@ skipping 90 matching lines @@
         ((['git', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
         # DownloadHooks(True)
         ((commit_msg_path, os.X_OK,), True),
         ]
     git_cl.main(['config'])
 
 
 if __name__ == '__main__':
   unittest.main()