Changeset 14253

Timestamp:

12/10/2024 06:27:34 AM (14 months ago)

Author:

dd32

Message:

Plugin Directory: Allow the plugin management user commits to be imported into the Plugin Directory.

This allows for automated commits from the plugin directory to be processed as normal, while still skipping over irrelevant items.

See ​https://github.com/WordPress/wordpress.org/pull/343.
See #7783.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• admin/class-status-transitions.php (modified) (1 diff)
• cli/class-svn-watcher.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php

@@ -276 +276 @@
             'http://plugins.svn.wordpress.org/' . $post->post_name,
             sprintf(
+                // WARNING: When changing this, please update the regex in SVN_Watcher::get_plugin_changes_between().
                 'Adding %1$s by %2$s.',
                 html_entity_decode( $post->post_title ),

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-svn-watcher.php

@@ -67 +67 @@
      */
     protected function get_plugin_changes_between( $rev, $head_rev = 'HEAD' ) {
-
         $logs = SVN::log( self::SVN_URL, array( $rev, $head_rev ) );
         if ( $logs['errors'] ) {
@@ -95 +94 @@
 
         foreach ( $logs['log'] as $log ) {
-            // Discard automated changes, these should not trigger plugin imports
-            if ( defined( 'PLUGIN_SVN_MANAGEMENT_USER' ) && PLUGIN_SVN_MANAGEMENT_USER == $log['author'] ) {
-                continue;
+            // Discard some commits from the plugin management user.
+            if (
+                defined( 'PLUGIN_SVN_MANAGEMENT_USER' ) &&
+                PLUGIN_SVN_MANAGEMENT_USER == $log['author']
+            ) {
+                /*
+                 * If the commit matches the "new repo created" message, we'll skip it.
+                 *
+                 * See Status_Transitions::approved_create_svn_repo()
+                 */
+                if ( preg_match( '/^Adding (.+) by (.+)\.$/i', $log['msg'] ) ) {
+                    continue;
+                }
+
+                /*
+                 * If the commit includes an "Author:" byline, we'll use that as the actual author.
+                 * This can be used for automated commits that are made on behalf of a user.
+                 */
+                if ( preg_match( '/^Author: (.+)\.$/im', $log['msg'], $matches ) ) {
+                    $log['author'] = $matches[1];
+                }
             }