Author: stsp
Date: Mon May 23 23:16:36 2011
New Revision: 1126808
URL: http://svn.apache.org/viewvc?rev=1126808&view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Remove all long-option aliases expect --cl (which we
have to keep since it was released in 1.6). Not everyone thinks these
aliases were a good idea.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout: Adjust.
See this post and follow-ups for related discussion:
Date: Mon, 23 May 2011 16:55:03 -0400
From: Greg Stein
To: dev@
Subject: clear out insane shortnames (was: svn commit: r899499)
Message-ID:<BANLkTimtc__tsq_PYbYJ63Dzyeh=xel...@mail.gmail.com>
http://svn.haxx.se/dev/archive-2011-05/0842.shtml
Modified:
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1126808&r1=1126807&r2=1126808&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon May 23 23:16:36 2011
@@ -346,31 +346,7 @@ const apr_getopt_option_t svn_cl__option
* other option (whose description should probably mention its aliases).
*/
- {"sd", opt_set_depth, 1, NULL},
- {"enc", opt_encoding, 1, NULL},
- {"soc", opt_stop_on_copy, 0, NULL},
- {"nac", opt_no_auth_cache, 0, NULL},
- {"dry", opt_dry_run, 0, NULL},
- {"ndd", opt_no_diff_deleted, 0, NULL},
- {"na", opt_notice_ancestry, 0, NULL},
- {"ia", opt_ignore_ancestry, 0, NULL},
- {"ie", opt_ignore_externals, 0, NULL},
- {"rd", opt_reverse_diff, 0, NULL},
- {"ro", opt_record_only, 0, NULL},
- {"cd", opt_config_dir, 1, NULL},
{"cl", opt_changelist, 1, NULL},
- {"kl", opt_keep_local, 0, NULL},
- {"sr", opt_show_revs, 1, NULL},
- {"ri", opt_reintegrate, 0, NULL},
- {"sca", opt_show_copies_as_adds, 0, NULL},
- {"ik", opt_ignore_keywords, 0, NULL},
- {"iw", opt_ignore_whitespace, 0, NULL},
- {"idiff", opt_internal_diff, 0, NULL},
- {"keep-locks", opt_no_unlock, 0, NULL},
- {"keep-cl", opt_keep_changelists, 0, NULL},
- {"ed", opt_editor_cmd, 1, NULL},
- {"vi-cmd", opt_editor_cmd, 1, NULL},
- {"emacs-cmd", opt_editor_cmd, 1, NULL},
{0, 0, 0, 0},
};
Modified:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1126808&r1=1126807&r2=1126808&view=diff
==============================================================================
---
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(original)
+++
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Mon May 23 23:16:36 2011
@@ -53,7 +53,7 @@ Valid options:
history
-c [--change] ARG : the change made in revision ARG
--targets ARG : pass contents of file ARG as additional args
- --stop-on-copy [--soc] : do not cross copies while traversing history
+ --stop-on-copy : do not cross copies while traversing history
--incremental : give output suitable for concatenation
--xml : output in XML
-l [--limit] ARG : maximum number of log entries
@@ -64,7 +64,7 @@ Valid options:
'immediates', or 'infinity')
--diff : produce diff output
--diff-cmd ARG : use ARG as diff command
- --internal-diff [--idiff] : override diff-cmd specified in config file
+ --internal-diff : override diff-cmd specified in config file
-x [--extensions] ARG : Default: '-u'. When Subversion is invoking an
external diff program, ARG is simply passed along
to the program. But when Subversion is using its
@@ -85,11 +85,11 @@ Valid options:
Global options:
--username ARG : specify a username ARG
--password ARG : specify a password ARG
- --no-auth-cache [--nac] : do not cache authentication tokens
+ --no-auth-cache : do not cache authentication tokens
--non-interactive : do no interactive prompting
--trust-server-cert : accept unknown SSL server certificates without
prompting (but only with '--non-interactive')
- --config-dir [--cd] ARG : read user configuration files from directory ARG
+ --config-dir ARG : read user configuration files from directory ARG
--config-option ARG : set user configuration option in the format:
FILE:SECTION:OPTION=[VALUE]
For example:
@@ -147,13 +147,13 @@ Valid options:
-N [--non-recursive] : obsolete; try --depth=files or --depth=immediates
--depth ARG : limit operation by depth ARG ('empty', 'files',
'immediates', or 'infinity')
- --set-depth [--sd] ARG : set new working copy depth to ARG ('exclude',
+ --set-depth ARG : set new working copy depth to ARG ('exclude',
'empty', 'files', 'immediates', or 'infinity')
-q [--quiet] : print nothing, or only summary information
--diff3-cmd ARG : use ARG as merge command
--relocate : relocate via URL-rewriting
- --ignore-externals [--ie] : ignore externals definitions
- --ignore-ancestry [--ia] : ignore ancestry when calculating merges
+ --ignore-externals : ignore externals definitions
+ --ignore-ancestry : ignore ancestry when calculating merges
--force : force operation to run
--accept ARG : specify automatic conflict resolution action
('postpone', 'base', 'mine-conflict',
@@ -163,11 +163,11 @@ Valid options:
Global options:
--username ARG : specify a username ARG
--password ARG : specify a password ARG
- --no-auth-cache [--nac] : do not cache authentication tokens
+ --no-auth-cache : do not cache authentication tokens
--non-interactive : do no interactive prompting
--trust-server-cert : accept unknown SSL server certificates without
prompting (but only with '--non-interactive')
- --config-dir [--cd] ARG : read user configuration files from directory ARG
+ --config-dir ARG : read user configuration files from directory ARG
--config-option ARG : set user configuration option in the format:
FILE:SECTION:OPTION=[VALUE]
For example:
