Chromium Code Reviews| Index: tools/bisect-builds.py |
| diff --git a/tools/bisect-builds.py b/tools/bisect-builds.py |
| index 10ea00f5bdadffefd6c0fd1281a2a88dee88c444..2e8042fe63e1bee9896eda87fbf293caa85971c5 100755 |
| --- a/tools/bisect-builds.py |
| +++ b/tools/bisect-builds.py |
| @@ -27,8 +27,6 @@ CHANGELOG_URL = ('https://chromium.googlesource.com/chromium/src/+log/%s..%s') |
| CRREV_URL = ('https://cr-rev.appspot.com/_ah/api/crrev/v1/redirect/') |
| # DEPS file URL. |
| -DEPS_FILE_OLD = ('http://src.chromium.org/viewvc/chrome/trunk/src/' |
| - 'DEPS?revision=%d') |
| DEPS_FILE_NEW = ('https://chromium.googlesource.com/chromium/src/+/%s/DEPS') |
|
Michael Moss
2016/07/11 18:32:25
Maybe just call it DEPS_FILE now, since there is n
|
| # Blink changelogs URL. |
| @@ -898,17 +896,11 @@ def GetBlinkDEPSRevisionForChromiumRevision(self, rev): |
| if m: |
| return m.group(1) |
| - url = urllib.urlopen(DEPS_FILE_OLD % rev) |
| + url = urllib.urlopen(DEPS_FILE_NEW % GetGitHashFromSVNRevision(rev)) |
|
Michael Moss
2016/07/11 18:32:25
I'm not very familiar with this script, but I gath
|
| if url.getcode() == 200: |
| - # . doesn't match newlines without re.DOTALL, so this is safe. |
| - blink_re = re.compile(r'webkit_revision\D*(\d+)') |
| - return int(_GetBlinkRev(url, blink_re)) |
| - else: |
| - url = urllib.urlopen(DEPS_FILE_NEW % GetGitHashFromSVNRevision(rev)) |
| - if url.getcode() == 200: |
| - blink_re = re.compile(r'webkit_revision\D*\d+;\D*\d+;(\w+)') |
| - blink_git_sha = _GetBlinkRev(url, blink_re) |
| - return self.GetSVNRevisionFromGitHash(blink_git_sha, 'blink') |
| + blink_re = re.compile(r'webkit_revision\D*\d+;\D*\d+;(\w+)') |
| + blink_git_sha = _GetBlinkRev(url, blink_re) |
| + return self.GetSVNRevisionFromGitHash(blink_git_sha, 'blink') |
| raise Exception('Could not get Blink revision for Chromium rev %d' % rev) |