Merge lp:~brian-murray/merge-o-matic/sort-by-age into lp:merge-o-matic

[Brian Murray]

This resolve LP: #881487 regarding sorting the outstanding merges by their age with the oldest appearing first.

I've also disabled the updated section since it incorrectly included a large number of packages see LP: #1474139.

[lp:~brian-murray/merge-o-matic/sort-by-age]

250. By Brian Murray on 2015-07-14

rename set_priority to get_importance, add a docstring for it. rename priority_idx to colour_idx.

251. By Brian Murray on 2015-07-14

add bug reference to clarify disabling of updated section

252. By Brian Murray on 2015-07-14

remove unused launchpad items, resolve issue with print statement

=== modified file 'manual-status.py'
--- manual-status.py	2015-07-08 16:40:05 +0000
+++ manual-status.py	2015-07-14 20:35:53 +0000
@@ -19,11 +19,12 @@
 
 from __future__ import print_function, with_statement
 
+import bz2
 import os
-import bz2
 import re
 import time
 
+from datetime import datetime
 from rfc822 import parseaddr
 from momlib import *
 
@@ -99,7 +100,13 @@
             except IndexError:
                 pass
 
-            priority_idx = PRIORITY.index(adjusted_priority(our_source))
+            date_superseded = get_date_superseded(source["Package"],
+                                                  base_version)
+            if not date_superseded:
+                age = datetime.datetime.utcnow() - datetime.datetime.utcnow()
+            else:
+                age = datetime.datetime.utcnow() - date_superseded.replace(tzinfo=None)
+            days_old = age.days
 
             filename = changes_file(our_distro, our_source)
             if os.path.isfile(filename):
@@ -114,7 +121,9 @@
                                    multi_para=False, signed=False).para
 
                 user = info["Changed-By"]
-                uploaded = info["Distribution"] == OUR_DIST
+                # not enough to determine if it is updated LP: #1474139
+                # uploaded = info["Distribution"] == OUR_DIST
+                uploaded = False
             else:
                 user = None
                 uploaded = False
@@ -126,7 +135,7 @@
             else:
                 section = "new"
 
-            merges.append((section, priority_idx, package, user, uploader,
+            merges.append((section, days_old, package, user, uploader,
                            our_source, our_version, src_version))
 
         write_status_page(our_component, merges, our_distro, src_distro)
@@ -139,7 +148,7 @@
 
 def write_status_page(component, merges, left_distro, right_distro):
     """Write out the manual merge status page."""
-    merges.sort()
+    merges.sort(reverse=True)
 
     status_file = "%s/merges/%s-manual.html" % (ROOT, component)
     with open(status_file + ".new", "w") as status:
@@ -235,14 +244,16 @@
     print("<td colspan=2><b>Last Uploader</b></td>", file=status)
     print("<td rowspan=2><b>Comment</b></td>", file=status)
     print("<td rowspan=2><b>Bug</b></td>", file=status)
+    print("<td rowspan=2><b>Days Old</b></td>", file=status)
     print("</tr>", file=status)
     print("<tr bgcolor=#d0d0d0>", file=status)
     print("<td><b>%s Version</b></td>" % left_distro.title(), file=status)
     print("<td><b>%s Version</b></td>" % right_distro.title(), file=status)
     print("</tr>", file=status)
 
-    for uploaded, priority, package, user, uploader, source, \
+    for uploaded, age, package, user, uploader, source, \
             left_version, right_version in merges:
+        colour_idx = get_importance(age)
         if user is not None:
             (usr_name, usr_mail) = parseaddr(user)
             user_lp_page = get_person_lp_page(usr_mail)
@@ -272,7 +283,7 @@
         else:
             who = "&nbsp;"
 
-        print("<tr bgcolor=%s class=first>" % COLOURS[priority], file=status)
+        print("<tr bgcolor=%s class=first>" % COLOURS[colour_idx], file=status)
         print("<td><tt><a href=\"https://patches.ubuntu.com/" \
               "%s/%s/%s_%s.patch\">%s</a></tt>" \
               % (pathhash(package), package, package, left_version, package),
@@ -293,7 +304,7 @@
 if \"%s\" in comment:\n\
     the_comment = comment[\"%s\"]\n\
 req.write(\"<input type=\\\"text\\\" style=\\\"border-style: none; background-color: %s\\\" name=\\\"comment\\\" value=\\\"%%s\\\" title=\\\"%%s\\\" />\" %% (the_comment, the_comment))\n\
-%%>" % (package, package, COLOURS[priority]), file=status)
+%%>" % (package, package, COLOURS[colour_idx]), file=status)
         print("</form></td>", file=status)
         print("<td rowspan=2>", file=status)
         print("<%%\n\
@@ -304,8 +315,11 @@
 \n\
 %%>" % (package, package), file=status)
         print("</td>", file=status)
+        print("<td rowspan=2>", file=status)
+        print("%s" % age, file=status)
+        print("</td>", file=status)
         print("</tr>", file=status)
-        print("<tr bgcolor=%s>" % COLOURS[priority], file=status)
+        print("<tr bgcolor=%s>" % COLOURS[colour_idx], file=status)
         print("<td><small>%s</small></td>" % source["Binary"], file=status)
         print("<td>%s</td>" % left_version, file=status)
         print("<td>%s</td>" % right_version, file=status)
@@ -322,7 +336,7 @@
         # not that hard to do it ourselves.
         print('[', file=status)
         cur_merge = 0
-        for uploaded, priority, package, user, uploader, source, \
+        for uploaded, age, package, user, uploader, source, \
                 left_version, right_version in merges:
             print(' {', end=' ', file=status)
             # source_package, short_description, and link are for
@@ -333,7 +347,7 @@
             print('"link": "https://merges.ubuntu.com/%s/%s/",' %
                   (pathhash(package), package), end=' ', file=status)
             print('"uploaded": "%s",' % uploaded, end=' ', file=status)
-            print('"priority": "%s",' % priority, end=' ', file=status)
+            print('"age": "%s",' % age, end=' ', file=status)
             if user is not None:
                 who = user
                 who = who.replace('\\', '\\\\')
@@ -367,10 +381,10 @@
 def write_status_file(status_file, merges):
     """Write out the merge status file."""
     with open(status_file + ".new", "w") as status:
-        for uploaded, priority, package, user, uploader, source, \
+        for uploaded, age, package, user, uploader, source, \
                 left_version, right_version in merges:
             print("%s %s %s %s, %s, %s, %s"
-                  % (package, priority,
+                  % (package, age,
                      left_version, right_version, user, uploader, uploaded),
                   file=status)
 

=== modified file 'merge-status.py'
--- merge-status.py	2015-07-08 16:40:05 +0000
+++ merge-status.py	2015-07-14 20:35:53 +0000
@@ -19,11 +19,12 @@
 
 from __future__ import print_function, with_statement
 
+import bz2
 import os
-import bz2
 import re
 import time
 
+from datetime import datetime
 from rfc822 import parseaddr
 from momlib import *
 
@@ -90,8 +91,13 @@
                                              our_distro, src_distro)
             except ValueError:
                 continue
-
-            priority_idx = PRIORITY.index(adjusted_priority(source))
+            date_superseded = get_date_superseded(source["Package"],
+                                                  base_version)
+            if not date_superseded:
+                age = datetime.datetime.utcnow() - datetime.datetime.utcnow()
+            else:
+                age = datetime.datetime.utcnow() - date_superseded.replace(tzinfo=None)
+            days_old = age.days
 
             filename = changes_file(our_distro, source)
             if os.path.isfile(filename):
@@ -110,7 +116,13 @@
                 except KeyError:
                     user = None
                 try:
-                    uploaded = info["Distribution"] == OUR_DIST
+                    uploaded = False
+                    # not enough to determine if it is updated LP: #1474139
+                    # uploaded = info["Distribution"] == OUR_DIST
+                    # better but not sufficient
+                    # if info["Distribution"] == OUR_DIST:
+                    #     if base_version.upstream == left_version.upstream:
+                    #         uploaded = True
                 except KeyError:
                     uploaded = False
             else:
@@ -128,11 +140,10 @@
             else:
                 section = "new"
 
-            merges.append((section, priority_idx, source["Package"], user,
+            merges.append((section, days_old, source["Package"], user,
                            uploader, source, base_version,
                            left_version, right_version))
-
-        merges.sort()
+        merges.sort(reverse=True)
 
         write_status_page(our_component, merges, our_distro, src_distro)
         write_status_json(our_component, merges, our_distro, src_distro)
@@ -256,6 +267,7 @@
     print("<td colspan=3><b>Last Uploader</b></td>", file=status)
     print("<td rowspan=2><b>Comment</b></td>", file=status)
     print("<td rowspan=2><b>Bug</b></td>", file=status)
+    print("<td rowspan=2><b>Days Old</b></td>", file=status)
     print("</tr>", file=status)
     print("<tr bgcolor=#d0d0d0>", file=status)
     print("<td><b>%s Version</b></td>" % left_distro.title(), file=status)
@@ -263,8 +275,9 @@
     print("<td><b>Base Version</b></td>", file=status)
     print("</tr>", file=status)
 
-    for uploaded, priority, package, user, uploader, source, \
+    for uploaded, age, package, user, uploader, source, \
             base_version, left_version, right_version in merges:
+        colour_idx = get_importance(age)
         if user is not None:
             (usr_name, usr_mail) = parseaddr(user)
             user_lp_page = get_person_lp_page(usr_mail)
@@ -294,7 +307,7 @@
         else:
             who = "&nbsp;"
 
-        print("<tr bgcolor=%s class=first>" % COLOURS[priority], file=status)
+        print("<tr bgcolor=%s class=first>" % COLOURS[colour_idx], file=status)
         print("<td><tt><a href=\"%s/%s/REPORT\">" \
               "%s</a></tt>" % (pathhash(package), package, package),
               file=status)
@@ -311,7 +324,7 @@
 if \"%s\" in comment:\n\
     the_comment = comment[\"%s\"]\n\
 req.write(\"<input type=\\\"text\\\" style=\\\"border-style: none; background-color: %s\\\" name=\\\"comment\\\" value=\\\"%%s\\\" title=\\\"%%s\\\" />\" %% (the_comment, the_comment))\n\
-%%>" % (package, package, COLOURS[priority]), file=status)
+%%>" % (package, package, COLOURS[colour_idx]), file=status)
         print("</form></td>", file=status)
         print("<td rowspan=2>", file=status)
         print("<%%\n\
@@ -322,8 +335,11 @@
 \n\
 %%>" % (package, package), file=status)
         print("</td>", file=status)
+        print("<td rowspan=2>", file=status)
+        print("%s" % age, file=status)
+        print("</td>", file=status)
         print("</tr>", file=status)
-        print("<tr bgcolor=%s>" % COLOURS[priority], file=status)
+        print("<tr bgcolor=%s>" % COLOURS[colour_idx], file=status)
         print("<td><small>%s</small></td>" % source["Binary"], file=status)
         print("<td>%s</td>" % left_version, file=status)
         print("<td>%s</td>" % right_version, file=status)
@@ -341,7 +357,7 @@
         # not that hard to do it ourselves.
         print('[', file=status)
         cur_merge = 0
-        for uploaded, priority, package, user, uploader, source, \
+        for uploaded, age, package, user, uploader, source, \
                 base_version, left_version, right_version in merges:
             print(' {', end=' ', file=status)
             # source_package, short_description, and link are for
@@ -352,7 +368,7 @@
             print('"link": "https://merges.ubuntu.com/%s/%s/",' %
                   (pathhash(package), package), end=' ', file=status)
             print('"uploaded": "%s",' % uploaded, end=' ', file=status)
-            print('"priority": "%s",' % priority, end=' ', file=status)
+            print('"age": "%s",' % age, end=' ', file=status)
             if user is not None:
                 who = user
                 who = who.replace('\\', '\\\\')
@@ -387,10 +403,10 @@
 def write_status_file(status_file, merges):
     """Write out the merge status file."""
     with open(status_file + ".new", "w") as status:
-        for uploaded, priority, package, user, uploader, source, \
+        for uploaded, age, package, user, uploader, source, \
                 base_version, left_version, right_version in merges:
             print("%s %s %s %s %s %s, %s, %s"
-                  % (package, priority, base_version,
+                  % (package, age, base_version,
                      left_version, right_version, user, uploader, uploaded),
                   file=status)
 

=== modified file 'momlib.py'
--- momlib.py	2015-07-08 16:40:05 +0000
+++ momlib.py	2015-07-14 20:35:53 +0000
@@ -4,6 +4,7 @@
 #
 # Copyright © 2008 Canonical Ltd.
 # Author: Scott James Remnant <[e-mail]>.
+#         Brian Murray <[e-mail]>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of version 3 of the GNU General Public License as
@@ -36,6 +37,7 @@
 import json
 
 from cgi import escape
+from launchpadlib.launchpad import Launchpad
 from optparse import OptionParser
 from urllib import quote
 from urllib2 import urlopen
@@ -113,6 +115,9 @@
 # mapping of uploader emails to Launchpad pages
 person_lp_page_mapping = {}
 
+# Launchpad connection
+LAUNCHPAD = Launchpad.login_anonymously('merge-o-matic', 'production',
+                                        '/tmp/lplib-cache')
 
 # --------------------------------------------------------------------------- #
 # Command-line tool functions
@@ -196,6 +201,19 @@
         person_lp_page_mapping[person_email] = data[0]["web_link"]
     return person_lp_page_mapping[person_email]
 
+def get_importance(days):
+    "Return an int representing the importance of an item."
+    if days <= 30:
+        return 5
+    elif days <= 60:
+        return 4
+    elif days <= 90:
+        return 3
+    elif days <= 180:
+        return 2
+    elif days <= 365:
+        return 1
+    return 0
 
 # --------------------------------------------------------------------------- #
 # Location functions
@@ -731,7 +749,7 @@
 
 def get_comments():
     """Extract the comments from file, and return a dictionary
-        containing comments corresponding to packages"""
+       containing comments corresponding to packages"""
     comments = {}
 
     with open(comments_file(), "r") as file_comments:
@@ -796,3 +814,29 @@
         html += "&nbsp;"
 
     return html
+
+# --------------------------------------------------------------------------- #
+# Launchpadlib functions
+# --------------------------------------------------------------------------- #
+def get_date_superseded(package, base_version):
+    from debian.debian_support import Version
+    base_version = Version(base_version)
+
+    src_distro = LAUNCHPAD.projects[SRC_DISTRO]
+    src_archive = src_distro.main_archive
+
+    date_superseded = None
+    ver_superseded = None
+    for spph in src_archive.getPublishedSources(source_name=package,
+                                                exact_match=True,
+                                                pocket='Release'):
+        version = Version(spph.source_package_version)
+        if version <= base_version:
+            break
+        date_superseded = spph.date_created
+        ver_superseded = version
+    else:
+        if False:
+            print("Base version %s of %s never published in Debian." %
+                  (base_version, package))
+    return date_superseded