2001-09-12 Mo DeJong * subversion/clients/cmdline/README: * subversion/clients/cmdline/checkout-cmd.c: * subversion/clients/cmdline/cl.h: * subversion/clients/cmdline/commit-cmd.c: * subversion/clients/cmdline/import-cmd.c: * subversion/clients/cmdline/main.c: * subversion/clients/cmdline/propdel-cmd.c: * subversion/clients/cmdline/propset-cmd.c: Implement --verbose option to complement the existing --quiet option. Replace "quiet" member of the svn_cl__opt_state_t struct with a more generic "verbosity" member, it is set via the --verbose or --quiet options. Index: subversion/clients/cmdline/cl.h =================================================================== --- subversion/clients/cmdline/SVN/text-base/cl.h Wed Sep 12 23:02:28 2001 +++ subversion/clients/cmdline/cl.h Thu Sep 13 00:27:22 2001 @@ -48,6 +48,15 @@ svn_cl__auth_password_opt, } svn_cl__longopt_t; +/* Client verbosity */ +typedef enum { + svn_cl__verbosity_quiet_opt, + svn_cl__verbosity_progress_opt, + svn_cl__verbosity_verbose_opt, + svn_cl__verbosity_trace_opt, +} svn_cl__verbosity_t; + + /*** Command dispatch. ***/ @@ -67,8 +76,8 @@ set either of these flags, but will be recursive anyway */ svn_boolean_t recursive; svn_boolean_t nonrecursive; - svn_boolean_t quiet; svn_boolean_t version; + svn_cl__verbosity_t verbosity; svn_boolean_t modified; apr_array_header_t *args; /* TODO fixme. This still doesn't handle binary data from a file! */ Index: subversion/clients/cmdline/propdel-cmd.c =================================================================== --- subversion/clients/cmdline/SVN/text-base/propdel-cmd.c Mon Sep 10 09:51:09 2001 +++ subversion/clients/cmdline/propdel-cmd.c Wed Sep 12 23:53:47 2001 @@ -58,7 +58,7 @@ { svn_stringbuf_t *target = ((svn_stringbuf_t **) (targets->elts))[i]; SVN_ERR (svn_wc_prop_set (pname, NULL, target, pool)); - if (! opt_state->quiet) + if (opt_state->verbosity != svn_cl__verbosity_quiet_opt) printf ("property `%s' deleted from %s.\n", pname->data, target->data); } Index: subversion/clients/cmdline/checkout-cmd.c =================================================================== --- subversion/clients/cmdline/SVN/text-base/checkout-cmd.c Mon Sep 10 09:51:09 2001 +++ subversion/clients/cmdline/checkout-cmd.c Wed Sep 12 23:56:01 2001 @@ -117,8 +117,12 @@ return err; err = svn_client_checkout (NULL, NULL, - opt_state->quiet ? NULL : trace_editor, - opt_state->quiet ? NULL : trace_edit_baton, + (opt_state->verbosity == + svn_cl__verbosity_quiet_opt) + ? NULL : trace_editor, + (opt_state->verbosity == + svn_cl__verbosity_quiet_opt) + ? NULL : trace_edit_baton, auth_obj, repos_url, local_dir, Index: subversion/clients/cmdline/import-cmd.c =================================================================== --- subversion/clients/cmdline/SVN/text-base/import-cmd.c Mon Sep 10 09:51:08 2001 +++ subversion/clients/cmdline/import-cmd.c Thu Sep 13 00:00:50 2001 @@ -130,8 +130,12 @@ pool)); SVN_ERR (svn_client_import (NULL, NULL, - opt_state->quiet ? NULL : trace_editor, - opt_state->quiet ? NULL : trace_edit_baton, + (opt_state->verbosity == + svn_cl__verbosity_quiet_opt) + ? NULL : trace_editor, + (opt_state->verbosity == + svn_cl__verbosity_quiet_opt) + ? NULL : trace_edit_baton, auth_obj, path, url, Index: subversion/clients/cmdline/README =================================================================== --- subversion/clients/cmdline/SVN/text-base/README Mon Sep 10 09:51:14 2001 +++ subversion/clients/cmdline/README Thu Sep 13 01:24:49 2001 @@ -98,11 +98,6 @@ client. -? -h -H --help Help. - - -V --verbose [ KEY ] [quiet|progress|verbose|trace] - Determines the level of spewage that the - client gives (progress is the default, - --verbose without arg defaults to verbose) -D --date DATESPEC Like "cvs cmd -D DATESPEC" @@ -140,11 +135,16 @@ -L --line-conversion GLOB Do line-end conversion for files matching GLOB. + -q --quiet Spew as little information as possible + while processing a subcommand. + + -V --verbose Spew a more verbose description + while processing a subcommand. + -- End of option processing * Aliases (shorthand for commonly used options and option combinations) - -q --quiet alias for --verbose=quiet -T --text-defaults GLOB alias for '-L GLOB -K GLOB' Index: subversion/clients/cmdline/main.c =================================================================== --- subversion/clients/cmdline/SVN/text-base/main.c Wed Sep 12 23:02:57 2001 +++ subversion/clients/cmdline/main.c Thu Sep 13 01:23:02 2001 @@ -181,6 +181,7 @@ {"help", 'h', 0}, {"message", 'm', 1}, {"quiet", 'q', 0}, + {"verbose", 'V', 0}, {"recursive", svn_cl__recursive_opt, 0}, {"nonrecursive", 'n', 0}, {"revision", 'r', 1}, @@ -216,6 +217,7 @@ svn_cl__init_feedback_vtable (pool); memset (&opt_state, 0, sizeof (opt_state)); opt_state.revision = SVN_INVALID_REVNUM; + opt_state.verbosity = svn_cl__verbosity_progress_opt; /* No args? Show usage. */ if (argc <= 1) @@ -259,12 +261,16 @@ break; case 'v': opt_state.version = TRUE; + /* fall through and print version info in help subcommand */ case 'h': case '?': opt_state.help = TRUE; break; case 'q': - opt_state.quiet = TRUE; + opt_state.verbosity = svn_cl__verbosity_quiet_opt; + break; + case 'V': + opt_state.verbosity = svn_cl__verbosity_verbose_opt; break; case svn_cl__xml_file_opt: opt_state.xml_file = svn_stringbuf_create (opt_arg, pool); Index: subversion/clients/cmdline/commit-cmd.c =================================================================== --- subversion/clients/cmdline/SVN/text-base/commit-cmd.c Mon Sep 10 09:51:11 2001 +++ subversion/clients/cmdline/commit-cmd.c Wed Sep 12 23:59:22 2001 @@ -105,8 +105,12 @@ /* Commit. */ SVN_ERR (svn_client_commit (NULL, NULL, - opt_state->quiet ? NULL : trace_editor, - opt_state->quiet ? NULL : trace_edit_baton, + (opt_state->verbosity == + svn_cl__verbosity_quiet_opt) + ? NULL : trace_editor, + (opt_state->verbosity == + svn_cl__verbosity_quiet_opt) + ? NULL : trace_edit_baton, auth_obj, targets, message, Index: subversion/clients/cmdline/propset-cmd.c =================================================================== --- subversion/clients/cmdline/SVN/text-base/propset-cmd.c Mon Sep 10 09:51:10 2001 +++ subversion/clients/cmdline/propset-cmd.c Wed Sep 12 23:54:19 2001 @@ -68,7 +68,7 @@ svn_stringbuf_t *target = ((svn_stringbuf_t **) (targets->elts))[i]; SVN_ERR (svn_wc_prop_set (propname, propval, target, pool)); - if (! opt_state->quiet) + if (opt_state->verbosity != svn_cl__verbosity_quiet_opt) printf ("property `%s' set on %s.\n", propname->data, target->data); }