From 56445e8f9d43b33642202e97b3d40c51ef68c293 Mon Sep 17 00:00:00 2001 From: "rmistry@google.com" Date: Wed, 15 Jul 2015 12:04:42 +0000 Subject: [PATCH] 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 --- apply_issue.py | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/apply_issue.py b/apply_issue.py index aa696d2848..ba389878fb 100755 --- a/apply_issue.py +++ b/apply_issue.py @@ -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: