Revert of Comment out applying patchset dependencies in apply_issue.py (patchset #2 id:20001 of https://codereview.chromium.org/1194063003/)

Reason for revert:
https://chromereviews.googleplex.com/221697013/ has landed. Re-enable applying patchset dependencies in apply_issue.py

Original issue's description:
> Comment out applying patchset dependencies in apply_issue.py
> 
> Context is in the internal chrome-infra thread here:
> https://groups.google.com/a/google.com/d/msg/chrome-infra/dNQGjNoP-Dg/XDymPAwOCXkJ
> 
> NOPRESUBMIT=true
> 
> BUG=chromium:480453
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=295800

TBR=phajdan.jr@chromium.org
BUG=chromium:480453

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296016 0039d316-1c4b-4281-b951-d872f2087c98
changes/01/332501/1
rmistry@google.com 10 years ago
parent 34fb6b15ee
commit 56445e8f9d

@ -167,27 +167,22 @@ def main():
print('No patchset specified. Using patchset %d' % options.patchset)
issues_patchsets_to_apply = [(options.issue, options.patchset)]
# Temporary comment out the below while we try to figure out what to do with
# patchset dependencies on trybots.
# TODO(rmistry): Uncomment the below after a solution is found.
# depends_on_info = obj.get_depends_on_patchset(options.issue,
# options.patchset)
# while depends_on_info:
# depends_on_issue = int(depends_on_info['issue'])
# depends_on_patchset = int(depends_on_info['patchset'])
# try:
# depends_on_info = obj.get_depends_on_patchset(depends_on_issue,
# depends_on_patchset)
# issues_patchsets_to_apply.insert(0, (depends_on_issue,
# depends_on_patchset))
# except urllib2.HTTPError:
# print ('The patchset that was marked as a dependency no longer '
# 'exists: %s/%d/#ps%d' % (
# options.server, depends_on_issue, depends_on_patchset))
# print 'Therefore it is likely that this patch will not apply cleanly.'
# print
# depends_on_info = None
depends_on_info = obj.get_depends_on_patchset(options.issue, options.patchset)
while depends_on_info:
depends_on_issue = int(depends_on_info['issue'])
depends_on_patchset = int(depends_on_info['patchset'])
try:
depends_on_info = obj.get_depends_on_patchset(depends_on_issue,
depends_on_patchset)
issues_patchsets_to_apply.insert(0, (depends_on_issue,
depends_on_patchset))
except urllib2.HTTPError:
print ('The patchset that was marked as a dependency no longer '
'exists: %s/%d/#ps%d' % (
options.server, depends_on_issue, depends_on_patchset))
print 'Therefore it is likely that this patch will not apply cleanly.'
print
depends_on_info = None
num_issues_patchsets_to_apply = len(issues_patchsets_to_apply)
if num_issues_patchsets_to_apply > 1:

Loading…
Cancel
Save