Added git hyper-blame, a tool that skips unwanted commits in git blame.

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 158 matching lines @@
   COMMIT_A = {
     'some/files/file1': {'data': 'file1'},
     'some/files/file2': {'data': 'file2'},
     'some/files/file3': {'data': 'file3'},
     'some/other/file':  {'data': 'otherfile'},
   }
 
   COMMIT_C = {
     'some/files/file2': {
       'mode': 0755,
-      'data': 'file2 - vanilla'},
+      'data': 'file2 - vanilla\n'},
   }
 
   COMMIT_E = {
-    'some/files/file2': {'data': 'file2 - merged'},
+    'some/files/file2': {'data': 'file2 - merged\n'},
   }
 
   COMMIT_D = {
-    'some/files/file2': {'data': 'file2 - vanilla\nfile2 - merged'},
+    'some/files/file2': {'data': 'file2 - vanilla\nfile2 - merged\n'},
   }
 
   def testHashes(self):
     ret = self.repo.run(
       self.gc.hash_multi, *[
         'master',
         'master~3',
         self.repo['E']+'~',
         self.repo['D']+'^2',
         'tag_C^{}',
@@ skipping 54 matching lines @@
   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 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 {}')
+      format_string = format_string.format(lines, commit_name)
+      info = self.repo.show_commit(commit_name, format_string=format_string)
+      return info.split('\n')
+
+    # Expect to blame line 1 on C, line 2 on E.
+    c_short = self.repo['C'][:8]
+    c_author = self.repo.show_commit('C', format_string='%an %ai')
+    e_short = self.repo['E'][:8]
+    e_author = self.repo.show_commit('E', format_string='%an %ai')
+    expected_output = ['%s (%s 1) file2 - vanilla' % (c_short, c_author),
+                       '%s (%s 2) file2 - merged' % (e_short, e_author)]
+    self.assertEqual(expected_output,
+                     self.repo.run(self.gc.blame, 'some/files/file2',
+                                   'tag_D').split('\n'))
+
+    # Test porcelain.
+    expected_output = []
+    expected_output.extend(get_porcelain_for_commit('C', '1 1 1'))
+    expected_output.append('previous %s some/files/file2' % self.repo['B'])
+    expected_output.append('filename some/files/file2')
+    expected_output.append('\tfile2 - vanilla')
+    expected_output.extend(get_porcelain_for_commit('E', '1 2 1'))
+    expected_output.append('previous %s some/files/file2' % self.repo['B'])
+    expected_output.append('filename some/files/file2')
+    expected_output.append('\tfile2 - merged')
+    self.assertEqual(expected_output,
+                     self.repo.run(self.gc.blame, 'some/files/file2',
+                                   'tag_D', porcelain=True).split('\n'))
+
   def testParseCommitrefs(self):
     ret = self.repo.run(
       self.gc.parse_commitrefs, *[
         'master',
         'master~3',
         self.repo['E']+'~',
         self.repo['D']+'^2',
         'tag_C^{}',
       ]
     )
     self.assertEqual(ret, map(binascii.unhexlify, [
       self.repo['D'],
       self.repo['A'],
       self.repo['B'],
       self.repo['E'],
       self.repo['C'],
     ]))
 
     with self.assertRaisesRegexp(Exception, r"one of \('master', 'bananas'\)"):
       self.repo.run(self.gc.parse_commitrefs, 'master', 'bananas')
 
+  def testRepoRoot(self):
+    def cd_and_repo_root(path):
+      print(os.getcwd())
+      os.chdir(path)
+      return self.gc.repo_root()
+
+    self.assertEqual(self.repo.repo_path, self.repo.run(self.gc.repo_root))
+    # cd to a subdirectory; repo_root should still return the root dir.
+    self.assertEqual(self.repo.repo_path,
+                     self.repo.run(cd_and_repo_root, 'some/files'))
+
   def testTags(self):
     self.assertEqual(set(self.repo.run(self.gc.tags)),
                      {'tag_'+l for l in 'ABCDE'})
 
   def testTree(self):
     tree = self.repo.run(self.gc.tree, 'master:some/files')
     file1 = self.COMMIT_A['some/files/file1']['data']
     file2 = self.COMMIT_D['some/files/file2']['data']
     file3 = self.COMMIT_A['some/files/file3']['data']
     self.assertEquals(
@@ skipping 503 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')))