Merge lp:~brian-murray/laika/add-merge-proposals into lp:laika

[Brian Murray]

I thought it would be neat to see the merge proposals that were created by the user. This branch implements that.

I also added a print statement in reported bugs in case the user did not report any bugs.

[Alex Chiang (achiang)]

Looks good. I tested it and it found my merge proposals.

Thanks for the patch!

review: Approve

=== modified file 'laika'
--- laika	2012-04-02 16:33:21 +0000
+++ laika	2012-09-07 23:19:19 +0000
@@ -187,6 +187,7 @@
             if self.in_window(t.bug.date_created):
                 self.print_bugid(t)
                 print
+        print
 
     def print_ppa_activity(self):
         if self.ppas == '':
@@ -222,11 +223,22 @@
             print
         print
 
+    def print_merge_proposals(self):
+        mps = self.user.getMergeProposals()
+        if len(mps) == 0:
+            return
+        self.print_header("Merge Proposals")
+        for mp in mps:
+            if self.in_window(mp.date_created):
+                print "%s - %s" % (mp.target_branch.display_name, mp.web_link)
+        print
+
     def render(self):
         self.print_assignments()
         self.print_comments()
         self.print_reported()
         self.print_ppa_activity()
+        self.print_merge_proposals()
 
 def get_config(opts):
     config = {}