If a repo is treeclosed, link to the comment issuing that command

kennytm · kennytm · commit dfe45081d72f · 2019-05-04T02:49:07.000+08:00
diff --git a/homu/html/queue.html b/homu/html/queue.html
@@ -32,7 +32,7 @@
         </style>
     </head>
     <body>
-        <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_label}}</a>{% else %}{{repo_label}}{% endif %} {% if treeclosed %} [TREE CLOSED below priority {{treeclosed}}] {% endif %}</h2>
+        <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_label}}</a>{% else %}{{repo_label}}{% endif %} {% if treeclosed %} [<a href="{{treeclosed_src}}">TREE CLOSED</a> below priority {{treeclosed}}] {% endif %}</h2>
 
         <p>
             <button type="button" id="expand-rollup">Create a rollup</button>
diff --git a/homu/main.py b/homu/main.py
@@ -69,6 +69,7 @@ def db_query(db, *args):
 
 class Repository:
     treeclosed = -1
+    treecloesd_src = None
     gh = None
     label = None
     db = None
@@ -79,17 +80,20 @@ def __init__(self, gh, repo_label, db):
         self.db = db
         db_query(
             db,
-            'SELECT treeclosed FROM repos WHERE repo = ?',
+            'SELECT treeclosed, treeclosed_src FROM repos WHERE repo = ?',
             [repo_label]
         )
         row = db.fetchone()
         if row:
             self.treeclosed = row[0]
+            self.treecloesd_src = row[1]
         else:
             self.treeclosed = -1
+            self.treeclosed_src = None
 
-    def update_treeclosed(self, value):
+    def update_treeclosed(self, value, src):
         self.treeclosed = value
+        self.treeclosed_src = src
         db_query(
             self.db,
             'DELETE FROM repos where repo = ?',
@@ -98,8 +102,8 @@ def update_treeclosed(self, value):
         if value > 0:
             db_query(
                 self.db,
-                'INSERT INTO repos (repo, treeclosed) VALUES (?, ?)',
-                [self.repo_label, value]
+                'INSERT INTO repos (repo, treeclosed, treeclosed_src) VALUES (?, ?, ?)',
+                [self.repo_label, value, src]
             )
 
     def __lt__(self, other):
@@ -340,8 +344,8 @@ def fake_merge(self, repo_cfg):
             title = merged_prefix + title
             issue.edit(title=title)
 
-    def change_treeclosed(self, value):
-        self.repos[self.repo_label].update_treeclosed(value)
+    def change_treeclosed(self, value, src):
+        self.repos[self.repo_label].update_treeclosed(value, src)
 
     def blocked_by_closed_tree(self):
         treeclosed = self.repos[self.repo_label].treeclosed
@@ -414,7 +418,7 @@ class LabelEvent(Enum):
 
 
 def parse_commands(body, username, repo_label, repo_cfg, state, my_username,
-                   db, states, *, realtime=False, sha=''):
+                   db, states, *, realtime=False, sha='', command_src=''):
     global global_cfg
     state_changed = False
 
@@ -695,14 +699,14 @@ def parse_commands(body, username, repo_label, repo_cfg, state, my_username,
                 continue
             try:
                 treeclosed = int(word[len('treeclosed='):])
-                state.change_treeclosed(treeclosed)
+                state.change_treeclosed(treeclosed, command_src)
             except ValueError:
                 pass
             state.save()
         elif word == 'treeclosed-':
             if not _reviewer_auth_verified():
                 continue
-            state.change_treeclosed(-1)
+            state.change_treeclosed(-1, None)
             state.save()
         elif 'hooks' in global_cfg:
             hook_found = False
@@ -1492,6 +1496,8 @@ def synchronize(repo_label, repo_cfg, logger, gh, states, repos, db, mergeable_q
                     db,
                     states,
                     sha=comment.original_commit_id,
+                    command_src=comment.to_json()['html_url'],
+                    # FIXME switch to `comment.html_url` after updating github3 to 1.3.0+
                 )
 
         for comment in pull.iter_issue_comments():
@@ -1504,6 +1510,8 @@ def synchronize(repo_label, repo_cfg, logger, gh, states, repos, db, mergeable_q
                 my_username,
                 db,
                 states,
+                command_src=comment.to_json()['html_url'],
+                # FIXME switch to `comment.html_url` after updating github3 to 1.3.0+
             )
 
         saved_state = saved_states.get(pull.number)
@@ -1629,8 +1637,16 @@ def main():
     db_query(db, '''CREATE TABLE IF NOT EXISTS repos (
         repo TEXT NOT NULL,
         treeclosed INTEGER NOT NULL,
+        treeclosed_src TEXT,
         UNIQUE (repo)
     )''')
+
+    # manual DB migration :/
+    try:
+        db_query(db, 'SELECT treeclosed_src FROM repos LIMIT 0')
+    except sqlite3.OperationalError:
+        db_query(db, 'ALTER TABLE repos ADD COLUMN treeclosed_src TEXT')
+
     for repo_label, repo_cfg in cfg['repo'].items():
         repo_cfgs[repo_label] = repo_cfg
         repo_labels[repo_cfg['owner'], repo_cfg['name']] = repo_label
diff --git a/homu/server.py b/homu/server.py
@@ -109,6 +109,7 @@ def queue(repo_label):
     lazy_debug(logger, lambda: 'repo_label: {}'.format(repo_label))
 
     single_repo_closed = None
+    treeclosed_src = None
     if repo_label == 'all':
         labels = g.repos.keys()
         multiple = True
@@ -118,6 +119,7 @@ def queue(repo_label):
         multiple = len(labels) > 1
         if repo_label in g.repos and g.repos[repo_label].treeclosed >= 0:
             single_repo_closed = g.repos[repo_label].treeclosed
+            treeclosed_src = g.repos[repo_label].treeclosed_src
         repo_url = 'https://github.com/{}/{}'.format(
             g.cfg['repo'][repo_label]['owner'],
             g.cfg['repo'][repo_label]['name'])
@@ -132,7 +134,7 @@ def queue(repo_label):
     pull_states = sorted(states)
     rows = []
     for state in pull_states:
-        treeclosed = (single_repo_closed or
+        treeclosed = (single_repo_closed and
                       state.priority < g.repos[state.repo_label].treeclosed)
         status_ext = ''
 
@@ -166,6 +168,7 @@ def queue(repo_label):
         repo_url=repo_url,
         repo_label=repo_label,
         treeclosed=single_repo_closed,
+        treeclosed_src=treeclosed_src,
         states=rows,
         oauth_client_id=g.cfg['github']['app_client_id'],
         total=len(pull_states),
@@ -354,6 +357,7 @@ def github():
                     g.states,
                     realtime=True,
                     sha=original_commit_id,
+                    command_src=info['comment']['html_url'],
                 ):
                     state.save()
 
@@ -399,6 +403,8 @@ def github():
                         g.my_username,
                         g.db,
                         g.states,
+                        command_src=c.to_json()['html_url'],
+                        # FIXME switch to `c.html_url` after updating github3 to 1.3.0+
                     ) or found
 
                 status = ''
@@ -519,6 +525,7 @@ def fail(err):
                 g.db,
                 g.states,
                 realtime=True,
+                command_src=info['comment']['html_url'],
             ):
                 state.save()
 
