While we're on the subject of wacky options to 'svn' ... I'd like to
talk abouit pulling out all of these shortnames. These things are very
obtuse. Seeing "--sr" in a script is going to make me scratch my head.
Does ANYBODY here know what --sr means, when passed to svn? And no
looking at the code or the help doc.
How about --ndd?
I do not see these adding any true utility to Subversion, and only
creating a mess of options. When we started Subversion, one of the
goals was to have a clear command line. People were absolutely
confused by the myriad options passed to CVS (global options vs
cmd-specific options). And in today's environment, we have things like
'git' with a billion subcommands and options.
I feel that a change, like below, is sending us down the same path of
creating a client with so many multitudes of options that it becomes
HARD to use. Not easier.
Thoughts?
-g
On Thu, Jan 14, 2010 at 19:38, <stsp_at_apache.org> wrote:
> Author: stsp
> Date: Fri Jan 15 00:38:39 2010
> New Revision: 899499
>
> URL: http://svn.apache.org/viewvc?rev=899499&view=rev
> Log:
> Add more short aliases for --very-long-options to facilitate interactive use.
>
> * subversion/svn/main.c
> (svn_cl__options): Add short aliases for --encoding, --set-depth,
> --no-auth-cache, --dry-run, --notice-ancestry, --record-only,
> --config-dir, --keep-local, and --show-revs.
>
> * subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
> Adjust.
>
> 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=899499&r1=899498&r2=899499&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svn/main.c (original)
> +++ subversion/trunk/subversion/svn/main.c Fri Jan 15 00:38:39 2010
> @@ -152,7 +152,9 @@
> {"incremental", opt_incremental, 0,
> N_("give output suitable for concatenation")},
> {"encoding", opt_encoding, 1,
> - N_("treat value as being in charset encoding ARG")},
> + N_("treat value as being in charset encoding ARG\n"
> + " "
> + "[alias: --enc]")},
> {"version", opt_version, 0, N_("show program version information")},
> {"verbose", 'v', 0, N_("print extra information")},
> {"show-updates", 'u', 0, N_("display update information")},
> @@ -199,7 +201,9 @@
> {"set-depth", opt_set_depth, 1,
> N_("set new working copy depth to ARG ('exclude',\n"
> " "
> - "'empty', 'files', 'immediates', or 'infinity')")},
> + "'empty', 'files', 'immediates', or 'infinity')\n"
> + " "
> + "[alias: --sd]")},
> {"xml", opt_xml, 0, N_("output in XML")},
> {"strict", opt_strict, 0, N_("use strict semantics")},
> {"stop-on-copy", opt_stop_on_copy, 0,
> @@ -209,7 +213,9 @@
> {"no-ignore", opt_no_ignore, 0,
> N_("disregard default and svn:ignore property ignores")},
> {"no-auth-cache", opt_no_auth_cache, 0,
> - N_("do not cache authentication tokens")},
> + N_("do not cache authentication tokens\n"
> + " "
> + "[alias: --nac]")},
> {"trust-server-cert", opt_trust_server_cert, 0,
> N_("accept unknown SSL server certificates without\n"
> " "
> @@ -217,13 +223,17 @@
> {"non-interactive", opt_non_interactive, 0,
> N_("do no interactive prompting")},
> {"dry-run", opt_dry_run, 0,
> - N_("try operation but make no changes")},
> + N_("try operation but make no changes\n"
> + " "
> + "[alias: --dry]")},
> {"no-diff-deleted", opt_no_diff_deleted, 0,
> N_("do not print differences for deleted files\n"
> " "
> "[alias: --ndd]")},
> {"notice-ancestry", opt_notice_ancestry, 0,
> - N_("notice ancestry when calculating differences")},
> + N_("notice ancestry when calculating differences\n"
> + " "
> + "[alias: --na]")},
> {"ignore-ancestry", opt_ignore_ancestry, 0,
> N_("ignore ancestry when calculating merges\n"
> " "
> @@ -236,14 +246,18 @@
> {"diff3-cmd", opt_merge_cmd, 1, N_("use ARG as merge command")},
> {"editor-cmd", opt_editor_cmd, 1, N_("use ARG as external editor")},
> {"record-only", opt_record_only, 0,
> - N_("merge only mergeinfo differences")},
> + N_("merge only mergeinfo differences\n"
> + " "
> + "[alias: --ro]")},
> {"old", opt_old_cmd, 1, N_("use ARG as the older target")},
> {"new", opt_new_cmd, 1, N_("use ARG as the newer target")},
> {"revprop", opt_revprop, 0,
> N_("operate on a revision property (use with -r)")},
> {"relocate", opt_relocate, 0, N_("relocate via URL-rewriting")},
> {"config-dir", opt_config_dir, 1,
> - N_("read user configuration files from directory ARG")},
> + N_("read user configuration files from directory ARG\n"
> + " "
> + "[alias: --cd]")},
> {"config-option", opt_config_options, 1,
> N_("set user configuration option in the format:\n"
> " "
> @@ -272,7 +286,9 @@
> "[alias: --cl]")},
> {"keep-changelists", opt_keep_changelists, 0,
> N_("don't delete changelists after commit")},
> - {"keep-local", opt_keep_local, 0, N_("keep path in working copy")},
> + {"keep-local", opt_keep_local, 0, N_("keep path in working copy\n"
> + " "
> + "[alias: --kl]")},
> {"with-all-revprops", opt_with_all_revprops, 0,
> N_("retrieve all revision properties")},
> {"with-no-revprops", opt_with_no_revprops, 0,
> @@ -297,7 +313,9 @@
> {"show-revs", opt_show_revs, 1,
> N_("specify which collection of revisions to display\n"
> " "
> - "('merged', 'eligible')")},
> + "('merged', 'eligible')\n"
> + " "
> + "[alias: --sr]")},
> {"reintegrate", opt_reintegrate, 0,
> N_("lump-merge all of source URL's unmerged changes\n"
> " "
> @@ -331,11 +349,20 @@
> * 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},
> + {"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},
>
> 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=899499&r1=899498&r2=899499&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 Fri Jan 15 00:38:39 2010
> @@ -58,10 +58,12 @@
> --username ARG : specify a username ARG
> --password ARG : specify a password ARG
> --no-auth-cache : do not cache authentication tokens
> + [alias: --nac]
> --non-interactive : do no interactive prompting
> --trust-server-cert : accept unknown SSL server certificates without
> prompting (but only with '--non-interactive')
> --config-dir ARG : read user configuration files from directory ARG
> + [alias: --cd]
> --config-option ARG : set user configuration option in the format:
> FILE:SECTION:OPTION=[VALUE]
> For example:
> @@ -124,6 +126,7 @@
> 'immediates', or 'infinity')
> --set-depth ARG : set new working copy depth to ARG ('exclude',
> 'empty', 'files', 'immediates', or 'infinity')
> + [alias: --sd]
> -q [--quiet] : print nothing, or only summary information
> --diff3-cmd ARG : use ARG as merge command
> --relocate : relocate via URL-rewriting
> @@ -139,10 +142,12 @@
> --username ARG : specify a username ARG
> --password ARG : specify a password ARG
> --no-auth-cache : do not cache authentication tokens
> + [alias: --nac]
> --non-interactive : do no interactive prompting
> --trust-server-cert : accept unknown SSL server certificates without
> prompting (but only with '--non-interactive')
> --config-dir ARG : read user configuration files from directory ARG
> + [alias: --cd]
> --config-option ARG : set user configuration option in the format:
> FILE:SECTION:OPTION=[VALUE]
> For example:
>
>
>
Received on 2011-05-23 22:55:33 CEST