Changeset 10540

Timestamp:

12/21/2020 03:39:30 AM (4 years ago)

Author:

dd32

Message:

Theme Directory: Use svn cp during the theme import process for updates to reduce the diff size.

This is an attempt at making the diff between two versions of a theme upload visible on themes.trac again.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php (modified) (8 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -23 +23 @@
 
     /**
+     * Path to `cp` script.
+     *
+     * @var string
+     */
+    const CP = '/bin/cp';
+
+    /**
      * Path to `unzip` script.
      *
@@ -37 +44 @@
 
     /**
+     * Path to a temporary SVN checkout directory.
+     * 
+     * @var string
+     */
+    protected $tmp_svn_dir;
+
+    /**
      * Path to temporary theme folder.
      *
@@ -77 +91 @@
      */
     protected $trac_ticket;
+
+    /**
+     * Trac changeset.
+     * 
+     * @var string
+     */
+    protected $trac_changeset;
 
     /**
@@ -390 +411 @@
 
         // Create a directory with that unique name.
-        mkdir( $this->tmp_dir, 0777 );
+        mkdir( $this->tmp_dir );
+        chmod( $this->tmp_dir, 0777 );
 
         // Get a sanitized name for that theme and create a directory for it.
-        $base_name       = $this->get_sanitized_zip_name();
-        $this->theme_dir = "{$this->tmp_dir}/{$base_name}";
-        mkdir( $this->theme_dir, 0777 );
+        $base_name         = $this->get_sanitized_zip_name();
+        $this->theme_dir   = "{$this->tmp_dir}/{$base_name}";
+        $this->tmp_svn_dir = "{$this->tmp_dir}/svn";
+        mkdir( $this->theme_dir );
+        mkdir( $this->tmp_svn_dir );
+        chmod( $this->theme_dir, 0777 );
+        chmod( $this->tmp_svn_dir, 0777 );
 
         // Make sure we clean up after ourselves.
@@ -692 +718 @@
         $this->trac_ticket->diff_line = '';
         if ( ! empty( $this->theme_post->max_version ) ) {
-            $this->trac_ticket->diff_line = "\nDiff with previous version: https://themes.trac.wordpress.org/changeset?old_path={$this->theme_slug}/{$this->theme_post->max_version}&new_path={$this->theme_slug}/{$this->theme->display( 'Version' )}\n";
+            $this->trac_ticket->diff_line = "\nDiff with previous version: [{$this->trac_changeset}] https://themes.trac.wordpress.org/changeset?old_path={$this->theme_slug}/{$this->theme_post->max_version}&new_path={$this->theme_slug}/{$this->theme->display( 'Version' )}\n";
         }
 
@@ -801 +827 @@
 
             // Make sure the ticket has not yet been resolved.
-            if ( empty( $ticket[3]['resolution'] ) ) {
+            if ( $ticket && empty( $ticket[3]['resolution'] ) ) {
                 $result    = $this->trac->ticket_update( $ticket_id, $this->trac_ticket->description, array( 'summary' => $this->trac_ticket->summary, 'keywords' => implode( ' ', $this->trac_ticket->keywords ) ), true /* Trigger email notifications */ );
                 $ticket_id = $result ? $ticket_id : false;
@@ -903 +929 @@
     /**
      * Add theme files to SVN.
+     * 
+     * This attempts to do a SVN copy to allow for simpler diff views, but falls back to a svn import as an error condition.
      */
     public function add_to_svn() {
+        // Either new theme upload, or we don't have the needed variables to copy it directly.
+        if ( empty( $this->theme_post ) || empty( $this->theme_post->max_version ) ) {
+            return $this->add_to_svn_via_svn_import();
+        }
+
+        $new_version_dir = escapeshellarg( "{$this->tmp_svn_dir}/{$this->theme->display( 'Version' )}" );
+
+        // Theme exists, attempt to do a copy from old version to new.
+        exec( self::SVN . " co https://themes.svn.wordpress.org/{$this->theme_slug}/ {$this->tmp_svn_dir} --depth=empty  2>&1", $output, $return_var );
+        if ( $return_var > 0 ) {
+            return $this->add_to_svn_via_svn_import();
+        }
+
+        // Try to copy the previous version over.
+        $prev_version = escapeshellarg( "https://themes.svn.wordpress.org/{$this->theme_slug}/{$this->theme_post->max_version}" );
+        exec( self::SVN . " cp $prev_version $new_version_dir 2>&1", $output, $return_var );
+        if ( $return_var > 0 ) {
+            return $this->add_to_svn_via_svn_import();
+        }
+
+        // Remove the files from the old version, so that we can track file removals.
+        exec( self::RM . " -rf {$new_version_dir}/*" );
+
+        $theme_dir = escapeshellarg( $this->theme_dir );
+        exec( self::CP . " -R {$theme_dir}/* {$new_version_dir}" );
+
+        // Process file additions and removals.
+        exec( self::SVN . " st {$new_version_dir} | grep '^?' | cut -c 2- | xargs " . self::SVN . " add" );
+        exec( self::SVN . " st {$new_version_dir} | grep '^!' | cut -c 2- | xargs " . self::SVN . " rm" );
+
+        // Commit it to SVN.
+        $password = escapeshellarg( THEME_DROPBOX_PASSWORD );
+        $message  = escapeshellarg( sprintf(
+            __( 'New version of %1$s - %2$s', 'wporg-themes' ),
+            $this->theme->display( 'Name' ),
+            $this->theme->display( 'Version' )
+        ) );
+        exec( self::SVN . " ci --non-interactive --username themedropbox --password {$password} -m {$message} {$new_version_dir} 2>&1", $output, $return_var );
+        if ( $return_var > 0 ) {
+            return $this->add_to_svn_via_svn_import();
+        }
+
+        if ( preg_match( '/Committed revision (\d+)./i', implode( '', $output ), $m ) ) {
+            $this->trac_changeset = $m[1];
+        }
+
+        return true;
+    }
+
+    /**
+     * Add the theme files to SVN via svn import.
+     */
+    function add_to_svn_via_svn_import() {
         $import_msg = empty( $this->theme_post ) ?  __( 'New theme: %1$s - %2$s', 'wporg-themes' ) : __( 'New version of %1$s - %2$s', 'wporg-themes' );
         $import_msg = escapeshellarg( sprintf( $import_msg, $this->theme->display( 'Name' ), $this->theme->display( 'Version' ) ) );
@@ -914 +995 @@
         $result = exec( "{$svn} --non-interactive --username themedropbox --password {$password} --no-auto-props -m {$import_msg} import {$theme_path} {$svn_path} 2>&1" );
 
-        return ( false !== strpos( $result, 'Committed revision' ) );
+        if ( preg_match( '/Committed revision (\d+)./i', $result, $m ) ) {
+            $this->trac_changeset = $m[1];
+            return true;
+        }
+
+        return false;
     }