Revert "clacheck/clacheck.py: Make trivial commits more visible"

This reverts commit 067d7fbb4ee01c054c37653f6f6ab50a9e9db3ce.

diff --git a/clacheck/clacheck.py b/clacheck/clacheck.py
index 8cadec2e65f088a66a2b883d42fb5dc89d82f975..2dbb6fd51e90eb446257a228c510320d71681d3c 100755 (executable)
--- a/clacheck/clacheck.py
+++ b/clacheck/clacheck.py
@@ -13,17 +13,14 @@ cgitb.enable()
 env = os.environ
 textplain = "Content-type: text/plain\n\n"
 what = env.get('HTTP_X_GITHUB_EVENT', 'ping')
-From_re = re.compile("^From:.*<(.*)>")
-Trivial_re = re.compile("^\s*CLA\s*:\s*TRIVIAL", re.IGNORECASE)
-URLpattern_re = re.compile("https?://([^/]*)/(.*)")
+From = re.compile("^From:.*<(.*)>")
+Trivial = re.compile("^\s*CLA\s*:\s*TRIVIAL", re.IGNORECASE)
+URLpattern = re.compile("https?://([^/]*)/(.*)")
+SUCCESS = 'success'
+FAILURE = 'failure'
 CLAFILE = "/var/cache/openssl/checkouts/omc/cladb.txt" #<EDIT>
 
-# states
-SUCCESS = 'success'             # CLA is fine and no 'CLA: trivial' in sight
-FAILURE = 'failure'             # No CLA or 'CLA: trivial' found
-
 CLA_LABEL = 'hold: cla required'
-TRIVIAL_LABEL = 'cla: trivial'
 
 null_actions = (
         'assigned', 'unassigned', 'labeled', 'unlabeled', 'closed',
@@ -41,66 +38,35 @@ statusbody = """
 """
 
 def url_split(url):
-    m = URLpattern_re.match(url)
+    m = URLpattern.match(url)
     return (m.group(1), '/' + m.group(2))
 
-# Global connection data, all set up by start_conn
-token = ""
-conn = None
-
-def start_conn(pr):
-    host,url = url_split(pr['_links']['statuses']['href'])
-
-    global conn
-    global token
-    if conn != None:
-        return                  # Connection already opened
-
+def update_status(pr, state, description):
+    d = { 'state': state, 'description': description }
     token = open('../ghpass.txt').read().strip() #<EDIT> password file
-    conn = httplib.HTTPSConnection(host)
-
-def update_conn(pr, cmd, url, data):
     headers = {
             'Authorization': 'token ' + token,
-            'User-Agent': 'openssl-machine',
+            'User-Agent': 'richsalz', #<EDIT> some other name
             'Content-Type': 'application/json; charset=utf-8',
             'Accept': 'application/json',
             }
-    conn.request(cmd, url, data, headers)
-    return conn.getresponse().read()
-
-def update_labels(pr, labels):
-    start_conn(pr)
-
-    host,url = url_split(pr['issue_url'])
-
-    # remove all our known labels if none are given
-    if len(labels) == 0:
-        for label in [ CLA_LABEL, TRIVIAL_LABEL ]:
-            print 'Delete label', label
-            reply = update_conn('DELETE',
-                                url + '/labels/' + urllib.quote(label),
-                                None)
-            print "--\n", reply
-
-    # add any label that is given
-    if len(labels) > 0:
-        print 'Add labels', ', '.join(labels)
-        formatted_labels = [ '"{}"'.format(label) for label in labels ]
-        reply = update_conn('POST',
-                            url + '/labels',
-                            '[ {} ]'.format(','.join(formatted_labels)))
-        print "--\n", reply
-
-def update_status(pr, state, description):
-    start_conn(pr)
-
-    d = { 'state': state, 'description': description }
-
     host,url = url_split(pr['_links']['statuses']['href'])
     print textplain, "CLA check", state, description
-    update_conn(pr, 'POST', url, statusbody % d)
+    conn = httplib.HTTPSConnection(host)
+    conn.request('POST', url, statusbody % d, headers)
+    conn.getresponse().read()
     host,url = url_split(pr['issue_url'])
+    if state == SUCCESS:
+        url = url + '/labels/' + urllib.quote(CLA_LABEL)
+        print 'Delete', url
+        conn.request('DELETE', url, None, headers)
+    elif state == FAILURE:
+        url = url + '/labels'
+        print 'Add need-cla', url
+        conn.set_debuglevel(99)
+        conn.request('POST', url, '[ "{}" ]'.format(CLA_LABEL), headers)
+    reply = conn.getresponse().read()
+    print "--\n", reply
 
 def have_cla(name):
     """Is |name| in the cladb?"""
@@ -130,46 +96,18 @@ def process():
     if patch_url is None:
         print textplain, "patch_url missing"
         return
-
-    # Read through the patch set, which is formatted like 'git format-patch'
-    missing = {}                # collects names for missing CLAs
-    tmpmissing = {}             # collects names for missing CLAs in one commit
-    any_trivial = 0
-
+    missing = {}
     for line in urllib.urlopen(patch_url):
-        # From: marks the beginning of a commit well enough
-        m = From_re.match(line)
+        m = Trivial.match(line)
         if m:
-            # Update missing with the names from the previous commit
-            missing.update(tmpmissing);
-            tmpmissing = {}
-
-            if not have_cla(m.group(1)):
-                tmpmissing[m.group(1)] = 1
-
-        # CLA: trivial clears the current collection of missing CLAs
-        m = Trivial_re.match(line)
-        if m:
-            tmpmissing = {}
-            # If there was ANY CLA:trivial, we label it as such
-            any_trivial = 1
-
-    # Update missing with the names from the last commit
-    missing.update(tmpmissing);
-
-    # Clear all known labels
-    update_labels(pr, [])
-
-    # Set status
+            update_status(pr, SUCCESS, "Trivial")
+            return
+        m = From.match(line)
+        if m and not have_cla(m.group(1)):
+            missing[m.group(1)] = 1
     if len(missing) == 0:
-        update_status(pr, SUCCESS, 'CLA on file or all trivial commits')
+        update_status(pr, SUCCESS, 'CLA on file')
     else:
         update_status(pr, FAILURE, "CLA missing: " + str(missing.keys()))
-        # add the [hold: cla needed] label
-        update_labels(pr, [ CLA_LABEL ])
-
-    # add the [cla: trivial] label if any trivial commit was found
-    if any_trivial:
-        update_labels(pr, [ TRIVIAL_LABEL ])
 
 process()