Merge lp:~lifeless/hydrazine/cron into lp:hydrazine

[Robert Collins]

Use the LP API 'queued' status to record things 'sent' to PQM, and add a cron mode we should run somewhere that will automatically send one (and only one) email to PQM to handle such proposals.

[lp:~lifeless/hydrazine/cron]

68. By Robert Collins on 2010-04-14

Include the queuer as a prefix and the branch owner as a suffix on commit messages, to automate current practice.

69. By Robert Collins on 2010-04-15

Save the tabs, save the world.

70. By Robert Collins on 2010-04-16

Set queued revision id when queuing.

71. By Robert Collins on 2010-04-18

After sending merge proposals, remove them from the queue if they would not have been found originally.

72. By Robert Collins on 2010-04-19

Handle submitting the last pending proposal.

73. By Robert Collins on 2010-04-20

Remove --cron mode.

74. By Robert Collins on 2010-04-20

Add back manual email submission via 'e'.

75. By Robert Collins on 2010-04-20

Really do it.

[Martin Pool (mbp)]

I think this is obsolete until we continue with queue mode? But if you want to separate out some of this, you can.

review: Resubmit

[Robert Collins (lifeless)]

No, it should be mergable now, as-is, as a qualititative improvement.

=== modified file 'feed-pqm'
--- feed-pqm	2010-03-29 05:21:17 +0000
+++ feed-pqm	2010-04-20 07:20:40 +0000
@@ -16,12 +16,13 @@
 
 
 import datetime
+import optparse
 import os
-import subprocess
 import sys
 
+from bzrlib.email_message import EmailMessage
 from bzrlib.config import GlobalConfig
-from bzrlib.email_message import EmailMessage
+from bzrlib import gpg
 from bzrlib.smtp_connection import SMTPConnection
 
 import hydrazine
@@ -46,7 +47,12 @@
     n       skip this, go to the next
     p       previous
     q       quit
-    s       send it to pqm!
+    s       submit approved merges to the queue (PQM reads from the launchpad
+            queue) for already queued merges this toggles in and out of queued,
+            setting a new queuer and putting it at the back of the queue.
+            Requires membership in the review team for the target branch.
+    e       send in an approved merge via email. Requires GPG and email setup
+            appropriately in bazaar.conf, and your key in the PQM keyring.
 
 Please send feedback to [e-mail]
 """
@@ -64,6 +70,7 @@
     print '  %12s: %s' % ('message', mp.commit_message)
     print '  %12s: %s' % ('source', mp.source_branch.bzr_identity)
     print '  %12s: %s' % ('target', mp.target_branch.bzr_identity)
+    print '  %12s: %s' % ('status', mp.queue_status)
     show_datetime('created', mp.date_created)
     show_datetime('reviewed', mp.date_reviewed)
     print '  %12s: %s' % ('registrant', mp.registrant.name)
@@ -81,71 +88,77 @@
     mp.lp_save()
 
 
-def send_mp(launchpad, mp):
+def queue_mp(launchpad, mp):
     if not mp.commit_message:
         print "No message set?  Use 'm'."
         return
-
-    # suggested subject should match the last comment on the mp so that gmail
-    # doesn't see it as a separate thread;
-    # <https://bugs.edge.launchpad.net/hydrazine/+bug/541586>
-    subject = "Re: [Merge] %s into %s" % (
-        mp.source_branch.bzr_identity,
-        mp.target_branch.bzr_identity)
-
+    if mp.queue_status == 'Queued':
+        mp.setStatus(status='Approved')
+    mp.setStatus(status='Queued', revid=mp.reviewed_revid)
+
+
+def send_mp(launchpad, mp, send_mail=True):
+    if not mp.commit_message:
+        print "No message set - %s queued badly? Set a message first." % mp
+        return False
     print "merge command to be signed:"
-    print "Subject: %s" % subject
     raw_message = (
         "star-merge %s %s\n"
         % (mp.source_branch.composePublicURL(scheme='http'),
             mp.target_branch.composePublicURL(scheme='http')))
+    print raw_message
 
+    config = GlobalConfig()
+    signer = gpg.GPGStrategy(config)
+    signed_message = signer.sign(raw_message.encode('utf8'))
     try:
         my_email = os.environ['EMAIL']
     except KeyError:
         my_email = launchpad.me.preferred_email_address.email
         print "EMAIL environment variable not set, using %s" % my_email
-    child = subprocess.Popen(
-        ['gpg', '--clearsign', '-a'],
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE)
-    signed_message = child.communicate(
-        raw_message)[0]
-    if child.returncode != 0:
-        print "gpg child failed"
-
-    message = EmailMessage(my_email, PQM_ADDRESS, mp.commit_message, 
+    # TODO: put in bug numbers as well.
+    commit_message = u"(%s) %s (%s)" % (launchpad.me.name, mp.commit_message,
+        mp.source_branch.owner.display_name)
+    message = EmailMessage(my_email, PQM_ADDRESS, commit_message,
                            signed_message)
-    config = GlobalConfig()
-    SMTPConnection(config).send_email(message)
-
-    print "Sent!"
-
-    if False:
-        # disabled, because some people think it's too noisy
-        mp.createComment(content="Fed to pqm\n\n" + raw_message, 
-            subject=subject)
-
+    if send_mail:
+        SMTPConnection(config).send_email(message)
+        print "Sent!"
+    else:
+        print "Not sending email - disabled."
+
+    # suggested subject should match the last comment on the mp so that gmail
+    # doesn't see it as a separate thread;
+    # <https://bugs.edge.launchpad.net/hydrazine/+bug/541586>
+    subject = "Re: [Merge] %s into %s" % (mp.source_branch.bzr_identity,
+        mp.target_branch.bzr_identity)
+    print "Recording that the proposal is submitted to PQM."
+    fed_pqm = "submitted to PQM by hand.\n"
+    mp.createComment(content=fed_pqm, subject=subject)
+    return True
 
 
 def main(argv):
-    
+    parser = optparse.OptionParser()
+    parser.add_option('--nomail', help="Do not send email commands", action="store_true", default=False)
+    parser.add_option('--queued', help="Examine already queued proposals", action="store_true", default=False)
+    opts, args = parser.parse_args()
     launchpad = hydrazine.create_session()
     project = launchpad.projects[argv[1]]
-
-    print 'Looking for Approved mps in %s' % project
     i = 0
-    all_mps = list(project.getMergeProposals(status=['Approved']))
-    if all_mps == []:
-        print "Nothing approved to merge?"
-    while True:
+    find_status = ['Approved']
+    if opts.queued:
+        find_status.append('Queued')
+    print 'Looking for %s mps in %s' % (find_status, project)
+    all_mps = list(project.getMergeProposals(status=find_status))
+    while len(all_mps):
         mp = all_mps[i]
         show_mp(mp)
 
         while True:
             whatnow = read_choice()
             if whatnow == 'q':
-                return True
+                return 0
             elif whatnow in ('h', 'help', '?'):
                 show_help()
             elif whatnow == 'n':
@@ -159,11 +172,25 @@
             elif whatnow == 'm':
                 set_message(mp)
             elif whatnow == 's':
-                send_mp(launchpad, mp)
+                queue_mp(launchpad, mp)
+                if mp.queue_status not in find_status:
+                    del all_mps[i]
+                    if i == len(all_mps):
+                        i -= 1
+                    break
+            elif whatnow == 'e':
+                if send_mp(launchpad, mp, send_mail=not opts.nomail):
+                    del all_mps[i]
+                    if i == len(all_mps):
+                        i -= 1
+                    break
             elif whatnow == '':
                 continue
             else:
                 print "Sorry, don't understand %r" % whatnow
+    if not len(all_mps):
+        print "No remaining merge proposals matching status %r?" % find_status
+        return 0
 
 
 if __name__ == '__main__':

=== modified file 'hydrazine/__init__.py'
--- hydrazine/__init__.py	2010-03-02 05:39:02 +0000
+++ hydrazine/__init__.py	2010-04-20 07:20:40 +0000
@@ -11,7 +11,7 @@
     EDGE_SERVICE_ROOT,
     )
 
-service_root = EDGE_SERVICE_ROOT
+service_root = os.environ.get('LAUNCHPAD_API', EDGE_SERVICE_ROOT)
 
 
 def trace(s):