? includes/table.inc
Index: commands/sql/sync.sql.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/sql/sync.sql.inc,v
retrieving revision 1.14
diff -u -p -r1.14 sync.sql.inc
--- commands/sql/sync.sql.inc	29 Jan 2010 06:14:26 -0000	1.14
+++ commands/sql/sync.sql.inc	23 Feb 2010 06:10:02 -0000
@@ -114,27 +114,12 @@ function _drush_sql_sync($source, $desti
       // and the normal confirmation below.
       if (array_key_exists('site-list', $destination_settings)) {
 
-        drush_print(dt('You are about to use the experimental MULTIPLE-TARGET drush sql-sync feature.'));
-        drush_print(dt('This code is new; please be careful (make backups), and use at your own risk!'));
-
         drush_print(dt('You are about to sync the database from !source, overwriting all of the following targets:', array('!source' => $source)));
         foreach ($destination_settings['site-list'] as $one_destination) {
           drush_print(dt('  !target', array('!target' => $one_destination)));
         }
 
-        // Temporary: ask what the user wants to do
-        // Once this code works, we'll replace this with a
-        // simple 'drush_confirm', so -y will work.
-        // You must manually confirm every time until this
-        // code is tested.  Help out at issue #628996
-        // if this is annoying to you.
-
-        $options['s'] = 'Run simulation first (add -s flag)';
-        $options['g'] = 'Go!';
-        $choice = drush_choice($options, 'Enter a number to choose which action to take.');
-
-        if ($choice === FALSE) {
-           // TODO:  When this is just drush_confirm, merge in with the code below.
+        if (drush_confirm('Continue? ') === FALSE) {
            drush_die('Aborting.');
         }
         if ($choice != 'g') {
Index: includes/drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v
retrieving revision 1.89
diff -u -p -r1.89 drush.inc
--- includes/drush.inc	23 Feb 2010 03:30:45 -0000	1.89
+++ includes/drush.inc	23 Feb 2010 06:10:03 -0000
@@ -942,37 +942,20 @@ function drush_remote_command() {
     $args = drush_get_arguments();
 
     if (!drush_get_context('DRUSH_SIMULATE')) {
-      drush_print(dt('You are about to use the experimental MULTIPLE-TARGET drush command feature.'));
-      drush_print(dt('This code is new; please be careful (make backups), and use at your own risk!'));
-
       drush_print(dt("You are about to execute '!command' on all of the following targets:", array('!command' => implode(" ", $args))));
       foreach ($site_list as $one_destination) {
         drush_print(dt('  !target', array('!target' => $one_destination)));
       }
 
-      // Temporary: ask what the user wants to do
-      // Once this code works, we'll replace this with a
-      // simple 'drush_confirm', so -y will work.
-      // You must manually confirm every time until this
-      // code is tested.  Help out at issue #628996
-      // if this is annoying to you.
-
-      $options['s'] = 'Run simulation first (add -s flag)  WARNING: ignored by some commands!';
-      $options['g'] = 'Go!';
-      $choice = drush_choice($options, 'Enter a number to choose which action to take.');
-
-      if ($choice === FALSE) {
+      if (drush_confirm('Continue? ') === FALSE) {
          drush_die('Aborting.');
       }
-      if ($choice != 'g') {
-        drush_set_option('s', TRUE, 'options');
-        drush_set_context('DRUSH_SIMULATE', TRUE);
-      }
     }
     $command = array_shift($args);
 
     foreach ($site_list as $site_spec) {
-      drush_do_site_command(_drush_sitealias_get_record($site_spec), $command, $args);
+      $values = drush_do_site_command(_drush_sitealias_get_record($site_spec), $command, $args);
+      drush_print($values['output']);
     }
     return TRUE;
   }
@@ -1012,10 +995,7 @@ function drush_do_multiple_command($comm
     drush_print($destination_path);
 
     if (!drush_get_context('DRUSH_SIMULATE')) {
-      drush_print(dt('You are about to use the experimental MULTIPLE-SYNCHRONIZED-TARGET drush !command feature.', array('!command' => $command)));
-      drush_print(dt('This code is new; please be careful (make backups), and use at your own risk!'));
-
-      drush_print(dt('You are about to rsync between all of the following targets:'));
+      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];
@@ -1023,24 +1003,9 @@ function drush_do_multiple_command($comm
         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)));
       }
 
-      // Temporary: ask what the user wants to do
-      // Once this code works, we'll replace this with a
-      // simple 'drush_confirm', so -y will work.
-      // You must manually confirm every time until this
-      // code is tested.  Help out at issue #628996
-      // if this is annoying to you.
-
-      $options['s'] = 'Run simulation first (add -s flag)';
-      $options['g'] = 'Go!';
-      $choice = drush_choice($options, 'Enter a number to choose which action to take.');
-
-      if ($choice === FALSE) {
+      if (drush_confirm('Continue? ') === FALSE) {
          drush_die('Aborting.');
       }
-      if ($choice != 'g') {
-        drush_set_option('s', TRUE, 'options');
-        drush_set_context('DRUSH_SIMULATE', TRUE);
-      }
     }
 
     $data = drush_redispatch_get_options();