<!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>[12271] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher: Make: Trac Props editor: Only run the 'last ditch effort' prop extraction regexes on older commits.</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/12271">12271</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/12271","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>2022-11-23 04:37:42 +0000 (Wed, 23 Nov 2022)</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'>Make: Trac Props editor: Only run the 'last ditch effort' prop extraction regexes on older commits.
This prevents commit messages (such as this one) where `Props` is included inline from being triggered by 'Props editor:', or where a sync commit has "from GitHub" included in the commit message..
These rules were primarily only required for initial import of rather old commits, where the commit message structure was much more varied and not at al structured.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcheradminpostphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/post.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcherpropsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/props.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatchersvnphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/svn.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcheradminpostphp"></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/wporg-trac-watcher/admin/post.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/wporg-trac-watcher/admin/post.php 2022-11-23 04:21:15 UTC (rev 12270)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/post.php 2022-11-23 04:37:42 UTC (rev 12271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,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"> // Reparse
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $raw_props = Props\from_log( $details->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $include_old = strtotime( $details->date ) < strtotime( '2020-01-01' );
+ $raw_props = Props\from_log( $details->message, $include_old );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch all the user_id's
</span><span class="cx" style="display: block; padding: 0 10px"> $props = [];
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcherpropsphp"></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/wporg-trac-watcher/props.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/wporg-trac-watcher/props.php 2022-11-23 04:21:15 UTC (rev 12270)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/props.php 2022-11-23 04:37:42 UTC (rev 12271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Trac\Watcher\Props;
</span><span class="cx" style="display: block; padding: 0 10px"> use function WordPressdotorg\Trac\Watcher\SVN\get_svns;
</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 from_log( $log ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Parse a log message and extract the props.
+ *
+ * The $include_old parameter can be used to run much more lenient matchers against the log, if the primary prop regexes
+ * do not match. These are mostly from the early days of commits when they were less structured, but can have a higher
+ * false-positive match. Such as "updates from github".
+ *
+ * @param string $log The log message
+ * @param bool $include_old Whether to include the "really old matchers". See Note above.
+ * @return array
+ */
+function from_log( $log, $include_old = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $props = '\s*(?P<props>.+?)';
</span><span class="cx" style="display: block; padding: 0 10px"> $props_greedy = '\s*(?P<props>.+)';
</span><span class="cx" style="display: block; padding: 0 10px"> $props_short = '\s*(?P<props>\S{4,}((\s*and)?\s+\S{4,})?)'; // One or two words 4char+
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,8 +33,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ".{$sol}props([:]| to ) {$props_greedy}{$eol}", // `.` prefix is to ensure that the SOL is not the start of the message, to avoid triggering for https://meta.trac.wordpress.org/changeset/11790
</span><span class="cx" style="display: block; padding: 0 10px"> "([0-9]|\pP)\s+props([:]|\s+to)? {$props_one}( in .+)?(,|{$eol})",
</span><span class="cx" style="display: block; padding: 0 10px"> "{$sol}(h/t|hat tip:) {$props_short}{$eol}",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // These are starting to get real old... like three-digit core commit old..
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // These are starting to get real old... like three-digit core commit old.. only run when needed (See the $include_old parameter)
+ 'old' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> "with help from {$props}{$real_eol}",
</span><span class="cx" style="display: block; padding: 0 10px"> "\S\sprops([:]|\s+to)? {$props_short}{$eol}", // Inline props
</span><span class="cx" style="display: block; padding: 0 10px"> "\scredit(?! card)([:]|\sto)? {$props_short}", // Credit: ... or Credit to ...
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,6 +80,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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 ( ! $data && $include_old ) {
+ foreach ( $matchers['old'] as $regex ) {
+ if ( preg_match_all( '#' . $regex . '#im', $log, $m ) ) {
+ $data = array_merge( $data, $m['props'] );
+ break;
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $matchers['multiple'] as $regex ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match_all( '#' . $regex . '#im', $log, $m ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array_merge( $data, $m['props'] );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatchersvnphp"></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/wporg-trac-watcher/svn.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/wporg-trac-watcher/svn.php 2022-11-23 04:21:15 UTC (rev 12270)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/svn.php 2022-11-23 04:37:42 UTC (rev 12271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,8 +149,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $db_table, $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $props_table ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Only run the more lenient props matchers on 'older' commits. 2020 holds no significance.
+ $include_old = strtotime( $date ) < strtotime( '2020-01-01' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Look for the props in the commit.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $props = props_from_log( $msg );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $props = props_from_log( $msg, $include_old );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $props as $prop ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>