Merge pull request #94 from Manishearth/iffy

Add rollup=iffy, sort by rollup status

Author: pietroalbini

homu/html/index.html

@@ -46,9 +46,9 @@ <h3>Commands</h3>
             <li><code>r=NAME (SHA)</code>: Accept a PR on the behalf of NAME.</li>
             <li><code>r-</code>: Unacccept a PR.</li>
             <li><code>p=NUMBER</code>: Set the priority of the accepted PR (defaults to 0).</li>
-            <li><code>rollup</code>: Mark the PR as likely to merge without issue, implies <code>p=-1.</code></li>
+            <li><code>rollup</code>: Mark the PR as likely to merge without issue, short for <code>rollup=always</code></li>
             <li><code>rollup-</code>: Unmark the PR as <code>rollup</code>.</li>
-            <li><code>rollup=maybe|always|never</code>: Mark the PR as "always", "maybe", and "never" rollup-able.</li>
+            <li><code>rollup=maybe|always|iffy|never</code>: Mark the PR as "always", "maybe", "iffy", and "never" rollup-able.</li>
             <li><code>retry</code>: Signal that the PR is not bad, and should be retried by buildbot.</li>
             <li><code>try</code>: Request that the PR be tested by buildbot, without accepting it.</li>
             <li><code>force</code>: Stop all the builds on the configured builders, and proceed to the next PR.</li>

homu/html/queue.html

@@ -94,6 +94,14 @@
                 border-color: #ab0a0a;
             }
 
+            .rollup_iffy {
+                color: #D9C009;
+            }
+            .rollup_iffy:before {
+                background: #F0DE57;
+                border-color: #D9C009;
+            }
+
             .sorting_asc:after { content: " ▲"; }
             .sorting_desc:after { content: " ▼"; }
             .dataTables_filter, .dataTables_info, .dataTables_empty { display: none; }

homu/main.py

@@ -41,14 +41,6 @@
 
 global_cfg = {}
 
-WORDS_TO_ROLLUP = {
-    'rollup-': 0,
-    'rollup': 1,
-    'rollup=maybe': 0,
-    'rollup=never': -1,
-    'rollup=always': 1,
-}
-
 
 @contextmanager
 def buildbot_sess(repo_cfg):
@@ -182,10 +174,8 @@ 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,
-            # Sort rollup=always to the bottom of the queue, but treat all
-            # other rollup statuses as equivalent
-            1 if WORDS_TO_ROLLUP['rollup=always'] == self.rollup else 0,
             -self.priority,
+            self.rollup,
             self.num,
         ]
 

homu/parse_issue_comment.py

@@ -1,6 +1,15 @@
 from itertools import chain
 import re
 
+WORDS_TO_ROLLUP = {
+    'rollup-': 0,
+    'rollup': 1,
+    'rollup=maybe': 0,
+    'rollup=never': -2,
+    'rollup=iffy': -1,
+    'rollup=always': 1,
+}
+
 
 class IssueCommentCommand:
     """
@@ -93,15 +102,6 @@ def hook(cls, hook_name, hook_extra=None):
         return command
 
 
-WORDS_TO_ROLLUP = {
-    'rollup-': 0,
-    'rollup': 1,
-    'rollup=maybe': 0,
-    'rollup=never': -1,
-    'rollup=always': 1,
-}
-
-
 def is_sha(sha):
     """
     Try to determine if the input is a git sha

homu/server.py

@@ -43,8 +43,10 @@ class G:
 
 g = G()
 
+
 ROLLUP_STR = {
-    -1: 'never',
+    -2: 'never',
+    -1: 'iffy',
     0: '',
     1: 'always',
 }

homu/tests/test_parse_issue_comment.py

@@ -299,6 +299,21 @@ def test_rollup_minus():
     assert command.rollup_value == 0
 
 
+def test_rollup_iffy():
+    """
+    @bors rollup=iffy
+    """
+
+    author = "manishearth"
+    body = "@bors rollup=iffy"
+    commands = parse_issue_comment(author, body, commit, "bors")
+
+    assert len(commands) == 1
+    command = commands[0]
+    assert command.action == 'rollup'
+    assert command.rollup_value == -1
+
+
 def test_rollup_never():
     """
     @bors rollup=never
@@ -311,7 +326,7 @@ def test_rollup_never():
     assert len(commands) == 1
     command = commands[0]
     assert command.action == 'rollup'
-    assert command.rollup_value == -1
+    assert command.rollup_value == -2
 
 
 def test_rollup_maybe():