<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[9531] sites/trunk: Trac: Github PRs: Include the PR bodytext in the Trac notification.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9531">9531</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9531","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-02-24 06:28:21 +0000 (Mon, 24 Feb 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Trac: Github PRs: Include the PR bodytext in the Trac notification.
This should help include some more context in the PRs and also make it easier to keep all pertitant information in one place (Trac).
See <a href="http://meta.trac.wordpress.org/ticket/5054">#5054</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgtracprfunctionsphp">sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgtracprwebhookphp">sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php</a></li>
<li><a href="#sitestrunktracwordpressorgtemplatessitehtml">sites/trunk/trac.wordpress.org/templates/site.html</a></li>
<li><a href="#sitestrunktracwordpressorgtemplatesticket_changehtml">sites/trunk/trac.wordpress.org/templates/ticket_change.html</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletracwptraccss">sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgtracprfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php 2020-02-21 17:14:37 UTC (rev 9530)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php 2020-02-24 06:28:21 UTC (rev 9531)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated_at' => $data->updated_at,
</span><span class="cx" style="display: block; padding: 0 10px"> 'closed_at' => $data->closed_at,
</span><span class="cx" style="display: block; padding: 0 10px"> 'mergeable_state' => $data->mergeable_state,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'body' => $data->body,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user' => (object) [
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $data->user->html_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $data->user->login,
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgtracprwebhookphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php 2020-02-21 17:14:37 UTC (rev 9530)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php 2020-02-24 06:28:21 UTC (rev 9531)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove the specific Trac Ticket and PR Body from the DB version.
</ins><span class="cx" style="display: block; padding: 0 10px"> $_pr_data_no_ticket = clone $pr_data;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_pr_data_no_ticket->trac_ticket );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $_pr_data_no_ticket->trac_ticket, $_pr_data_no_ticket->body );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Step 3. If not in DB, or $pr_data->trac_ticket isn't yet in the DB, add a new row of it.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $pr_data->trac_ticket && ( ! $existing_refs || ! $matched_existing_ref ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +83,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pr_data->trac_ticket[1],
</span><span class="cx" style="display: block; padding: 0 10px"> "''This ticket was mentioned in [{$pr_data->html_url} PR #{$pr_number}] " .
</span><span class="cx" style="display: block; padding: 0 10px"> "on [https://github.com/{$pr_repo}/ {$pr_repo}] " .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "by [{$pr_data->user->url} {$pr_data->user->name}].''"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "by [{$pr_data->user->url} {$pr_data->user->name}].''" .
+ ( trim( $pr_data->body ) ? "\n{$pr_data->body}" : '' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunktracwordpressorgtemplatessitehtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/trac.wordpress.org/templates/site.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/trac.wordpress.org/templates/site.html 2020-02-21 17:14:37 UTC (rev 9530)
+++ sites/trunk/trac.wordpress.org/templates/site.html 2020-02-24 06:28:21 UTC (rev 9531)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> py:strip="">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?python
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- scripts_version = '134'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scripts_version = '135'
</ins><span class="cx" style="display: block; padding: 0 10px"> project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
</span><span class="cx" style="display: block; padding: 0 10px"> wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'
</span><span class="cx" style="display: block; padding: 0 10px"> is_bug_gardener = 'TICKET_EDIT_DESCRIPTION' in perm(resource)
</span></span></pre></div>
<a id="sitestrunktracwordpressorgtemplatesticket_changehtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/trac.wordpress.org/templates/ticket_change.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/trac.wordpress.org/templates/ticket_change.html 2020-02-21 17:14:37 UTC (rev 9530)
+++ sites/trunk/trac.wordpress.org/templates/ticket_change.html 2020-02-24 06:28:21 UTC (rev 9531)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </py:def>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <py:choose>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<py:when test="'author' in change and ('slackbot' == change.author or 'ircbot' == change.author or ( 'prbot' == change.author and change.comment.startswith('\'\'') ) )"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<py:when test="'author' in change and ('slackbot' == change.author or 'ircbot' == change.author)"
</ins><span class="cx" style="display: block; padding: 0 10px"> py:with="wporg_user = wporg_sanitize_user_nicename(change.author)" >
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="change chat-bot">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="avatar" py:if="change">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,6 +53,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px"> </py:when>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<py:when test="'author' in change and 'prbot' == change.author and change.comment.startswith('\'\'')"
+ py:with="
+ wporg_user = wporg_sanitize_user_nicename(change.author);
+ pr_byline = change.comment.partition('\n')[0];
+ pr_comment = ''.join(change.comment.partition('\n')[1:]) or False;
+ prbot_class = 'prbot with-context' if pr_comment else 'prbot without-context';
+ ">
+ <h3 class="change chat-bot ${prbot_class}">
+ <span class="avatar">
+ <span class="username-line">
+ <img src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&s=96 2x" height="48" width="48" />
+ ${wiki_to_html(context, pr_byline, escape_newlines=preserve_newlines)}
+ </span>
+ <br /><span class="time-ago">${dateinfo(change.date)} ago</span>
+ </span>
+ </h3>
+ <div py:if="pr_comment" class="comment searchable" xml:space="preserve">
+ ${wiki_to_html(context, pr_comment, escape_newlines=preserve_newlines)}
+ </div>
+</py:when>
</ins><span class="cx" style="display: block; padding: 0 10px"> <py:otherwise>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="change">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlstyletracwptraccss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css 2020-02-21 17:14:37 UTC (rev 9530)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css 2020-02-24 06:28:21 UTC (rev 9531)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,6 +880,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0 11px 1px 1em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#changelog h3.change.prbot.with-context {
+ color: inherit;
+ margin: 1em -1em;
+ border: 1px;
+ border-bottom: none;
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> #changelog h3.change:after,
</span><span class="cx" style="display: block; padding: 0 10px"> #ticketchange h3.change:after {
</span><span class="cx" style="display: block; padding: 0 10px"> content: "";
</span></span></pre>
</div>
</div>
</body>
</html>