git hyper-blame: Added automatically ignoring revs from a file.

git_hyper_blame.py

 #!/usr/bin/env python
 # 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.
 
 """Wrapper around git blame that ignores certain commits.
 """
 
 from __future__ import print_function
 
 import argparse
 import collections
 import logging
 import os
 import subprocess2
 import sys
 
 import git_common
 import git_dates
 
 
 logging.getLogger().setLevel(logging.INFO)
 
 
+DEFAULT_IGNORE_FILE_NAME = '.git-blame-ignore-revs'
+
+
 class Commit(object):
   """Info about a commit."""
   def __init__(self, commithash):
     self.commithash = commithash
     self.author = None
     self.author_mail = None
     self.author_time = None
     self.author_tz = None
     self.committer = None
     self.committer_mail = None
@@ skipping 281 matching lines @@
     # filename display for the entire blame output.
     if line.commit.filename != filename:
       show_filenames = True
 
     new_parsed.append(line)
 
   pretty_print(new_parsed, show_filenames=show_filenames, out=out)
 
   return 0
 
+
+def parse_ignore_file(ignore_file):
+  for line in ignore_file:
+    line = line.split('#', 1)[0].strip()
+    if line:
+      yield line
+
+
 def main(args, stdout=sys.stdout, stderr=sys.stderr):
   parser = argparse.ArgumentParser(
       prog='git hyper-blame',
       description='git blame with support for ignoring certain commits.')
   parser.add_argument('-i', metavar='REVISION', action='append', dest='ignored',
                       default=[], help='a revision to ignore')
+  parser.add_argument('--ignore-file', metavar='FILE',
+                      type=argparse.FileType('r'), dest='ignore_file',
+                      help='a file containing a list of revisions to ignore')
+  parser.add_argument('--no-default-ignores', dest='no_default_ignores',
+                      help='Do not ignore commits from .git-blame-ignore-revs.')
   parser.add_argument('revision', nargs='?', default='HEAD', metavar='REVISION',
                       help='revision to look at')
   parser.add_argument('filename', metavar='FILE', help='filename to blame')
 
   args = parser.parse_args(args)
   try:
     repo_root = git_common.repo_root()
   except subprocess2.CalledProcessError as e:
     stderr.write(e.stderr)
     return e.returncode
 
   # Make filename relative to the repository root, and cd to the root dir (so
   # all filenames throughout this script are relative to the root).
   filename = os.path.relpath(args.filename, repo_root)
   os.chdir(repo_root)
 
   # Normalize filename so we can compare it to other filenames git gives us.
   filename = os.path.normpath(filename)
   filename = os.path.normcase(filename)
 
+  ignored_list = list(args.ignored)
+  if not args.no_default_ignores and os.path.exists(DEFAULT_IGNORE_FILE_NAME):
+    with open(DEFAULT_IGNORE_FILE_NAME) as ignore_file:
+      ignored_list.extend(parse_ignore_file(ignore_file))
+
+  if args.ignore_file:
+    ignored_list.extend(parse_ignore_file(args.ignore_file))
+
   ignored = set()
-  for c in args.ignored:
+  for c in ignored_list:
     try:
       ignored.add(git_common.hash_one(c))
     except subprocess2.CalledProcessError as e:
-      # Custom error message (the message from git-rev-parse is inappropriate).
-      stderr.write('fatal: unknown revision \'%s\'.\n' % c)
-      return e.returncode
+      # Custom warning string (the message from git-rev-parse is inappropriate).
+      stderr.write('warning: unknown revision \'%s\'.\n' % c)
 
   return hyper_blame(ignored, filename, args.revision, out=stdout, err=stderr)
 
 
 if __name__ == '__main__':  # pragma: no cover
   with git_common.less() as less_input:
     sys.exit(main(sys.argv[1:], stdout=less_input))