Parse Git hash for dependency repositories from DEPS file.

tools/bisect-perf-regression.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 1371 matching lines @@
 
   def IsDownloadable(self, depot):
     """Checks if build can be downloaded based on target platform and depot."""
     if (self.opts.target_platform in ['chromium', 'android'] and
         self.opts.gs_bucket):
       return (depot == 'chromium' or
               'chromium' in DEPOT_DEPS_NAME[depot]['from'] or
               'v8' in DEPOT_DEPS_NAME[depot]['from'])
     return False
 
+  def UpdateDepsContents(self, deps_contents, depot, git_revision, deps_key):
+    """Returns modified version of DEPS file contents.
+
+    Args:
+      deps_contents: DEPS file content.
+      depot: Current depot being bisected.
+      git_revision: A git hash to be updated in DEPS.
+      deps_key: Key in vars section of DEPS file to be searched.
+
+    Returns:
+      Updated DEPS content as string if deps key is found, otherwise None.
+    """
+    # Check whether the depot and revision pattern in DEPS file vars
+    # e.g. for webkit the format is "webkit_revision": "12345".
+    deps_revision = re.compile(r'(?<="%s": ")([0-9]+)(?=")' % deps_key,
+                               re.MULTILINE)
+    new_data = None

[qyearsley, 2014/09/04 22:24:34]

"data" is a pretty non-descriptive word to use in general, and often there are
better more specific words, such as "text" or "contents".

+    if re.search(deps_revision, deps_contents):
+      svn_revision = self.source_control.SVNFindRev(
+          git_revision, self._GetDepotDirectory(depot))
+      if not svn_revision:
+        print 'Could not determine SVN revision for %s' % git_revision
+        return None
+      # Update the revision information for the given depot
+      new_data = re.sub(deps_revision, str(svn_revision), deps_contents)
+    else:
+      # Check whether the depot and revision pattern in DEPS file vars
+      # e.g. for webkit the format is "webkit_revision": "559a6d4ab7a84c539..".
+      deps_revision = re.compile(
+          r'(?<=["\']%s["\']: ["\'])([a-fA-F0-9]{40})(?=["\'])' % deps_key,
+          re.MULTILINE)
+      if re.search(deps_revision, deps_contents):
+        new_data = re.sub(deps_revision, git_revision, deps_contents)
+    if new_data:

[qyearsley, 2014/09/04 22:24:34]

This could be changed to

  if new_data and depot == 'v8_bleeding_edge':

+      # For v8_bleeding_edge revisions change V8 branch in order
+      # to fetch bleeding edge revision.
+      if depot == 'v8_bleeding_edge':
+        new_data = _UpdateV8Branch(new_data)
+        if not new_data:
+          return None
+    return new_data
+
   def UpdateDeps(self, revision, depot, deps_file):
     """Updates DEPS file with new revision of dependency repository.
 
     This method search DEPS for a particular pattern in which depot revision
     is specified (e.g "webkit_revision": "123456"). If a match is found then
     it resolves the given git hash to SVN revision and replace it in DEPS file.
 
     Args:
       revision: A git hash revision of the dependency repository.
       depot: Current depot being bisected.
@@ skipping 14 matching lines @@
     # Hack for Angle repository. In the DEPS file, "vars" dictionary variable
     # contains "angle_revision" key that holds git hash instead of SVN revision.
     # And sometime "angle_revision" key is not specified in "vars" variable.
     # In such cases check, "deps" dictionary variable that matches
     # angle.git@[a-fA-F0-9]{40}$ and replace git hash.
     if depot == 'angle':
       return _UpdateDEPSForAngle(revision, depot, deps_file)
 
     try:
       deps_contents = ReadStringFromFile(deps_file)
-      # Check whether the depot and revision pattern in DEPS file vars
-      # e.g. for webkit the format is "webkit_revision": "12345".
-      deps_revision = re.compile(r'(?<="%s": ")([0-9]+)(?=")' % deps_var,
-                                 re.MULTILINE)
-      match = re.search(deps_revision, deps_contents)
-      if match:
-        svn_revision = self.source_control.SVNFindRev(
-            revision, self._GetDepotDirectory(depot))
-        if not svn_revision:
-          print 'Could not determine SVN revision for %s' % revision
-          return False
-        # Update the revision information for the given depot
-        new_data = re.sub(deps_revision, str(svn_revision), deps_contents)
-
-        # For v8_bleeding_edge revisions change V8 branch in order
-        # to fetch bleeding edge revision.
-        if depot == 'v8_bleeding_edge':
-          new_data = _UpdateV8Branch(new_data)
-          if not new_data:
-            return False
-        # Write changes to DEPS file
-        WriteStringToFile(new_data, deps_file)
+      updated_deps_content = self.UpdateDepsContents(
+          deps_contents, depot, revision, deps_var)
+      # Write changes to DEPS file
+      if updated_deps_content:
+        WriteStringToFile(updated_deps_content, deps_file)
         return True
     except IOError, e:
       print 'Something went wrong while updating DEPS file. [%s]' % e
     return False
 
   def CreateDEPSPatch(self, depot, revision):
     """Modifies DEPS and returns diff as text.
 
     Args:
       depot: Current depot being bisected.
@@ skipping 1003 matching lines @@
           if min_revision_data['passed'] == '?':
             next_revision_index = min_revision
           elif max_revision_data['passed'] == '?':
             next_revision_index = max_revision
           elif current_depot in ['android-chrome', 'cros', 'chromium', 'v8']:
             previous_revision = revision_list[min_revision]
             # If there were changes to any of the external libraries we track,
             # should bisect the changes there as well.
             external_depot = self._FindNextDepotToBisect(
                 current_depot, min_revision_data, max_revision_data)
-
             # If there was no change in any of the external depots, the search
             # is over.
             if not external_depot:
               if current_depot == 'v8':
                 self.warnings.append('Unfortunately, V8 bisection couldn\'t '
                     'continue any further. The script can only bisect into '
                     'V8\'s bleeding_edge repository if both the current and '
                     'previous revisions in trunk map directly to revisions in '
                     'bleeding_edge.')
               break
@@ skipping 877 matching lines @@
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())