Skip commits that don't generate a patch + fixes to get export working

third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import base64
 import json
 import httplib2
 import logging
 
 _log = logging.getLogger(__name__)
@@ skipping 18 matching lines @@
 
         API doc: https://developer.github.com/v3/pulls/#create-a-pull-request
 
         Returns:
             A raw response object if successful, None if not.
         """
         assert local_branch_name
         assert desc_title
         assert body
 
-        pr_branch_name = '{}:{}'.format(self.user, local_branch_name)
+        pr_branch_name = local_branch_name

[qyearsley, 2016/12/02 00:38:46]

Why not just rename the argument to pr_branch_name, or use local_branch_name
directly below?

[jeffcarp, 2016/12/02 23:55:17]

Oops, left that in there from deleting some other code.

 
         # TODO(jeffcarp): CC foolip and qyearsley on all PRs for now
         # TODO(jeffcarp): add HTTP to Host and use that here
         conn = httplib2.Http()
         headers = {
             "Accept": "application/vnd.github.v3+json",
             "Authorization": "Basic " + self.auth_token()
         }
         body = {
             "title": desc_title,
             "body": body,
             "head": pr_branch_name,
             "base": 'master',
+            # TODO(jeffcarp): it looks like this is not being added
             "labels": [EXPORT_LABEL]
         }
         resp, content = conn.request("https://api.github.com/repos/w3c/web-platform-tests/pulls",
                                      "POST", body=json.JSONEncoder().encode(body), headers=headers)
         _log.info("GitHub response: %s", content)
         if resp["status"] != "201":
             return None
         return json.loads(content)
 
     def in_flight_pull_requests(self):
         url_encoded_label = EXPORT_LABEL.replace(' ', '%20')
-        path = '/search/issues?q=repo:w3c/web-platform-tests%20is:open%20type:pr%20labels:{}'.format(url_encoded_label)
+        path = '/search/issues?q=repo:w3c/web-platform-tests%20is:open%20type:pr%20label:{}'.format(url_encoded_label)

[qyearsley, 2016/12/02 00:38:46]

For URL-encoding query strings, you can also use urllib.urlencode:

  >>> import urllib
  >>> urllib.urlencode({'q': 'foo bar<>'})
  'q=foo+bar%3C%3E'

[jeffcarp, 2016/12/02 23:55:17]

Sounds good. At the moment the label we're using is `chromium-export`, which
shouldn't need to be urlencoded altogether, so I'm going to remove the line
above.

         response, content = self.request(path)
         if response['status'] == '200':
             data = json.loads(content)
             return data['items']
         else:
             raise Exception('Non-200 status code (%s): %s' % (response['status'], content))
 
-    def request(self, path, body=None):
+    def request(self, path, body=None, method='GET'):
         assert path.startswith('/')
 
-        # Not used yet since only hitting public API
-        # headers = {
-        #     "Accept": "application/vnd.github.v3+json",
-        #     "Authorization": "Basic " + self.auth_token()
-        # }
+        headers = {
+            "Accept": "application/vnd.github.v3+json",
+            "Authorization": "Basic " + self.auth_token()
+        }
 
         if body:
             json_body = json.dumps(body)
         else:
             json_body = None
 
         conn = httplib2.Http()
-        return conn.request(API_BASE + path, body=json_body)
+        return conn.request(API_BASE + path, method, body=json_body, headers=headers)
 
     def merge_pull_request(self, pull_request_number):
         path = '/repos/w3c/web-platform-tests/pulls/%d/merge' % pull_request_number
         body = {}
-        response, content = self.request(path, body)
+        response, content = self.request(path, body=body, method='PUT')
 
         if response['status'] == '200':
             return json.loads(content)
         else:
             raise Exception('PR could not be merged: %d' % pull_request_number)