Roll multiple files from depot_tools into luci.

appengine/third_party_local/depot_tools/git_number.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.
 
 """Usage: %prog [options] [<commitref>]*
 
 If no <commitref>'s are supplied, it defaults to HEAD.
 
 Calculates the generation number for one or more commits in a git repo.
@@ skipping 19 matching lines @@
 import sys
 import tempfile
 
 import git_common as git
 import subprocess2
 
 CHUNK_FMT = '!20sL'
 CHUNK_SIZE = struct.calcsize(CHUNK_FMT)
 DIRTY_TREES = collections.defaultdict(int)
 REF = 'refs/number/commits'
+AUTHOR_NAME = 'git-number'
+AUTHOR_EMAIL = 'chrome-infrastructure-team@google.com'
 
 # Number of bytes to use for the prefix on our internal number structure.
 # 0 is slow to deserialize. 2 creates way too much bookeeping overhead (would
 # need to reimplement cache data structures to be a bit more sophisticated than
 # dicts. 1 seems to be just right.
 PREFIX_LEN = 1
 
 # Set this to 'threads' to gather coverage data while testing.
 POOL_KIND = 'procs'
 
@@ skipping 96 matching lines @@
     with git.ScopedPool(kind=POOL_KIND) as leaf_pool:
       for item in leaf_pool.imap(leaf_map_fn, prefixes_trees):
         updater.stdin.write(item)
         inc()
 
     updater.stdin.close()
     updater.wait()
     assert updater.returncode == 0
 
     tree_id = git.run('write-tree', env=env)
-    commit_cmd = ['commit-tree', '-m', msg, '-p'] + git.hashes(REF)
+    commit_cmd = [
+        # Git user.name and/or user.email may not be configured, so specifying
+        # them explicitly. They are not used, but requried by Git.
+        '-c', 'user.name=%s' % AUTHOR_NAME,
+        '-c', 'user.email=%s' % AUTHOR_EMAIL,
+        'commit-tree',
+        '-m', msg,
+        '-p'] + git.hash_multi(REF)
     for t in targets:
       commit_cmd.extend(['-p', binascii.hexlify(t)])
     commit_cmd.append(tree_id)
     commit_hash = git.run(*commit_cmd)
     git.run('update-ref', REF, commit_hash)
   DIRTY_TREES.clear()
 
 
 def preload_tree(prefix):
   """Returns the prefix and parsed tree object for the specified prefix."""
@@ skipping 69 matching lines @@
                     help='Do not actually cache anything we calculate.')
   parser.add_option('--reset', action='store_true',
                     help='Reset the generation number cache and quit.')
   parser.add_option('-v', '--verbose', action='count', default=0,
                     help='Be verbose. Use more times for more verbosity.')
   opts, args = parser.parse_args()
 
   levels = [logging.ERROR, logging.INFO, logging.DEBUG]
   logging.basicConfig(level=levels[min(opts.verbose, len(levels) - 1)])
 
+  # 'git number' should only be used on bots.
+  if os.getenv('CHROME_HEADLESS') != '1':
+    logging.error("'git-number' is an infrastructure tool that is only "
+                  "intended to be used internally by bots. Developers should "
+                  "use the 'Cr-Commit-Position' value in the commit's message.")
+    return 1
+
+  if opts.reset:
+    clear_caches(on_disk=True)
+    return
+
   try:
-    if opts.reset:
-      clear_caches(on_disk=True)
-      return
+    targets = git.parse_commitrefs(*(args or ['HEAD']))
+  except git.BadCommitRefException as e:
+    parser.error(e)
 
-    try:
-      targets = git.parse_commitrefs(*(args or ['HEAD']))
-    except git.BadCommitRefException as e:
-      parser.error(e)
+  load_generation_numbers(targets)
+  if not opts.no_cache:
+    finalize(targets)
 
-    load_generation_numbers(targets)
-    if not opts.no_cache:
-      finalize(targets)
-
-    print '\n'.join(map(str, map(get_num, targets)))
-    return 0
-  except KeyboardInterrupt:
-    return 1
+  print '\n'.join(map(str, map(get_num, targets)))
+  return 0
 
 
 if __name__ == '__main__':  # pragma: no cover
-  sys.exit(main())
+  try:
+    sys.exit(main())
+  except KeyboardInterrupt:
+    sys.stderr.write('interrupted\n')
+    sys.exit(1)