Merge pull request #28 from bryanburgers/priority-over-rollup

When sorting, lump rollup=never and rollup=maybe

Author: pietroalbini

homu/main.py

@@ -180,7 +180,9 @@ 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,
-            self.rollup,
+            # 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.num,
         ]