kallithea Changeset - 4e2e6371f79a

Changeset - 4e2e6371f79a

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 9 years ago 2016-09-06 00:51:18
madski@unity3d.com

helpers: in urlify_text, use <br> for newlines in pre-formatted text so it can be cut'n'pasted correctly

Before, when copying the preformatted nice looking ASCII-artsy text in a PR or
changeset description from a browser to a text editor, it would be pasted as
text without newline. Simply put, copy/paste ignores that it is inside a <pre>
/ white-space:pre-wrap section.

Instead, translate newlines to <br> which always translates to a newline when
pasted.

4 files changed with 26 insertions and 52 deletions:

kallithea/lib/helpers.py

kallithea/tests/functional/test_files.py

kallithea/tests/models/test_dump_html_mails.ref.html

kallithea/tests/other/test_libs.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1257,96 +1257,97 @@ def fancy_file_stats(stats): @@
             d_p = d_p - (p_sum - width)
     a_v = a if a > 0 else ''
     d_v = d if d > 0 else ''
     d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (
         cgen('a', a_v, d_v), a_p, a_v
+    )
     d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (
         cgen('d', a_v, d_v), d_p, d_v
+    )
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 def _urlify_text_replace(match_obj):
     url_full = match_obj.group(1)
     return '<a href="%(url)s">%(url)s</a>' % {'url': url_full}
 def _urlify_text(s):
     """
     Extract urls from text and make html links out of them
     """
     return url_re.sub(_urlify_text_replace, s)
 def urlify_text(s, repo_name=None, link_=None, truncate=None, stylize=False, truncatef=truncate):
     """
     Parses given text message and make literal html with markup.
     The text will be truncated to the specified length.
     Hashes are turned into changeset links to specified repository.
     URLs links to what they say.
     Issues are linked to given issue-server.
     If link_ is provided, all text not already linking somewhere will link there.
     """
     if truncate is None:
         s = s.rstrip()
     else:
         s = truncatef(s, truncate, whole_word=True)
     s = html_escape(s)
     if repo_name is not None:
         s = urlify_changesets(s, repo_name)
     if stylize:
         s = desc_stylize(s)
     s = _urlify_text(s)
     if repo_name is not None:
         s = urlify_issues(s, repo_name, link_)
     s = MENTIONS_REGEX.sub(_mentions_replace, s)
     s = s.replace('\r\n', '<br/>').replace('\n', '<br/>')
     return literal(s)
 def _urlify_changeset_replace_f(repo_name):
     from pylons import url  # doh, we need to re-import url to mock it later
     def urlify_changeset_replace(match_obj):
         rev = match_obj.group(0)
         return '<a class="revision-link" href="%(url)s">%(rev)s</a>' % {
          'url': url('changeset_home', repo_name=repo_name, revision=rev),
          'rev': rev,
+        }
     return urlify_changeset_replace
 urilify_changeset_re = r'(?:^|(?<=[\s(),]))([0-9a-fA-F]{12,40})(?=$|\s|[.,:()])'
 def urlify_changesets(text_, repo_name):
     """
     Extract revision ids from changeset and make link from them
     """
     urlify_changeset_replace = _urlify_changeset_replace_f(repo_name)
     return re.sub(urilify_changeset_re, urlify_changeset_replace, text_)
 def linkify_others(t, l):
     """Add a default link to html with links.
     HTML doesn't allow nesting of links, so the outer link must be broken up
     in pieces and give space for other links.
     """
     urls = re.compile(r'(\<a.*?\<\/a\>)',)
     links = []
     for e in urls.split(t):
         if not urls.match(e):
             links.append('<a class="message-link" href="%s">%s</a>' % (l, e))
         else:
             links.append(e)
     return ''.join(links)
 def _urlify_issues_replace_f(repo_name, ISSUE_SERVER_LNK, ISSUE_PREFIX):
     def urlify_issues_replace(match_obj):
         pref = ''
         if match_obj.group().startswith(' '):
             pref = ' '
         issue_id = ''.join(match_obj.groups())
         issue_url = ISSUE_SERVER_LNK.replace('{id}', issue_id)

kallithea/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -54,101 +54,101 @@ class TestFilesController(TestController @@
         response = self.app.get(
             url(controller='files', action='index',
                 repo_name=HG_REPO,
                 revision='7ba66bec8d6dbba14a2155be32408c435c5f4492',
                 f_path='/')
+        )
         #Test response...
         response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs"><i class="icon-folder-open"></i><span>docs</span></a>' % HG_REPO)
         response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests"><i class="icon-folder-open"></i><span>tests</span></a>' % HG_REPO)
         response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst"><i class="icon-doc"></i><span>README.rst</span></a>' % HG_REPO)
         response.mustcontain('1.1 KiB')
     def test_index_different_branch(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision='97e8b885c04894463c51898e14387d80c30ed1ee',
                                     f_path='/'))
         response.mustcontain("""<option selected="selected" value="97e8b885c04894463c51898e14387d80c30ed1ee">git at 97e8b885c048</option>""")
     def test_index_paging(self):
         self.log_user()
         for r in [(73, 'a066b25d5df7016b45a41b7e2a78c33b57adc235'),
                   (92, 'cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e'),
                   (109, '75feb4c33e81186c87eac740cee2447330288412'),
                   (1, '3d8f361e72ab303da48d799ff1ac40d5ac37c67e'),
                   (0, 'b986218ba1c9b0d6a259fac9b050b1724ed8e545')]:
             response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision=r[1],
                                     f_path='/'))
             response.mustcontain("""@ r%s:%s""" % (r[0], r[1][:12]))
     def test_file_source(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision='8911406ad776fdd3d0b9932a2e89677e57405a48',
                                     f_path='vcs/nodes.py'))
         response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://issues.example.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.
 In addition some other __str__ are unicode as well
 Added test for unicode
 Improved test to clone into uniq repository.
 removed extra unicode conversion in diff.</div>
         response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://issues.example.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.<br/>"""
 """In addition some other __str__ are unicode as well<br/>"""
 """Added test for unicode<br/>"""
 """Improved test to clone into uniq repository.<br/>"""
 """removed extra unicode conversion in diff.</div>
 """)
         response.mustcontain("""<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">default at 8911406ad776</option>""")
     def test_file_source_history(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='history',
                                     repo_name=HG_REPO,
                                     revision='tip',
                                     f_path='vcs/nodes.py'),
                                 extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)
         assert response.body == HG_NODE_HISTORY
     def test_file_source_history_git(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='history',
                                     repo_name=GIT_REPO,
                                     revision='master',
                                     f_path='vcs/nodes.py'),
                                 extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)
         assert response.body == GIT_NODE_HISTORY
     def test_file_annotation(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision='tip',
                                     f_path='vcs/nodes.py',
                                     annotate=True))
         response.mustcontain("""r356:25213a5fbb04""")
     def test_file_annotation_git(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=GIT_REPO,
                                     revision='master',
                                     f_path='vcs/nodes.py',
                                     annotate=True))
         response.mustcontain("""r345:c994f0de03b2""")
     def test_file_annotation_history(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='history',
                                     repo_name=HG_REPO,
                                     revision='tip',
                                     f_path='vcs/nodes.py',
                                     annotate=True),

kallithea/tests/models/test_dump_html_mails.ref.html

➞

Show inline comments

@@ @@ -49,99 +49,97 @@ View Comment: http://comment.org @@
 <table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
        style="border-bottom:1px solid #ddd">
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
     <tr>
         <td width="30px"></td>
         <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
             <a style="text-decoration:none;color:#395fa0" href="http://comment.org"
                target="_blank">Comment on Changeset &#34;This changeset did something clever which is hard to explain&#34;</a>
         </td>
         <td width="30px"></td>
     </tr>
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
  - and here it ends indented.</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Changeset on
                 <a style="color:#395fa0;text-decoration:none"
                    href="repo_target">repo_target</a>
                 branch
                 <span style="color:#395fa0">brunch</span>:
             </div>
             <div>
                 "<a style="color:#395fa0;text-decoration:none"
                    href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
                 </center>
             </a>
         </td>
     </tr>
 </table>
         </td>
@@ @@ -208,99 +206,97 @@ View Comment: http://comment.org @@
 <table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
        style="border-bottom:1px solid #ddd">
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
     <tr>
         <td width="30px"></td>
         <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
             <a style="text-decoration:none;color:#395fa0" href="http://comment.org"
                target="_blank">Mention in Comment on Changeset &#34;This changeset did something clever which is hard to explain&#34;</a>
         </td>
         <td width="30px"></td>
     </tr>
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
  - and here it ends indented.</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Changeset on
                 <a style="color:#395fa0;text-decoration:none"
                    href="repo_target">repo_target</a>
                 branch
                 <span style="color:#395fa0">brunch</span>:
             </div>
             <div>
                 "<a style="color:#395fa0;text-decoration:none"
                    href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
                 </center>
             </a>
         </td>
     </tr>
 </table>
         </td>
@@ @@ -385,99 +381,97 @@ View Comment: http://comment.org @@
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         Status change:
                         Approved
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
  - and here it ends indented.</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Changeset on
                 <a style="color:#395fa0;text-decoration:none"
                    href="repo_target">repo_target</a>
                 branch
                 <span style="color:#395fa0">brunch</span>:
             </div>
             <div>
                 "<a style="color:#395fa0;text-decoration:none"
                    href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
                 </center>
             </a>
         </td>
     </tr>
 </table>
         </td>
@@ @@ -562,99 +556,97 @@ View Comment: http://comment.org @@
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         Status change:
                         Approved
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
  - and here it ends indented.</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Changeset on
                 <a style="color:#395fa0;text-decoration:none"
                    href="repo_target">repo_target</a>
                 branch
                 <span style="color:#395fa0">brunch</span>:
             </div>
             <div>
                 "<a style="color:#395fa0;text-decoration:none"
                    href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
                 </center>
             </a>
         </td>
     </tr>
 </table>
         </td>
@@ @@ -683,98 +675,97 @@ Subject: Test Message @@
 </pre>
 <hr/>
 <pre>This is the body of the test message
  - nothing interesting here except indentation.</pre>
 <hr/>
 <!--!doctype html-->
 <!--html lang="en"-->
 <!--head-->
     <!--title--><!--/title-->
     <!--meta name="viewport" content="width=device-width"-->
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
 <table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
     <tr>
         <td width="30px"></td>
         <td>
             <table width="100%" cellpadding="0" cellspacing="0" border="0"
                    style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
                 <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
                 <tr>
                     <td colspan="3">
 <table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
        style="border-bottom:1px solid #ddd">
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
     <tr>
         <td width="30px"></td>
         <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
             <span style="color:#395fa0">Message</span>
         </td>
         <td width="30px"></td>
     </tr>
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the body of the test message
  - nothing interesting here except indentation.</div></td>
         <td style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the body of the test message<br/> - nothing interesting here except indentation.</div></td>
     </tr>
 </table>
                     </td>
                     <td></td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
             </table>
         </td>
         <td width="30px"></td>
     </tr>
 </table>
 <!--/body-->
 <!--/html-->
 <hr/>
 <hr/>
 <h1>registration</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: New user newbie registered
 </pre>
 <hr/>
 <pre>http://newbie.org
 New User Registration
 Username: newbie
 Full Name: New Full Name
 Email: new@email.com
 View User Profile: http://newbie.org
 </pre>
 <hr/>
 <!--!doctype html-->
 <!--html lang="en"-->
 <!--head-->
     <!--title--><!--/title-->
     <!--meta name="viewport" content="width=device-width"-->
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
 <table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
@@ @@ -941,98 +932,97 @@ View Pull Request: http://pr.org/7 @@
     </tr>
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 at
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 at
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr><td height="10px"></td></tr>
     <tr>
         <td>
             <div>
                 Description:
             </div>
         </td>
     </tr>
     <tr><td height="10px"></td></tr>
     <tr>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff
  - please approve indented!</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff<br/> - please approve indented!</div></div>
         </td>
     </tr>
     <tr><td height="15px"></td></tr>
     <tr>
         <td>
             <div>Changesets:</div>
         </td>
     </tr>
     <tr><td height="10px"></td></tr>
     <tr>
         <td style="font-family:Helvetica,Arial,sans-serif">
             <ul style="color:#395fa0;padding-left:15px;margin:0">
                     <li>
                         <a style="color:#395fa0;text-decoration:none"
                            href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">
                             Introduce one and two
                         </a>
                     </li>
                     <li>
                         <a style="color:#395fa0;text-decoration:none"
                            href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">
                             Make one plus two equal tree
                         </a>
                     </li>
             </ul>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Pull Request</span>
                     </font>
                 </center>
             </a>
         </td>
     </tr>
 </table>
         </td>
     </tr>
@@ @@ -1115,98 +1105,97 @@ View Pull Request: http://pr.org/7 @@
     </tr>
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 at
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 at
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr><td height="10px"></td></tr>
     <tr>
         <td>
             <div>
                 Description:
             </div>
         </td>
     </tr>
     <tr><td height="10px"></td></tr>
     <tr>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff
  - please approve indented!</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff<br/> - please approve indented!</div></div>
         </td>
     </tr>
     <tr><td height="15px"></td></tr>
     <tr>
         <td>
             <div>Changesets:</div>
         </td>
     </tr>
     <tr><td height="10px"></td></tr>
     <tr>
         <td style="font-family:Helvetica,Arial,sans-serif">
             <ul style="color:#395fa0;padding-left:15px;margin:0">
                     <li>
                         <a style="color:#395fa0;text-decoration:none"
                            href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">
                             Introduce one and two
                         </a>
                     </li>
                     <li>
                         <a style="color:#395fa0;text-decoration:none"
                            href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">
                             Make one plus two equal tree
                         </a>
                     </li>
             </ul>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Pull Request</span>
                     </font>
                 </center>
             </a>
         </td>
     </tr>
 </table>
         </td>
     </tr>
@@ @@ -1272,99 +1261,97 @@ View Comment: http://pr.org/comment @@
 <table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
        style="border-bottom:1px solid #ddd">
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
     <tr>
         <td width="30px"></td>
         <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
             <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Comment on Pull Request #7 &#34;The Title&#34;</a>
         </td>
         <td width="30px"></td>
     </tr>
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
@@ @@ -1437,99 +1424,97 @@ View Comment: http://pr.org/comment @@
 <table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
        style="border-bottom:1px solid #ddd">
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
     <tr>
         <td width="30px"></td>
         <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
             <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Mention in Comment on Pull Request #7 &#34;The Title&#34;</a>
         </td>
         <td width="30px"></td>
     </tr>
     <tr>
         <td height="20px" colspan="3"></td>
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
@@ @@ -1620,99 +1605,97 @@ View Comment: http://pr.org/comment @@
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         Status change:
                         Under Review
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
@@ @@ -1803,99 +1786,97 @@ View Comment: http://pr.org/comment @@
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         Status change:
                         Under Review
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
@@ @@ -1985,99 +1966,97 @@ View Comment: http://pr.org/comment @@
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         The pull request has been closed.
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
@@ @@ -2167,99 +2146,97 @@ View Comment: http://pr.org/comment @@
     </tr>
 </table>
                     </td>
                 </tr>
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         The pull request has been closed.
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
@@ @@ -2355,99 +2332,97 @@ View Comment: http://pr.org/comment @@
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         Status change:
                         Under Review
                     </div>
                     <div style="font-weight:600">
                         The pull request has been closed.
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>
@@ @@ -2543,99 +2518,97 @@ View Comment: http://pr.org/comment @@
                 <tr>
                     <td height="30px" colspan="3"></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td>
 <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
     </tr>
         <tr>
             <td height="10px" colspan="3"></td>
         </tr>
         <tr>
             <td width="20px"></td>
             <td>
                     <div style="font-weight:600">
                         Status change:
                         Under Review
                     </div>
                     <div style="font-weight:600">
                         The pull request has been closed.
                     </div>
             </td>
             <td width="20px"></td>
         </tr>
         <tr>
             <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
         </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
     <tr>
         <td width="20px"></td>
         <td>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
  - and indented on second line</div></div>
             <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
     <tr>
         <td height="10px" colspan="3"></td>
     </tr>
 </table>
         </td>
     </tr>
     <tr>
         <td height="30px"></td>
     </tr>
     <tr>
         <td>
             <div>
                 Pull request from
                 <a style="color:#395fa0;text-decoration:none"
                    href="https://dev.org/repo">https://dev.org/repo</a>
                 branch
                 <span style="color:#395fa0">devbranch</span>
                 to
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
                 branch
                 <span style="color:#395fa0">trunk</span>:
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
                    href="http://pr.org/7">#7</a>
                 "<span style="color:#395fa0">The Title</span>"
                 by
                 <span style="color:#395fa0">u2 u3 (u2)</span>.
             </div>
         </td>
     </tr>
     <tr>
         <td>
 <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
     <tr>
         <td height="25px"></td>
     </tr>
     <tr>
         <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
             <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
                 <center style="padding:11px 20px">
                     <font size="3">
                         <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                     </font>

kallithea/tests/other/test_libs.py

➞

Show inline comments

@@ @@ -263,132 +263,132 @@ class TestLibs(TestController): @@
         ('http://{netloc}/_{repoid}', 'group/repo1', {'user': 'username'}, '', 'http://vps1:8000/_23'),
         ('https://{user}@proxy1.example.com/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://username@proxy1.example.com/group/repo1'),
         ('https://{user}@proxy1.example.com/{repo}', 'group/repo1', {}, '', 'https://proxy1.example.com/group/repo1'),
         ('https://proxy1.example.com/{user}/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://proxy1.example.com/username/group/repo1'),
     ])
     def test_clone_url_generator(self, tmpl, repo_name, overrides, prefix, expected):
         from kallithea.lib.utils2 import get_clone_url
         clone_url = get_clone_url(uri_tmpl=tmpl, qualified_home_url='http://vps1:8000'+prefix,
                                   repo_name=repo_name, repo_id=23, **overrides)
         assert clone_url == expected
     def _quick_url(self, text, tmpl="""<a class="revision-link" href="%s">%s</a>""", url_=None):
         """
         Changes `some text url[foo]` => `some text <a href="/">foo</a>
         :param text:
         """
         import re
         # quickly change expected url[] into a link
         URL_PAT = re.compile(r'(?:url\[)(.+?)(?:\])')
         def url_func(match_obj):
             _url = match_obj.groups()[0]
             return tmpl % (url_ or '/some-url', _url)
         return URL_PAT.sub(url_func, text)
     @parametrize('sample,expected', [
       ("",
        ""),
       ("git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68",
        """git-svn-id: <a href="https://svn.apache.org/repos/asf/libcloud/trunk@1441655">https://svn.apache.org/repos/asf/libcloud/trunk@1441655</a> 13f79535-47bb-0310-9956-ffa450edef68"""),
       ("from rev 000000000000",
        """from rev url[000000000000]"""),
       ("from rev 000000000000123123 also rev 000000000000",
        """from rev url[000000000000123123] also rev url[000000000000]"""),
       ("this should-000 00",
        """this should-000 00"""),
       ("longtextffffffffff rev 123123123123",
        """longtextffffffffff rev url[123123123123]"""),
       ("rev ffffffffffffffffffffffffffffffffffffffffffffffffff",
        """rev ffffffffffffffffffffffffffffffffffffffffffffffffff"""),
       ("ffffffffffff some text traalaa",
        """url[ffffffffffff] some text traalaa"""),
        ("""Multi line
        123123123123
        some text 123123123123
        sometimes !
        """,
        """Multi line\n"""
        """       url[123123123123]\n"""
        """       some text url[123123123123]\n"""
        """Multi line<br/>"""
        """       url[123123123123]<br/>"""
        """       some text url[123123123123]<br/>"""
        """       sometimes !"""),
     ])
     def test_urlify_changesets(self, sample, expected):
         def fake_url(self, *args, **kwargs):
             return '/some-url'
         expected = self._quick_url(expected)
         with mock.patch('pylons.url', fake_url):
             from kallithea.lib.helpers import urlify_text
             assert urlify_text(sample, 'repo_name') == expected
     @parametrize('sample,expected,url_', [
       ("",
        "",
        ""),
       ("https://svn.apache.org/repos",
        """url[https://svn.apache.org/repos]""",
        "https://svn.apache.org/repos"),
       ("http://svn.apache.org/repos",
        """url[http://svn.apache.org/repos]""",
        "http://svn.apache.org/repos"),
       ("from rev a also rev http://google.com",
        """from rev a also rev url[http://google.com]""",
        "http://google.com"),
       ("http://imgur.com/foo.gif inline http://imgur.com/foo.gif ending http://imgur.com/foo.gif",
        """url[http://imgur.com/foo.gif] inline url[http://imgur.com/foo.gif] ending url[http://imgur.com/foo.gif]""",
        "http://imgur.com/foo.gif"),
       ("""Multi line
        https://foo.bar.example.com
        some text lalala""",
        """Multi line\n"""
        """       url[https://foo.bar.example.com]\n"""
        """Multi line<br/>"""
        """       url[https://foo.bar.example.com]<br/>"""
        """       some text lalala""",
        "https://foo.bar.example.com"),
       ("@mention @someone",
        """<b>@mention</b> <b>@someone</b>""",
        ""),
       ("deadbeefcafe 123412341234",
        """<a class="revision-link" href="/repo_name/changeset/deadbeefcafe">deadbeefcafe</a> <a class="revision-link" href="/repo_name/changeset/123412341234">123412341234</a>""",
        ""),
       # tags are covered by test_tag_extractor
     ])
     def test_urlify_test(self, sample, expected, url_):
         from kallithea.lib.helpers import urlify_text
         expected = self._quick_url(expected,
                                    tmpl="""<a href="%s">%s</a>""", url_=url_)
         assert urlify_text(sample, 'repo_name', stylize=True) == expected
     @parametrize('sample,expected', [
       ("deadbeefcafe @mention, and http://foo.bar/ yo",
        """<a class="message-link" href="#the-link"></a>"""
        """<a class="revision-link" href="/repo_name/changeset/deadbeefcafe">deadbeefcafe</a>"""
        """<a class="message-link" href="#the-link"> <b>@mention</b>, and </a>"""
        """<a href="http://foo.bar/">http://foo.bar/</a>"""
        """<a class="message-link" href="#the-link"> yo</a>"""),
     ])
     def test_urlify_link(self, sample, expected):
         from kallithea.lib.helpers import urlify_text
         assert urlify_text(sample, 'repo_name', link_='#the-link') == expected
     @parametrize('test,expected', [
       ("", None),
       ("/_2", '2'),
       ("_2", '2'),
       ("/_2/", '2'),
       ("_2/", '2'),
       ("/_21", '21'),
       ("_21", '21'),
       ("/_21/", '21'),
       ("_21/", '21'),
       ("/_21/foobar", '21'),
       ("_21/121", '21'),
       ("/_21/_12", '21'),
       ("_21/prefix/foo", '21'),
     ])
     def test_get_repo_by_id(self, test, expected):
         from kallithea.lib.utils import _extract_id_from_repo_name
         _test = _extract_id_from_repo_name(test)

0 comments (0 inline, 0 general)