<!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>[11305] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Slack Firehose: Include the commit message into the Slack logging when it's not an automated commit.</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/11305">11305</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/11305","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>2021-11-02 07:25:50 +0000 (Tue, 02 Nov 2021)</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'>Theme Directory: Slack Firehose: Include the commit message into the Slack logging when it's not an automated commit.
See <a href="http://meta.trac.wordpress.org/ticket/5899">#5899</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryjobsclasssvnimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/jobs/class-svn-import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp"></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/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-11-02 07:15:12 UTC (rev 11304)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-11-02 07:25:50 UTC (rev 11305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,6 +139,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $importing_from = 'upload';
</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">+ * The SVN commit message, if user defined.
+ *
+ * @var string
+ */
+ protected $commit_msg = '';
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * The list of headers to extract from readme.txt.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,6 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->version_status = 'new';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->importing_from = 'upload';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->commit_msg = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $this->tmp_dir = ''; // Temporary folder per each instance of this class. Doesn't need to be reset each time.
</span><span class="cx" style="display: block; padding: 0 10px"> // $this->trac = false; // This can stay active, Trac access won't change between calls.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,11 +229,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $author The SVN author if known. Optional.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return true|WP_Error See ::import() for error conditions.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function process_update_from_svn( $slug, $version, $changeset = 0, $author = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function process_update_from_svn( $slug, $version, $changeset = 0, $author = '', $commit_message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->reset_properties();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->importing_from = 'svn';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_slug = $slug;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->commit_msg = $commit_message;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check out from SVN.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->create_tmp_dirs( $slug . '.' . $version );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1763,6 +1772,13 @@
</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">+ if ( $this->commit_msg ) {
+ $fields[] = [
+ 'type' => 'mrkdwn',
+ 'text' => "*Commit Message:*\n{$this->commit_msg}",
+ ];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $blocks[] = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'section',
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => [
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryjobsclasssvnimportphp"></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/wp-content/plugins/theme-directory/jobs/class-svn-import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/jobs/class-svn-import.php 2021-11-02 07:15:12 UTC (rev 11304)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/jobs/class-svn-import.php 2021-11-02 07:25:50 UTC (rev 11305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,8 +70,8 @@
</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"> $changeset = (int) $element->xpath( '@revision' )[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = (string) $element->xpath( 'author' )[0];
- $msg = (string) $element->xpath( 'msg' )[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = trim( (string) $element->xpath( 'author' )[0] );
+ $msg = trim( (string) $element->xpath( 'msg' )[0] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $info = compact( 'slug', 'version', 'changeset', 'author', 'msg' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['slug'],
</span><span class="cx" style="display: block; padding: 0 10px"> $args['version'],
</span><span class="cx" style="display: block; padding: 0 10px"> $args['changeset'] ?? false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['author'] ?? false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['author'] ?? false,
+ $args['msg'] ?? ''
</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"> // TODO: Look at error result code, maybq re-queue in event of system issue, else email author with concerns (Theme Check, etc)
</span></span></pre>
</div>
</div>
</body>
</html>