Commit 9ef00337 authored by prasadv@chromium.org's avatar prasadv@chromium.org

Fix issues with gathering third party repositories for bisect.

BUG=377948
NOTRY=true

Review URL: https://codereview.chromium.org/300623006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273061 0039d316-1c4b-4281-b951-d872f2087c98
parent 1504ac1c
...@@ -1429,7 +1429,8 @@ class BisectPerformanceMetrics(object): ...@@ -1429,7 +1429,8 @@ class BisectPerformanceMetrics(object):
continue continue
if (depot_data.get('recurse') and depot in depot_data.get('from')): if (depot_data.get('recurse') and depot in depot_data.get('from')):
src_dir = depot_data.get('src') or depot_data.get('src_old') src_dir = (deps_data.get(depot_data.get('src')) or
deps_data.get(depot_data.get('src_old')))
if src_dir: if src_dir:
self.depot_cwd[depot_name] = os.path.join(self.src_cwd, src_dir[4:]) self.depot_cwd[depot_name] = os.path.join(self.src_cwd, src_dir[4:])
re_results = rxp.search(deps_data.get(src_dir, '')) re_results = rxp.search(deps_data.get(src_dir, ''))
...@@ -1440,6 +1441,8 @@ class BisectPerformanceMetrics(object): ...@@ -1440,6 +1441,8 @@ class BisectPerformanceMetrics(object):
'%s' % (depot_name, depot)) '%s' % (depot_name, depot))
if not warning_text in self.warnings: if not warning_text in self.warnings:
self.warnings.append(warning_text) self.warnings.append(warning_text)
else:
results[depot_name] = None
return results return results
except ImportError: except ImportError:
deps_file_contents = ReadStringFromFile(bisect_utils.FILE_DEPS_GIT) deps_file_contents = ReadStringFromFile(bisect_utils.FILE_DEPS_GIT)
...@@ -2536,12 +2539,12 @@ class BisectPerformanceMetrics(object): ...@@ -2536,12 +2539,12 @@ class BisectPerformanceMetrics(object):
# backwards to try to match trunk revisions to bleeding_edge. # backwards to try to match trunk revisions to bleeding_edge.
self._FillInV8BleedingEdgeInfo(min_revision_data, max_revision_data) self._FillInV8BleedingEdgeInfo(min_revision_data, max_revision_data)
if (min_revision_data['external'][next_depot] == if (min_revision_data['external'].get(next_depot) ==
max_revision_data['external'][next_depot]): max_revision_data['external'].get(next_depot)):
continue continue
if (min_revision_data['external'][next_depot] and if (min_revision_data['external'].get(next_depot) and
max_revision_data['external'][next_depot]): max_revision_data['external'].get(next_depot)):
external_depot = next_depot external_depot = next_depot
break break
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment