Launchpad itself

Merge lp:~gmb/launchpad/bug-557032 into lp:launchpad

  1. bug-557032
  2. Merge into devel
Proposed by Graham Binns
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 12075
Proposed branch: lp:~gmb/launchpad/bug-557032
Merge into: lp:launchpad
Diff against target: 49 lines (+5/-5)
2 files modified
lib/canonical/launchpad/emailtemplates/default_remotecomment_template.txt (+1/-1)
lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt (+4/-4)
To merge this branch: bzr merge lp:~gmb/launchpad/bug-557032
Reviewer Review Type Date Requested Status
Deryck Hodge (community) code Approve
Review via email: mp+43671@code.launchpad.net

Commit message

[r=deryck][ui=none][bug=557032] Launchpad bug IDs should no longer be linkified on upstream bug trackers when comments are pushed.

Description of the change

This branch merges a patch from Bryce Harrington to prevent Launchpad
bug IDs being incorrectly linkified when comments are pushed to remote
bug trackers.

I've altered the existing tests to cover the change.

To post a comment you must log in.
Revision history for this message
Deryck Hodge (deryck) wrote :

Looks fine. Easy peasy and simple.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/emailtemplates/default_remotecomment_template.txt'
2--- lib/canonical/launchpad/emailtemplates/default_remotecomment_template.txt 2008-05-09 20:42:19 +0000
3+++ lib/canonical/launchpad/emailtemplates/default_remotecomment_template.txt 2010-12-14 16:43:25 +0000
4@@ -1,4 +1,4 @@
5-%(comment_author)s added the following comment to Launchpad bug #%(launchpad_bug)s:
6+%(comment_author)s added the following comment to Launchpad bug report %(launchpad_bug)s:
7
8 %(comment_body)s
9
10
11=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt'
12--- lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt 2010-10-18 22:24:59 +0000
13+++ lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt 2010-12-14 16:43:25 +0000
14@@ -288,7 +288,7 @@
15 >>> for remote_comment_id in sorted(remote_comments.keys()):
16 ... print remote_comments[remote_comment_id]
17 ... print "--------------------"
18- Sample Person added the following comment to Launchpad bug #...:
19+ Sample Person added the following comment to Launchpad bug report...:
20 <BLANKLINE>
21 Pushing, for the purpose of.
22 <BLANKLINE>
23@@ -296,7 +296,7 @@
24 http://launchpad.net/bugs/...
25 <BLANKLINE>
26 --------------------
27- Sample Person added the following comment to Launchpad bug #...:
28+ Sample Person added the following comment to Launchpad bug report...:
29 <BLANKLINE>
30 Body the second.
31 <BLANKLINE>
32@@ -304,7 +304,7 @@
33 http://launchpad.net/bugs/...
34 <BLANKLINE>
35 --------------------
36- Sample Person added the following comment to Launchpad bug #...:
37+ Sample Person added the following comment to Launchpad bug report...:
38 <BLANKLINE>
39 Body the third.
40 <BLANKLINE>
41@@ -320,7 +320,7 @@
42
43 >>> formatted_message = bugwatch_updater._formatRemoteComment(message)
44 >>> print formatted_message
45- Sample Person added the following comment to Launchpad bug #...:
46+ Sample Person added the following comment to Launchpad bug report...:
47 <BLANKLINE>
48 Pushing, for the purpose of.
49 <BLANKLINE>