Android: extracts "repo_utils.py" from flakiness_dashboard_results_uploader.py.

build/android/pylib/utils/flakiness_dashboard_results_uploader.py

 # 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.
 
 """Uploads the results to the flakiness dashboard server."""
 
 import logging
 import os
 import shutil
 import subprocess
@@ skipping 14 matching lines @@
                                  os.pardir, os.pardir, os.pardir, os.pardir,
                                  os.pardir, os.pardir, os.pardir,
                                  'Tools', 'Scripts')))
 
 from webkitpy.common.system import executive, filesystem
 from webkitpy.layout_tests.layout_package import json_results_generator
 
 #TODO(craigdh): pylib/utils/ should not depend on pylib/.
 from pylib import cmd_helper
 from pylib import constants
 

[frankf, 2013/04/23 19:06:47]

no blank line

+from pylib.utils import repo_utils
+
 
 # The JSONResultsGenerator gets the filesystem.join operation from the Port
 # object. Creating a Port object requires specifying information that only
 # makes sense for running WebKit layout tests, so we provide a dummy object
 # that contains the fields required by the generator.
 class PortDummy(object):
   def __init__(self):
     self._executive = executive.Executive()
     self._filesystem = filesystem.FileSystem()
 
@@ skipping 38 matching lines @@
       Args:
         in_directory: The directory path to be tested.
       """
       if os.path.exists(os.path.join(in_directory, '.git')):
         return True
       parent = os.path.dirname(in_directory)
       if parent == constants.CHROME_DIR or parent == in_directory:
         return False
       return _is_git_directory(parent)
 
-    def _get_git_revision(in_directory):
-      """Returns the git hash tag for the given directory.
-
-      Args:
-        in_directory: The directory where git is to be run.
-      """
-      command_line = ['git', 'log', '-1', '--pretty=format:%H']
-      output = cmd_helper.GetCmdOutput(command_line, cwd=in_directory)
-      return output[0:40]
-
     in_directory = os.path.join(constants.CHROME_DIR, in_directory)
 
     if not os.path.exists(os.path.join(in_directory, '.svn')):
       if _is_git_directory(in_directory):
-        return _get_git_revision(in_directory)
+        return repo_utils.GetGitHeadSHA1(in_directory)
       else:
         return ''
 
     output = cmd_helper.GetCmdOutput(['svn', 'info', '--xml'], cwd=in_directory)
     try:
       dom = xml.dom.minidom.parseString(output)
       return dom.getElementsByTagName('entry')[0].getAttribute('revision')
     except xml.parsers.expat.ExpatError:
       return ''
     return ''
@@ skipping 87 matching lines @@
   """Reports test results to the flakiness dashboard for Chrome for Android.
 
   Args:
     results: test results.
     flakiness_dashboard_server: the server to upload the results to.
     test_type: the type of the tests (as displayed by the flakiness dashboard).
   """
   uploader = ResultsUploader(test_type)
   uploader.AddResults(results)
   uploader.Upload(flakiness_dashboard_server)