Merge pull request #24 from kennytm/rollup-never

Support rollup=never

Author: pietroalbini

homu/html/queue.html

@@ -19,8 +19,8 @@
             .pending { background-color: #F0DE57; }
             .approved { background-color: #85DB7B; }
 
-            .yes { color: green; }
-            .no { color: red; }
+            .yes, .rollup_always { color: green; }
+            .no, .rollup_never { color: red; }
 
             .sorting_asc:after { content: " ▲"; }
             .sorting_desc:after { content: " ▼"; }
@@ -86,6 +86,7 @@ <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_
                     <th>Assignee</th>
                     <th>Approved by</th>
                     <th>Priority</th>
+                    <th>Rollup</th>
                 </tr>
             </thead>
 
@@ -111,6 +112,7 @@ <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_
                     <td>{{state.assignee}}</td>
                     <td>{{state.approved_by}}</td>
                     <td>{{state.priority}}</td>
+                    <td class="rollup_{{state.rollup}}">{{state.rollup}}</td>
                 </tr>
                 {% endfor %}
             </tbody>

homu/main.py

@@ -41,6 +41,14 @@
 
 global_cfg = {}
 
+WORDS_TO_ROLLUP = {
+    'rollup-': 0,
+    'rollup': 1,
+    'rollup=maybe': 0,
+    'rollup=never': -1,
+    'rollup=always': 1,
+}
+
 
 @contextmanager
 def buildbot_sess(repo_cfg):
@@ -109,7 +117,7 @@ def __lt__(self, other):
 class PullReqState:
     num = 0
     priority = 0
-    rollup = False
+    rollup = 0
     title = ''
     body = ''
     head_ref = ''
@@ -165,7 +173,7 @@ def sort_key(self):
             STATUS_TO_PRIORITY.get(self.get_status(), -1),
             1 if self.mergeable is False else 0,
             0 if self.approved_by else 1,
-            1 if self.rollup else 0,
+            self.rollup,
             -self.priority,
             self.num,
         ]
@@ -645,10 +653,10 @@ def parse_commands(body, username, repo_label, repo_cfg, state, my_username,
                 # any meaningful labeling events.
                 state.change_labels(LabelEvent.TRY)
 
-        elif word in ['rollup', 'rollup-']:
+        elif word in WORDS_TO_ROLLUP:
             if not _try_auth_verified():
                 continue
-            state.rollup = word == 'rollup'
+            state.rollup = WORDS_TO_ROLLUP[word]
 
             state.save()
 
@@ -1653,7 +1661,7 @@ def main():
             state.approved_by = approved_by
             state.priority = int(priority)
             state.try_ = bool(try_)
-            state.rollup = bool(rollup)
+            state.rollup = rollup
             state.delegate = delegate
             builders = []
             if merge_sha:

homu/server.py

@@ -43,6 +43,12 @@ class G:
 
 g = G()
 
+ROLLUP_STR = {
+    -1: 'never',
+    0: '',
+    1: 'always',
+}
+
 
 def find_state(sha):
     for repo_label, repo_states in g.states.items():
@@ -145,7 +151,8 @@ def queue(repo_label):
         rows.append({
             'status': state.get_status(),
             'status_ext': status_ext,
-            'priority': 'rollup' if state.rollup else state.priority,
+            'priority': state.priority,
+            'rollup': ROLLUP_STR.get(state.rollup, ''),
             'url': 'https://github.com/{}/{}/pull/{}'.format(state.owner,
                                                              state.name,
                                                              state.num),
@@ -170,7 +177,7 @@ def queue(repo_label):
         oauth_client_id=g.cfg['github']['app_client_id'],
         total=len(pull_states),
         approved=len([x for x in pull_states if x.approved_by]),
-        rolled_up=len([x for x in pull_states if x.rollup]),
+        rolled_up=len([x for x in pull_states if x.rollup > 0]),
         failed=len([x for x in pull_states if x.status == 'failure' or
                    x.status == 'error']),
         multiple=multiple,