Changeset 13709

Timestamp:

05/16/2024 01:30:50 AM (4 months ago)

Author:

dd32

Message:

Plugin Directory: SVN: Watch for Tag deletions, such that we can properly handle cases when a tag is deleted.

See #3263, #5900.

Location:

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

Files:

• cli/class-svn-watcher.php (modified) (3 diffs)
• tools/class-svn.php (modified) (2 diffs)

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

@@ -105 +105 @@
                 $plugins[ $plugin_slug ] = array(
                     'tags_touched'   => array(), // trunk is a tag too!
+                    'tags_deleted'   => array(),
                     'readme_touched' => false, // minor optimization, only parse readme i18n on readme-related commits
                     'code_touched'   => false,
@@ -116 +117 @@
             $plugin['revisions'][] = $log['revision'];
             foreach ( $log['paths'] as $path ) {
-                $path_parts = explode( '/', trim( $path, '/' ) );
+                $path_parts  = explode( '/', trim( $path, '/' ) );
+                $is_deletion = ( isset( $log['actions'][ $path ] ) && 'D' === $log['actions'][ $path ] );
 
                 if ( ! isset( $path_parts[1] ) ) {
                     continue;
                 }
-
+        
                 if ( 'trunk' == $path_parts[1] ) {
                     $plugin['tags_touched'][] = 'trunk';
-
+        
                 } elseif ( 'tags' == $path_parts[1] && isset( $path_parts[2] ) ) {
-                    $plugin['tags_touched'][] = $path_parts[2];
+                    if ( $is_deletion && ! isset( $path_parts[3] ) /* not a file deletion */ ) {
+                        $plugin['tags_deleted'][] = $path_parts[2];
+                    } else {
+                        $plugin['tags_touched'][] = $path_parts[2];
+                    }
 
                 } elseif ( 'assets' == $path_parts[1] ) {
                     $plugin['assets_touched'] = true;
-
+        
                 }
 
@@ -141 +147 @@
                 }
             }
+
             $plugin['tags_touched'] = array_unique( $plugin['tags_touched'] );
         }

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

@@ -403 +403 @@
                 foreach ( $simple_xml->logentry as $entry ) {
                     $revision = (int) $entry->attributes()['revision'];
+                    $actions  = array();
                     $paths    = array();
 
                     foreach ( $entry->paths->children() as $child_path ) {
-                        $paths[] = (string) $child_path;
+                        $path   = (string) $child_path;
+                        $action = (string) ( $child_path->attributes()['action'] ?? 'M' );
+
+                        $paths[]          = $path;
+                        $actions[ $path ] = $action;
                     }
 
@@ -414 +419 @@
                         'date'     => strtotime( (string) $entry->date ),
                         'paths'    => $paths,
+                        'actions'  => $actions,
                         'message'  => (string) $entry->msg,
                     );