<!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>[10072] sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr: Trac: PRs: Transform Github comments to Trac syntax in addition to the PR description.</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/10072">10072</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/10072","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-07-16 01:38:46 +0000 (Thu, 16 Jul 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: PRs: Transform Github comments to Trac syntax in addition to the PR description.
This also converts links and images to Trac syntax.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5308">#5308</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>
</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-07-15 21:07:43 UTC (rev 10071)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php 2020-07-16 01:38:46 UTC (rev 10072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,19 +288,37 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Formats a PR description for usage on Trac.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Formats a PR description/comment for usage on Trac.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Strips standard boilerplate text
+ * - format_github_content_for_trac_comment();
+ *
+ * @param string $desc.
+ * @return string Converted PR Description
+ */
+function format_pr_desc_for_trac_comment( $desc ) {
+ $desc = trim( $desc );
+
+ // Remove the final line if it matches the specific boilerplate format.
+ $desc = preg_replace( "#---\r?\n\*\*.+\*\*$#", '', $desc );
+
+ return format_github_content_for_trac_comment( $desc );
+}
+
+/**
+ * Formats github content for usage on Trac.
+ *
+ * This:
</ins><span class="cx" style="display: block; padding: 0 10px"> * - Strips HTML comments
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - Strips standard boilerplate text
</del><span class="cx" style="display: block; padding: 0 10px"> * - Converts code blocks
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Converts image embeds
+ * - Converts links
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object $pr_data PR Data.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $desc.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Converted PR Description
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function format_pr_desc_for_trac_comment( $pr_data ) {
- $desc = trim( $pr_data->body );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function format_github_content_for_trac_comment( $desc ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove HTML comments
</span><span class="cx" style="display: block; padding: 0 10px"> $desc = preg_replace( '#<!--.+?-->#s', '', $desc );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,8 +325,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Convert Code blocks.
</span><span class="cx" style="display: block; padding: 0 10px"> $desc = preg_replace( '#```(.+?)```#s', '{{{$1}}}', $desc );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove the final line if it matches the specific boilerplate format.
- $desc = preg_replace( "#---\r?\n\*\*.+\*\*$#", '', $desc );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Convert Images (Must happen prior to Links, as the only difference is a preceeding !)
+ $desc = preg_replace( '#!\[(.+?)\]\((.+?)\)#', '[[Image($2)]]', $desc );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Convert Links.
+ $desc = preg_replace( '#\[(.+?)\]\((.+?)\)#', '[$2 $1]', $desc );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return trim( $desc );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-07-15 21:07:43 UTC (rev 10071)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php 2020-07-16 01:38:46 UTC (rev 10072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a mention to the Trac Ticket.
</span><span class="cx" style="display: block; padding: 0 10px"> $trac = get_trac_instance( $pr_data->trac_ticket[0] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pr_description = format_pr_desc_for_trac_comment( $pr_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pr_description = format_pr_desc_for_trac_comment( $pr_data->body );
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update ticket keywords if possible.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $payload->comment->user->login,
</span><span class="cx" style="display: block; padding: 0 10px"> $payload->comment->html_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'PR #' . $payload->issue->number,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $payload->comment->body
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ format_github_content_for_trac_comment( $payload->comment->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"> foreach ( $tickets as $t ) {
</span></span></pre>
</div>
</div>
</body>
</html>