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

Proposed by Brian Murray on 2012-09-07
Status: Merged
Merged at revision: 21
Proposed branch: lp:~brian-murray/laika/add-merge-proposals
Merge into: lp:laika
Diff against target: 34 lines (+12/-0)
1 file modified
laika (+12/-0)
To merge this branch: bzr merge lp:~brian-murray/laika/add-merge-proposals
Reviewer Review Type Date Requested Status
Alex Chiang 2012-09-07 Approve on 2012-10-31
Review via email: mp+123383@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Alex Chiang (achiang) wrote :

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

Thanks for the patch!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'laika'
2--- laika 2012-04-02 16:33:21 +0000
3+++ laika 2012-09-07 23:19:19 +0000
4@@ -187,6 +187,7 @@
5 if self.in_window(t.bug.date_created):
6 self.print_bugid(t)
7 print
8+ print
9
10 def print_ppa_activity(self):
11 if self.ppas == '':
12@@ -222,11 +223,22 @@
13 print
14 print
15
16+ def print_merge_proposals(self):
17+ mps = self.user.getMergeProposals()
18+ if len(mps) == 0:
19+ return
20+ self.print_header("Merge Proposals")
21+ for mp in mps:
22+ if self.in_window(mp.date_created):
23+ print "%s - %s" % (mp.target_branch.display_name, mp.web_link)
24+ print
25+
26 def render(self):
27 self.print_assignments()
28 self.print_comments()
29 self.print_reported()
30 self.print_ppa_activity()
31+ self.print_merge_proposals()
32
33 def get_config(opts):
34 config = {}

Subscribers

People subscribed via source and target branches