diff options
| author | prasadv <prasadv@chromium.org> | 2014-11-11 16:07:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-12 00:08:04 +0000 |
| commit | 21b0b42f26a16e419bb9dab3b1be73f70e5a1d26 (patch) | |
| tree | 385a3e0ed4a35fd7d1e309292d1fee87082c8799 /tools/auto_bisect | |
| parent | 1407104ca80f244ac5b42caca7cca895a23b0b42 (diff) | |
| download | chromium_src-21b0b42f26a16e419bb9dab3b1be73f70e5a1d26.zip chromium_src-21b0b42f26a16e419bb9dab3b1be73f70e5a1d26.tar.gz chromium_src-21b0b42f26a16e419bb9dab3b1be73f70e5a1d26.tar.bz2 | |
Fix bisect to process angle repo
BUG=430558
NOTRY=true
Review URL: https://codereview.chromium.org/694623003
Cr-Commit-Position: refs/heads/master@{#303755}
Diffstat (limited to 'tools/auto_bisect')
| -rwxr-xr-x | tools/auto_bisect/bisect_perf_regression.py | 2 | ||||
| -rw-r--r-- | tools/auto_bisect/source_control.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/auto_bisect/bisect_perf_regression.py b/tools/auto_bisect/bisect_perf_regression.py index 7db11b4..8af38d1 100755 --- a/tools/auto_bisect/bisect_perf_regression.py +++ b/tools/auto_bisect/bisect_perf_regression.py @@ -419,7 +419,7 @@ def _UpdateDEPSForAngle(revision, depot, deps_file): # e.g. "angle_revision": "fa63e947cb3eccf463648d21a05d5002c9b8adfa". angle_rev_pattern = re.compile(r'(?<="%s": ")([a-fA-F0-9]{40})(?=")' % deps_var, re.MULTILINE) - match = re.search(angle_rev_pattern % deps_var, deps_contents) + match = re.search(angle_rev_pattern, deps_contents) if match: # Update the revision information for the given depot new_data = re.sub(angle_rev_pattern, revision, deps_contents) diff --git a/tools/auto_bisect/source_control.py b/tools/auto_bisect/source_control.py index e1d7dad..05798ad 100644 --- a/tools/auto_bisect/source_control.py +++ b/tools/auto_bisect/source_control.py @@ -137,6 +137,11 @@ def GetCommitPosition(git_revision, cwd=None): Returns: Git commit position as integer or None. """ + # Angle repository is pure git based, unlike other repositories it doesn't + # have commit position. + if cwd and 'angle' in cwd: + return None + cmd = ['footers', '--position-num', git_revision] output = bisect_utils.CheckRunGit(cmd, cwd) commit_position = output.strip() |