? .drush-cache.info
? includes/table.inc
Index: commands/sql/sql.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/sql/sql.drush.inc,v
retrieving revision 1.88
diff -u -p -r1.88 sql.drush.inc
--- commands/sql/sql.drush.inc	30 Dec 2010 18:28:08 -0000	1.88
+++ commands/sql/sql.drush.inc	30 Dec 2010 21:56:10 -0000
@@ -389,7 +389,7 @@ function drush_sql_build_dump_command($t
  *   found, or an empty array if there were no matches.
  */
 function _drush_sql_get_table_list($option_name) {
-  foreach(array('' => 'options', 'target-,,source-' => NULL) as $prefix_list => $context) {
+  foreach(array('' => 'cli', 'target-,,source-' => NULL) as $prefix_list => $context) {
     foreach(explode(',',$prefix_list) as $prefix) {
       $key_list = drush_get_option($prefix . $option_name . '-key', NULL, $context);
       foreach(explode(',', $key_list) as $key) {
Index: docs/context.html
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/docs/context.html,v
retrieving revision 1.1
diff -u -p -r1.1 context.html
--- docs/context.html	12 Dec 2010 00:12:26 -0000	1.1
+++ docs/context.html	30 Dec 2010 21:56:10 -0000
@@ -47,7 +47,7 @@ an option was different before the curre
 Specified by the script itself :
 <ul>
 <li>process  : Generated in the current process.
-<li>options  : Passed as --option=value to the command line.
+<li>cli      : Passed as --option=value to the command line.
 <li>stdin    : Passed as a JSON encoded string through stdin.
 <li>alias    : Defined in an alias record, and set in the
                alias context whenever that alias is used.
Index: includes/command.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/command.inc,v
retrieving revision 1.102
diff -u -p -r1.102 command.inc
--- includes/command.inc	30 Dec 2010 18:28:08 -0000	1.102
+++ includes/command.inc	30 Dec 2010 21:56:11 -0000
@@ -281,8 +281,8 @@ function drush_invoke_sitealias_args($si
  */
 function drush_redispatch_get_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'));
+  // ('cli' context)
+  $options = array_merge(drush_get_context('alias'), drush_get_context('cli'));
   $options = array_diff_key($options, array_flip(drush_sitealias_site_selection_keys()));
   unset($options['command-specific']);
   unset($options['path-aliases']);
@@ -389,7 +389,7 @@ function drush_parse_args() {
   drush_process_bootstrap_to_first_arg($arguments);
   
   drush_set_arguments($arguments);
-  drush_set_context('options', $options);
+  drush_set_context('cli', $options);
 }
 
 /**
Index: includes/context.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/context.inc,v
retrieving revision 1.36
diff -u -p -r1.36 context.inc
--- includes/context.inc	9 Dec 2010 15:54:39 -0000	1.36
+++ includes/context.inc	30 Dec 2010 21:56:12 -0000
@@ -53,7 +53,7 @@
  *
  *   Specified by the script itself :
  *     process  : Generated in the current process.
- *     options  : Passed as --option=value to the command line.
+ *     cli      : Passed as --option=value to the command line.
  *     stdin    : Passed as a JSON encoded string through stdin.
  *     alias    : Defined in an alias record, and set in the
  *                alias context whenever that alias is used.
@@ -74,7 +74,7 @@
  */
 function drush_context_names() {
   static $contexts = array(
-    'process', 'options', 'stdin', 'specific',
+    'process', 'cli', 'stdin', 'specific',
     'custom', 'site', 'drupal', 'alias', 'user', 'home.drush', 'system',
     'drush', 'default');
 
Index: includes/drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v
retrieving revision 1.179
diff -u -p -r1.179 drush.inc
--- includes/drush.inc	30 Dec 2010 18:28:08 -0000	1.179
+++ includes/drush.inc	30 Dec 2010 21:56:13 -0000
@@ -1673,7 +1673,7 @@ function drush_remote_command() {
       }
     }
     $command = array_shift($args);
-    $multi_options = drush_get_context('options');
+    $multi_options = drush_get_context('cli');
     
     if (!drush_get_option('no-label', FALSE)) {
       $label_separator = ' >> ';
Index: includes/sitealias.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/sitealias.inc,v
retrieving revision 1.70
diff -u -p -r1.70 sitealias.inc
--- includes/sitealias.inc	30 Dec 2010 20:59:34 -0000	1.70
+++ includes/sitealias.inc	30 Dec 2010 21:56:14 -0000
@@ -1311,7 +1311,7 @@ function _drush_sitealias_set_context_by
 /**
  * Given a site alias record, copy selected fields from it
  * into the drush 'alias' context.  The 'alias' context has
- * lower precedence than the 'options' context, so values
+ * lower precedence than the 'cli' context, so values
  * set by an alias record can be overridden by command-line
  * parameters.
  *