Adding ability to bisect recipe to bisect into dependency repos.

scripts/slave/recipe_modules/auto_bisect/bisector.py

Index: scripts/slave/recipe_modules/auto_bisect/bisector.py
diff --git a/scripts/slave/recipe_modules/auto_bisect/bisector.py b/scripts/slave/recipe_modules/auto_bisect/bisector.py
index 372f473a69fa746194e5d49ac253a544489f4bdf..7325303ac2a8eb077656974e3bde977d138d4cba 100644
--- a/scripts/slave/recipe_modules/auto_bisect/bisector.py
+++ b/scripts/slave/recipe_modules/auto_bisect/bisector.py
@@ -2,7 +2,20 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import re
+
 from . import bisect_results
+from . import depot_config
+
+_DEPS_SHA_PATCH = """
+diff --git DEPS.sha DEPS.sha
+new file mode 100644
+--- /dev/null
++++ DEPS.sha
+@@ -0,0 +1 @@
++%(deps_sha)s
+"""
+
 
 class Bisector(object):
   """This class abstracts an ongoing bisect (or n-sect) job."""
@@ -18,7 +31,7 @@ class Bisector(object):
     self.bisect_config = bisect_config
     self.revision_class = revision_class
 
-    # Test-only properties. 
+    # Test-only properties.
     # TODO: Replace these with proper mod_test_data
     self.dummy_regression_confidence = bisect_config.get(
         'dummy_regression_confidence', None)
@@ -61,23 +74,182 @@ class Bisector(object):
     a, b = sorted(map(int, [a, b]))
     return xrange(a + 1, b)
 
-  def _expand_revision_range(self, revision_to_expand=None):
-    """This method populates the revisions attribute.
+  def make_deps_sha_file(self, deps_sha):
+    """Make a diff patch that creates DEPS.sha.
 
-    After running method self.revisions should contain all the revisions
-    between the good and bad revisions. If given a `revision_to_expand`, it'll
-    insert the revisions from the external repos in the appropriate place.
+    Args:
+      deps_sha (str): Hash of the diff that patches DEPS.
+
+    Returns:
+      A string containing a git diff.
+    """
+    return _DEPS_SHA_PATCH % {'deps_sha': deps_sha}
+
+  def _git_intern_file(self, file_contents, cwd, commit_hash):
+    """Writes a file to the git database and produces its git hash.
 
     Args:
-      revision_to_expand: A revision where there is a deps change.
+      file_contents (str): The contents of the file to be hashed and interned.
+      cwd (recipe_config_types.Path): Path to the checkout whose repository the
+        file is to be written to.
+      commit_hash (str): An identifier for the step.
+    Returns:
+      A string containing the hash of the interned object.
+    """
+    cmd = 'hash-object -t blob -w --stdin'.split(' ')
+    stdin = self.api.m.raw_io.input(file_contents)
+    stdout = self.api.m.raw_io.output()
+    step_name = 'Hashing modified DEPS file with revision ' + commit_hash
+    step_result = self.api.m.git(*cmd, cwd=cwd, stdin=stdin, stdout=stdout,
+                                 name=step_name)
+    hash_string = step_result.stdout.splitlines()[0]
+    if hash_string:
+        int(hash_string, 16)
+        return hash_string
+    raise ValueError('Git did not output a valid hash for the interned file.')
+
+  def _gen_diff_patch(self, git_object_a, git_object_b, src_alias, dst_alias,
+                      cwd, deps_rev):
+    """Produces a git diff patch.
+
+    Args:
+      git_object_a, git_object_b (str): Tree-ish git object identifiers.
+      src_alias, dst_alias (str): labels to replace the tree-ish identifiers on
+        the resulting diff patch.
+      cwd (recipe_config_types.Path): Path to the checkout whose repo contains
+        the objects to be compared.
+      deps_rev (str): Deps revision to identify the patch generating step.
+
+    Returns:
+      A string containing the diff patch as produced by the 'git diff' command.
+    """
+    cmd = 'diff %s %s --src-prefix=IAMSRC: --dst-prefix=IAMDST:'
+    cmd %= (git_object_a, git_object_b)
+    cmd = cmd.split(' ')
+    stdout = self.api.m.raw_io.output()
+    step_name = 'Generating patch for %s to %s' % (git_object_a, deps_rev)
+    step_result = self.api.m.git(*cmd, cwd=cwd, stdout=stdout, name=step_name)
+    patch_text = step_result.stdout
+    src_string = 'IAMSRC:' + git_object_a
+    dst_string = 'IAMDST:' + git_object_b
+    patch_text = patch_text.replace(src_string, src_alias)
+    patch_text = patch_text.replace(dst_string, dst_alias)
+    return patch_text
+
+  def make_deps_patch(self, base_revision, base_file_contents,
+                      depot, new_commit_hash):
+    """Make a diff patch that updates a specific dependency revision.
+
+    Args:
+      base_revision (RevisionState): The revision for which the DEPS file is to
+        be patched.
+      base_file_contents (str): The contents of the original DEPS file.
+      depot (str): The dependency to modify.
+      new_commit_hash (str): The revision to put in place of the old one.
+
+    Returns:
+      A pair containing the git diff patch that updates DEPS, and the
+      full text of the modified DEPS file, both as strings.
+    """
+    original_contents = str(base_file_contents)
+    patched_contents = str(original_contents)
+
+    # Modify DEPS
+    deps_var = depot['deps_var']
+    deps_item_regexp = re.compile(
+        r'(?<=["\']%s["\']: ["\'])([a-fA-F0-9]+)(?=["\'])' % deps_var,
+        re.MULTILINE)
+    if not re.search(deps_item_regexp, original_contents):
+      raise ValueError('DEPS file does not contain entry for ' + deps_var)
+    re.sub(deps_item_regexp, new_commit_hash, patched_contents)
+
+    interned_deps_hash = self._git_intern_file(patched_contents,
+                                               self.api.m.path['checkout'],
+                                               new_commit_hash)
+    patch_text = self._gen_diff_patch(base_revision.commit_hash + ':DEPS',
+                                      interned_deps_hash, 'a/DEPS', 'b/DEPS',
+                                      cwd=self.api.m.path['checkout'],
+                                      deps_rev=new_commit_hash)
+    return patch_text, patched_contents
+
+  def _get_rev_range_for_depot(self, depot_name, min_rev, max_rev,
+                               base_revision):
+    results = []
+    depot = depot_config.DEPOT_DEPS_NAME[depot_name]
+    depot_path = self.api.m.path['checkout'].join(depot['src'])
+    step_name = ('Expanding revision range for revision %s on depot %s'
+                 % (max_rev, depot_name))
+    step_result = self.api.m.git('log', '--format==%H', min_rev, max_rev,
+                                 stdout=self.api.m.raw_io.output(),
+                                 cwd=depot_path, name=step_name)
+    # We skip the first revision in the list as it is max_rev
+    new_revisions = step_result.stdout.splitlines()[1:]
+    for revision in new_revisions:
+      results.append(self.revision_class(None, self,
+                                         base_revision=base_revision,
+                                         deps_revision=revision,
+                                         dependency_depot_name=depot_name,
+                                         depot=depot))
+    results.reverse()
+    return results
+
+  def _expand_revision_range(self):
+    """Populates the revisions attribute.
+
+    After running this method, self.revisions should contain all the chromium
+    revisions between the good and bad revisions.
     """
-    if revision_to_expand is not None:
-      # TODO: Implement this path (insert revisions when deps change)
-      raise NotImplementedError()
     rev_list = self._commit_pos_range(
         self.good_rev.commit_pos, self.bad_rev.commit_pos)
     intermediate_revs = [self.revision_class(str(x), self) for x in rev_list]
     self.revisions = [self.good_rev] + intermediate_revs + [self.bad_rev]
+    self._update_revision_list_indexes()
+
+  def _expand_deps_revisions(self, revision_to_expand):
+    """Populates the revisions attribute with additional deps revisions.
+
+    Inserts the revisions from the external repos in the appropriate place.
+
+    Args:
+      revision_to_expand: A revision where there is a deps change.
+
+    Returns:
+      A boolean indicating whether any revisions were inserted.
+    """
+    # TODO(robertocn): Review variable names in this function. They are
+    # potentially confusing.
+    assert revision_to_expand is not None
+    try:
+      min_revision = revision_to_expand.previous_revision
+      max_revision = revision_to_expand
+      min_revision.read_deps()  # Parses DEPS file and sets the `.deps` property.

[RobertoCN, 2015/03/03 21:45:29]

I am aware this line is too long. Getting it fixed.

+      max_revision.read_deps()  # Ditto.
+      for depot_name in depot_config.DEPOT_DEPS_NAME.keys():
+        if depot_name in min_revision.deps and depot_name in max_revision.deps:
+          dep_revision_min = min_revision.deps[depot_name]
+          dep_revision_max = max_revision.deps[depot_name]
+          if (dep_revision_min and dep_revision_max and
+              dep_revision_min != dep_revision_max):
+            rev_list = self._get_rev_range_for_depot(depot_name,
+                                                     dep_revision_min,
+                                                     dep_revision_max,
+                                                     min_revision)
+            new_revisions = self.revisions[:max_revision.list_index]
+            new_revisions += rev_list
+            new_revisions += self.revisions[max_revision.list_index:]
+            self.revisions = new_revisions
+            self._update_revision_list_indexes()
+            return True
+    except RuntimeError:
+      warning_text = ('Could not expand dependency revisions for ' +
+                      revision_to_expand.revision_string)
+      if warning_text not in self.bisector.warnings:
+        self.bisector.warnings.append(warning_text)
+    return False
+
+
+  def _update_revision_list_indexes(self):
+    """Sets list_index, next and previous properties for each revision."""
     for i, rev in enumerate(self.revisions):
       rev.list_index = i
     for i in xrange(len(self.revisions)):
@@ -89,10 +261,10 @@ class Bisector(object):
   def check_improvement_direction(self):
     """Verifies that the change from 'good' to 'bad' is in the right direction.
 
-    The change between the test results obtained for the given 'good' and 'bad'
-    revisions is expected to be considered a regression. The `improvement_direction`
-    attribute is positive if a larger number is considered better, and negative if a
-    smaller number is considered better.
+    The change between the test results obtained for the given 'good' and
+    'bad' revisions is expected to be considered a regression. The
+    `improvement_direction` attribute is positive if a larger number is
+    considered better, and negative if a smaller number is considered better.
     """
     direction = self.improvement_direction
     if direction is None:
@@ -184,15 +356,15 @@ class Bisector(object):
     if (revision.bad and revision.previous_revision and
         revision.previous_revision.good):
       if revision.deps_change():
-        self._expand_revision_range(revision)
-        return False
+        more_revisions = self._expand_deps_revisions(revision)
+        return not more_revisions
       self.culprit = revision
       return True
     if (revision.good and revision.next_revision and
         revision.next_revision.bad):
       if revision.next_revision.deps_change():
-        self._expand_revision_range(revision.next_revision)
-        return False
+        more_revisions = self._expand_deps_revisions(revision.next_revision)
+        return not more_revisions
       self.culprit = revision.next_revision
       return True
     return False