Make CollateRevisionHistory handle git and svn at the same time.

infra/services/lkgr_finder/lkgr_lib.py

 # Copyright (c) 2014 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.
 
 """A collection of helpers to make lkgr_finder's life easier."""
 
 
 import ast
 import datetime
 import json
@@ skipping 103 matching lines @@
   def check_rev(self, r):  # pragma: no cover
     if r is NOREV:
       return False
     return bool(self._GIT_HASH_RE.match(r))
 
   def _cache(self, *revs):  # pragma: no cover
     nums = map(int, self._git.number(*revs))
     self._number_cache.update(dict(zip(revs, nums)))
 
   def keyfunc(self, r):  # pragma: no cover
+    if r is NOREV:

[szager1, 2014/08/20 19:09:55]

agable and I can't understand why this is necessary for your project, but it
works fine as is for other projects.  Can you please send the stack trace you
got before you made this change?  This is a public bug, so please send the stack
trace via private email.

[zty, 2014/08/20 19:55:46]

Acknowledged.

+      return -1
     if not self.check_rev(r):
       raise ValueError('%s is not a Git revision.' % r)
     k = self._number_cache.get(r)
     if k is None:
       self._cache(r)
       k = self._number_cache.get(r)
     if k is None:
       raise LookupError('%s could not be found in the Git repo.' % r)
     return k
 
@@ skipping 183 matching lines @@
         continue
       LOGGER.debug('Collating builder %s', builder)
       builder_history = []
       for build_num in sorted(builder_data.keys(), key=int):
         this_build_data = builder_data[build_num]
         txt = this_build_data.get('text', [])
         if 'exception' in txt and 'slave' in txt and 'lost' in txt:
           continue
         revision = None
         for prop in this_build_data.get('properties', []):
-          if prop[0] == 'got_revision':
+          if type(repo) is SvnWrapper and prop[0] == 'got_revision':
+            revision = prop[1]
+            break
+          if type(repo) is GitWrapper and prop[0] == 'got_revision_git':
+            revision = prop[1]
+            break
+          # If repo is a project that depends on 'src'
+          if prop[0] == 'got_src_revision':
             revision = prop[1]
             break
         if not revision:
           revision = this_build_data.get(
               'sourceStamp', {}).get('revision', None)
         if not revision:
           continue
         revisions.add(str(revision))
         status = EvaluateBuildData(this_build_data)
         builder_history.append((revision, status, build_num))
@@ skipping 258 matching lines @@
 
   try:
     config_file = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                'config', '%s_cfg.pyl' % project)
     config.update(ast.literal_eval(open(config_file).read()))
   except (IOError, ValueError):
     LOGGER.fatal('Could not read project configuration file. Does it exist?')
     raise
 
   return config