<!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>[11370] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin: SVN Watcher: Reports: Add an 'unknown props' report, simpler view to scan for known typos.</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/11370">11370</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/11370","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-12-14 05:20:19 +0000 (Tue, 14 Dec 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'>SVN Watcher: Reports: Add an 'unknown props' report, simpler view to scan for known typos.
See <a href="http://meta.trac.wordpress.org/ticket/5978">#5978</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcheradminlisttablephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/list-table.php</a></li>
<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_htmlwpcontentpluginswporgtracwatcheradminreportspagephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/reports-page.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcheradminlisttablephp"></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/list-table.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/list-table.php 2021-12-14 04:39:01 UTC (rev 11369)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/list-table.php 2021-12-14 05:20:19 UTC (rev 11370)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT revision,user_id,prop_name
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$props_table}
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE revision IN({$revisions})
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ORDER BY LENGTH(prop_name) DESC"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ORDER BY user_id IS NULL DESC, LENGTH(prop_name) DESC"
</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 ( $this->items as $i => $details ) {
</span></span></pre></div>
<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 2021-12-14 04:39:01 UTC (rev 11369)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/post.php 2021-12-14 05:20:19 UTC (rev 11370)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,8 +37,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete(
</span><span class="cx" style="display: block; padding: 0 10px"> $svn['props_table'],
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => $the_prop->id,
- 'revision' => $rev,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => $the_prop->id,
+ 'revision' => $rev,
</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"> } elseif ( 'edit' === $action && $the_prop ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</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"> 'prop_name' => $the_prop->prop_name,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_id' => null
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_id' => null
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,6 +108,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user,
</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">+
+ // Update any other occurences of this typo.
+ $wpdb->update(
+ $svn['props_table'],
+ [
+ 'user_id' => $user,
+ ],
+ [
+ 'prop_name' => $prop_name,
+ 'user_id' => null
+ ]
+ );
</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"> // Output the replacement `<td>`'s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,25 +151,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> die( -1 );
</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">- // Remove the props for the commit first.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reparse
+ $raw_props = Props\from_log( $details->message );
+
+ // Fetch all the user_id's
+ $props = [];
+ foreach ( $raw_props as $prop ) {
+ $props[ $prop ] = Props\find_user_id( $prop, $svn );
+ }
+
+ // Remove the props for the commit, after reparsing. This is so that any usernames only corrected within that commit get picked up.
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete(
</span><span class="cx" style="display: block; padding: 0 10px"> $svn['props_table'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [
- 'revision' => $rev
- ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ 'revision' => $rev ]
</ins><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">- // Reparse
- $props = Props\from_log( $details->message );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Reinsert
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $props as $prop ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $props as $prop => $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'revision' => $rev,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prop_name' => $prop,
</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">- $user_id = Props\find_user_id( $prop, $svn );
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['user_id'] = $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcheradminreportspagephp"></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/reports-page.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/reports-page.php 2021-12-14 04:39:01 UTC (rev 11369)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/reports-page.php 2021-12-14 05:20:19 UTC (rev 11370)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,6 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="<?php echo $url; ?>&what=committers">All Committers matching filter</a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="<?php echo $url; ?>&what=cloud">Cloud of Props matching filter</a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="<?php echo $url; ?>&what=typos">Props typos matching filter</a></li>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a href="<?php echo $url; ?>&what=unknown-props">Unknown Props/typos matching filter</a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li><a href="<?php echo $url; ?>&what=raw-contributors-and-committers">All Props+Committers matching filter grouped together</a></li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $is_core ) { ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,6 +354,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</table>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'unknown-props':
+ $details = $wpdb->get_results(
+ "SELECT p.prop_name,
+ COUNT( * ) as count,
+ GROUP_CONCAT( p.revision ORDER BY p.revision ASC ) as revisions
+ FROM {$details['props_table']} p
+ LEFT JOIN {$details['rev_table']} r ON p.revision = r.id
+ WHERE $where AND p.user_id IS NULL
+ GROUP BY p.prop_name
+ ORDER BY r.id DESC"
+ );
+
+ echo '<table class="widefat striped">';
+ echo '<thead><tr><th>Prop</th><th>Count</th><th>Revisions</th></tr></thead>';
+ foreach ( $details as $c ) {
+ $link = add_query_arg(
+ [
+ 'page' => str_replace( 'reports', 'edit', $_REQUEST['page'] ),
+ 'revisions' => $c->revisions
+ ],
+ admin_url( 'admin.php' )
+ );
+ printf(
+ '<tr><td>%s</td><td>%s</td><td><a href="%s">%s</a></td></tr>',
+ esc_html( $c->prop_name ),
+ $c->count,
+ $link,
+ '[' . str_replace( ',', '] [', $c->revisions ) . ']'
+ );
+ }
+ echo '</table>';
+
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'raw-contributors-and-committers':
</span><span class="cx" style="display: block; padding: 0 10px"> $details = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT prop_name, ID, user_nicename, display_name, _groupby, SUM(_count) as count FROM (
</span></span></pre>
</div>
</div>
</body>
</html>