? drush-wrapper.sh
? restart-apache.sh
? includes/table.inc
Index: includes/drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v
retrieving revision 1.114
diff -u -F '^f' -r1.114 drush.inc
--- includes/drush.inc	27 May 2010 15:40:25 -0000	1.114
+++ includes/drush.inc	27 May 2010 22:54:33 -0000
@@ -1224,6 +1224,11 @@ function drush_do_multiple_command($comm
 function drush_do_site_command($site_record, $command, $args = array(), $data = array(), $integrate = FALSE) {
   $values = NULL;
   if (!empty($site_record)) {
+    foreach ($site_record as $key => $value) {
+      if (!isset($data[$key]) && !in_array($key, drush_sitealias_site_selection_keys())) {
+        $data[$key] = $site_record[$key];
+      }
+    }
     // Pass the root and uri parameters from the site alias
     $data['root'] = $site_record['root'];
     $data['uri'] = $site_record['uri'];
@@ -1274,8 +1279,12 @@ function drush_do_command_redispatch($co
  * parameter when doing a redispatch.
  */
 function drush_redispatch_get_options() {
-  // Start off by taking everything from the command line ('options' context)
-  $options = drush_get_context('options');
+  // Start off by taking everything from the site alias and command line
+  // ('options' context)
+  $options = array_merge(drush_get_context('alias'), drush_get_context('options'));
+  $options = array_diff_key($options, array_flip(drush_sitealias_site_selection_keys()));
+  unset($options['command-specific']);
+  unset($options['path-aliases']);
   // If we can parse the current command, then examine all contexts
   // in order for any option that is directly related to the current command
   $command = drush_parse_command();
@@ -1296,7 +1305,6 @@ function drush_redispatch_get_options() 
   return $options;
 }
 
-
 /**
  * @} End of "defgroup dispatching".
  */
Index: includes/sitealias.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/sitealias.inc,v
retrieving revision 1.42
diff -u -F '^f' -r1.42 sitealias.inc
--- includes/sitealias.inc	20 Apr 2010 16:10:23 -0000	1.42
+++ includes/sitealias.inc	27 May 2010 22:54:33 -0000
@@ -1472,3 +1472,9 @@ function drush_sitealias_evaluate_path($
   return $site_alias_settings;
 }
 
+/**
+ * Option keys used for site selection.
+ */
+function drush_sitealias_site_selection_keys() {
+  return array('remote-host', 'remote-user', 'uri', 'root', 'name');
+}