Merge pull request #976 from greg-1-anderson/remove-multiple

Remove drush rsync multiple-command

Author: weitzman

commands/core/rsync.core.inc

@@ -40,45 +40,40 @@ function drush_core_rsync($source, $destination, $additional_options = array())
     return drush_set_error('DRUSH_BAD_PATH', dt('Could not evaluate destination path !path.', array('!path' => $destination)));
   }
 
-  // Check to see if this is an rsync multiple command (multiple sources and multiple destinations)
-  $is_multiple = drush_do_multiple_command('rsync', $source_settings, $destination_settings, TRUE);
-
-  if ($is_multiple === FALSE) {
-    // If the user path is the same for the source and the destination, then
-    // always add a slash to the end of the source.  If the user path is not
-    // the same in the source and the destination, then you need to know how
-    // rsync paths work, and put on the trailing '/' if you want it.
-    if ($source_settings['user-path'] == $destination_settings['user-path']) {
-      $source_path .= '/';
-    }
-    // Prompt for confirmation. This is destructive.
-    if (!drush_get_context('DRUSH_SIMULATE')) {
-      drush_print(dt("You will destroy data from !target and replace with data from !source", array('!source' => $source_path, '!target' => $destination_path)));
-      if (!drush_confirm(dt('Do you really want to continue?'))) {
-        // was: return drush_set_error('CORE_SYNC_ABORT', 'Aborting.');
-        return drush_user_abort();
-      }
+  // If the user path is the same for the source and the destination, then
+  // always add a slash to the end of the source.  If the user path is not
+  // the same in the source and the destination, then you need to know how
+  // rsync paths work, and put on the trailing '/' if you want it.
+  if ($source_settings['user-path'] == $destination_settings['user-path']) {
+    $source_path .= '/';
+  }
+  // Prompt for confirmation. This is destructive.
+  if (!drush_get_context('DRUSH_SIMULATE')) {
+    drush_print(dt("You will destroy data from !target and replace with data from !source", array('!source' => $source_path, '!target' => $destination_path)));
+    if (!drush_confirm(dt('Do you really want to continue?'))) {
+      // was: return drush_set_error('CORE_SYNC_ABORT', 'Aborting.');
+      return drush_user_abort();
     }
+  }
 
-    // Exclude settings is the default only when both the source and
-    // the destination are aliases or site names.  Therefore, include
-    // settings will be the default whenever either the source or the
-    // destination contains a : or a /.
-    $include_settings_is_default = (strpos($source . $destination, ':') !== FALSE) || (strpos($source . $destination, '/') !== FALSE);
+  // Exclude settings is the default only when both the source and
+  // the destination are aliases or site names.  Therefore, include
+  // settings will be the default whenever either the source or the
+  // destination contains a : or a /.
+  $include_settings_is_default = (strpos($source . $destination, ':') !== FALSE) || (strpos($source . $destination, '/') !== FALSE);
 
-    $options = _drush_build_rsync_options($additional_options, $include_settings_is_default);
+  $options = _drush_build_rsync_options($additional_options, $include_settings_is_default);
 
-    // Get all of the args and options that appear after the command name.
-    $original_args = drush_get_original_cli_args_and_options();
-    foreach ($original_args as $original_option) {
-      if ($original_option{0} == '-') {
-        $options .= ' ' . $original_option;
-      }
+  // Get all of the args and options that appear after the command name.
+  $original_args = drush_get_original_cli_args_and_options();
+  foreach ($original_args as $original_option) {
+    if ($original_option{0} == '-') {
+      $options .= ' ' . $original_option;
     }
-
-    // Go ahead and call rsync with the paths we determined
-    return drush_core_exec_rsync($source_path, $destination_path, $options);
   }
+
+  // Go ahead and call rsync with the paths we determined
+  return drush_core_exec_rsync($source_path, $destination_path, $options);
 }
 
 /**

includes/drush.inc

@@ -1251,83 +1251,6 @@ function _drush_should_remove_command_arg($arg, $removal_list) {
   return FALSE;
 }
 
-/**
- * Used by functions that operate on lists of sites, moving
- * information from the source to the destination.  Currenlty
- * this includes 'drush rsync' and 'drush sql sync'.
- */
-function drush_do_multiple_command($command, $source_record, $destination_record, $allow_single_source = FALSE) {
-  $is_multiple_command = FALSE;
-
-  if ((($allow_single_source == TRUE) || array_key_exists('site-list', $source_record)) && array_key_exists('site-list', $destination_record)) {
-    $is_multiple_command = TRUE;
-    $source_path = array_key_exists('path-component', $source_record) ? $source_record['path-component'] : '';
-    $destination_path = array_key_exists('path-component', $destination_record) ? $destination_record['path-component'] : '';
-
-    $target_list = array_values(drush_sitealias_resolve_sitelist($destination_record));
-    if (array_key_exists('site-list', $source_record)) {
-      $source_list = array_values(drush_sitealias_resolve_sitelist($source_record));
-
-      if (drush_sitealias_check_lists_alignment($source_list, $target_list) === FALSE) {
-        if (array_key_exists('unordered-list', $source_record) || array_key_exists('unordered-list', $destination_record)) {
-          drush_sitelist_align_lists($source_list, $target_list, $aligned_source, $aligned_target);
-          $source_list = $aligned_source;
-          $target_list = $aligned_target;
-        }
-      }
-    }
-    else {
-      $source_list = array_fill(0, count($target_list), $source_record);
-    }
-
-    if (!drush_get_context('DRUSH_SIMULATE')) {
-      drush_print(dt('You are about to !command between all of the following targets:', array('!command' => $command)));
-      $i = 0;
-      foreach ($source_list as $one_source) {
-        $one_target = $target_list[$i];
-        ++$i;
-        drush_print(dt('  !source will overwrite !target', array('!source' => drush_sitealias_alias_record_to_spec($one_source) . $source_path, '!target' => drush_sitealias_alias_record_to_spec($one_target) . $destination_path)));
-      }
-
-      if (drush_confirm('Continue? ') === FALSE) {
-         return drush_user_abort();
-      }
-    }
-
-    $data = drush_redispatch_get_options();
-    $i = 0;
-    foreach ($source_list as $one_source) {
-      $one_target = $target_list[$i];
-      ++$i;
-
-      $source_spec = drush_sitealias_alias_record_to_spec($one_source);
-      $target_spec = drush_sitealias_alias_record_to_spec($one_target);
-
-      drush_log(dt('Begin do_multiple !command via backend invoke', array('!command' => $command)));
-      $values = drush_invoke_process('@self', $command, array($source_spec . $source_path, $target_spec . $destination_path), $data);
-      drush_log(dt('Backend invoke is complete'));
-    }
-  }
-
-  return $is_multiple_command;
-}
-
-/**
- * Run a command on the site specified by the provided command record.
- *
- * The standard function that provides this service is called
- * drush_invoke_process.  Please call the standard function.
- *
- * @param backend_options
- *   TRUE - integrate errors
- *   FALSE - do not integrate errors
- *   array - @see drush_backend_invoke_concurrent
- *
-function drush_do_site_command($site_record, $command, $args = array(), $command_options = array(), $backend_options = FALSE) {
-  return drush_invoke_process($site_record, $command, $args, $command_options, $backend_options);
-}
- */
-
 /**
  * Redispatch the specified command using the same
  * options that were passed to this invocation of drush.

includes/sitealias.inc

@@ -1069,59 +1069,6 @@ function drush_sitealias_resolve_sitelist($alias_record) {
   return $result_list;
 }
 
-/**
- * Check to see if the uri is the same in the source and target
- * lists for all items in the array.  This is a strong requirement
- * in D6; in D7, it is still highly convenient for the uri to
- * be the same, because the site folder name == the uri, and if
- * the uris match, then it is easier to rsync between remote machines.
- *
- * @param $source
- *   Array of source alias records
- * @param $target
- *   Array of target alias records to compare against source list
- * @return
- *   TRUE iff the uris of the sources and targets are in alignment
- */
-function drush_sitealias_check_lists_alignment($source, $target) {
-  $is_aligned = TRUE;
-
-  $i = 0;
-  foreach ($source as $one_source) {
-    if ((!isset($target[$i])) || (!_drush_sitelist_check_site_records($one_source, $target[$i]))) {
-      $is_aligned = FALSE;
-      break;
-    }
-    ++$i;
-  }
-
-  return $is_aligned;
-}
-
-/**
- * If the source and target lists contain alias records to the same
- * sets of sites, but in different orders, this routine will re-order
- * the lists so that they are in alignment.
- *
- * TODO:  Review the advisability of this operation.
- */
-function drush_sitelist_align_lists(&$source, &$target, &$source_result, &$target_result) {
-  $source_result = array();
-  $target_result = array();
-
-  foreach ($source as $key => $one_source) {
-    $one_target = _drush_sitelist_find_in_list($one_source, $target);
-    if ($one_target !== FALSE) {
-      $source_result[] = $one_source;
-      $target_result[] = $one_target;
-      unset($source[$key]);
-    }
-  }
-
-  $source = $source_result;
-  $target = $target_result;
-}
-
 function _drush_sitelist_find_in_list($one_source, &$target) {
   $result = FALSE;