git hyper-blame: Added approx. line number translation.

tests/git_common_test.py

 #!/usr/bin/env python
 # Copyright 2013 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_common.py"""
 
 import binascii
 import collections
 import os
@@ skipping 236 matching lines @@
     self.assertIsNone(self.repo.run(cur_branch_out_of_git))
 
     self.repo.git('checkout', 'branch_D')
     self.assertEqual(self.repo.run(self.gc.current_branch), 'branch_D')
 
   def testBranches(self):
     # This check fails with git 2.4 (see crbug.com/487172)
     self.assertEqual(self.repo.run(set, self.gc.branches()),
                      {'master', 'branch_D', 'root_A'})
 
+  def testDiff(self):
+    # Get the names of the blobs being compared (to avoid hard-coding).
+    c_blob_short = self.repo.git('rev-parse', '--short',
+                                 'tag_C:some/files/file2').stdout.strip()
+    d_blob_short = self.repo.git('rev-parse', '--short',
+                                 'tag_D:some/files/file2').stdout.strip()
+    expected_output = [
+        'diff --git a/some/files/file2 b/some/files/file2',
+        'index %s..%s 100755' % (c_blob_short, d_blob_short),
+        '--- a/some/files/file2',
+        '+++ b/some/files/file2',
+        '@@ -1 +1,2 @@',
+        ' file2 - vanilla',
+        '+file2 - merged']
+    self.assertEqual(expected_output,
+                     self.repo.run(self.gc.diff, 'tag_C', 'tag_D').split('\n'))
+
   def testDormant(self):
     self.assertFalse(self.repo.run(self.gc.is_dormant, 'master'))
     self.repo.git('config', 'branch.master.dormant', 'true')
     self.assertTrue(self.repo.run(self.gc.is_dormant, 'master'))
 
   def testBlame(self):
     def get_porcelain_for_commit(commit_name, lines):
       format_string = ('%H {}\nauthor %an\nauthor-mail <%ae>\nauthor-time %at\n'
                        'author-tz +0000\ncommitter %cn\ncommitter-mail <%ce>\n'
                        'committer-time %ct\ncommitter-tz +0000\nsummary {}')
@@ skipping 574 matching lines @@
                       self.repo.show_commit('A', format_string='%cn %ci'))
     self.assertEquals('Author McAuthorly 1970-01-03 00:00:00 +0000',
                       self.repo.show_commit('B', format_string='%an %ai'))
     self.assertEquals('Charles Committish 1970-01-04 00:00:00 +0000',
                       self.repo.show_commit('B', format_string='%cn %ci'))
 
 
 if __name__ == '__main__':
   sys.exit(coverage_utils.covered_main(
     os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py')))