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

Timestamp:

12/18/2024 06:25:51 AM (22 months ago)

Author:

dd32

Message:

Plugin Directory: SVN: Add SVN::copy().

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

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php (modified) (3 diffs)

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

@@ -446 +446 @@
          */
         public static function rename( $from, $to, $options = array() ) {
+                return SVN::_copy_rename_helper( 'mv', $from, $to, $options );
+        }
+
+        /**
+         * Copy a file or folder in a SVN checkout.
+         *
+         * @static
+         *
+         * @param string $source      The path of the file to copy. May be a URL.
+         * @param string $destination The path to copy the file to. May be a URL.
+         * @param array  $options  Optional. A list of options to pass to SVN. Default: empty array.
+         * @return array {
+         *    @type bool        $result   The result of the operation.
+         *    @type int         $revision The revision.
+         *    @type false|array $errors   Whether any errors or warnings were encountered.
+         * }
+         */
+        public static function copy( $from, $to, $options = array() ) {
+                return SVN::_copy_rename_helper( 'cp', $from, $to, $options = array() );
+        }
+
+        /**
+         * Helper function for copy and rename operations.
+         *
+         * @static
+         * @param string $svn_op  The SVN operation to perform. 'cp' or 'mv'.
+         * @param string $from    The path of the SVN folder to rename. May be a URL.
+         * @param string $to      The new path of the SVN folder. May be a URL.
+         * @param array  $options Optional. A list of options to pass to SVN. Default: empty array.
+         * @return array {
+         *    @type bool        $result   The result of the operation.
+         *    @type int         $revision The revision.
+         *    @type false|array $errors   Whether any errors or warnings were encountered.
+         * }
+         */
+        public static function _copy_rename_helper( $svn_op, $from, $to, $options = array() ) {
                 $options[] = 'non-interactive';
                 $is_url    = ( preg_match( '#https?://#i', $from ) && preg_match( '#https?://#i', $to ) );
@@ -452 +488 @@
                         // Set the message if not provided.
                         if ( ! isset( $options['message'] ) && ! isset( $options['m'] ) ) {
-                                $options['message'] = sprintf( "Rename %s to %s.", basename( $from ), basename( $to ) );
+                                $options['message'] = sprintf(
+                                        "%s %s to %s.",
+                                        'mv' === $svn_op ? 'Rename' : 'Copy',
+                                        basename( $from ),
+                                        basename( $to )
+                                );
                         }
 
@@ -463 +504 @@
                 $esc_options = self::parse_esc_parameters( $options );
 
+                $esc_op   = escapeshellarg( $svn_op );
                 $esc_from = escapeshellarg( $from );
                 $esc_to   = escapeshellarg( $to );
 
-                $output = self::shell_exec( "svn mv $esc_from $esc_to $esc_options 2>&1" );
+                $output = self::shell_exec( "svn $esc_op $esc_from $esc_to $esc_options 2>&1" );
                 if ( $is_url && preg_match( '/Committed revision (?P<revision>\d+)[.]/i', $output, $m ) ) {
                         $revision = (int) $m['revision'];