[PATCH] remove --config-option argument from svnadmin

[Prabhu Gnana Sundar]

Hi all,

     The "--config-option" parameter is never used with "svnadmin". It 
is newly introduced in the trunk code.
There is no use-case (as far as I know) to use the "--config-option" 
with svnadmin. So as discussed with
Stefan Sperling via the IRC, I removed the --config-option for svnadmin.
Attaching the patch and the log message for the same. Please share your 
views.


This patch is also associated with the patch at
http://svn.haxx.se/dev/archive-2011-05/0781.shtml which passes NULL 
instead of "config".

Thanks and regards
Prabhu
"--config-option" is never used with svnadmin. Hence removing it.
It was newly added in the 1.7 code.

* subversion/svnadmin/main.c
  (svnadmin__cmdline_options_t): Remove config_option
  (options_table): Removed doc for --config-option
  (cmd_table, svnadmin_opt_state): Removed config_option
  (main): Did not populate config_options in opt_state.
          It does not handle the --config-option argument.


Patch by: Prabhu Gnana Sundar <prabhugs{_AT_}collab.net>
Suggested by: Kamesh Jayachandran <kamesh{_AT_}collab.net>
Index: subversion/svnadmin/main.c
===================================================================
--- subversion/svnadmin/main.c	(revision 1126405)
+++ subversion/svnadmin/main.c	(working copy)
@@ -177,7 +177,6 @@
     svnadmin__bdb_txn_nosync,
     svnadmin__bdb_log_keep,
     svnadmin__config_dir,
-    svnadmin__config_option,
     svnadmin__bypass_hooks,
     svnadmin__bypass_prop_validation,
     svnadmin__use_pre_commit_hook,
@@ -245,14 +244,6 @@
 
     {"config-dir",    svnadmin__config_dir, 1,
      N_("read user configuration files from directory ARG")},
-    {"config-option",  svnadmin__config_option, 1,
-     N_("set user configuration option in the format:\n"
-        "                             "
-        "    FILE:SECTION:OPTION=[VALUE]\n"
-        "                             "
-        "For example:\n"
-        "                             "
-        "    servers:global:http-library=serf")},
 
     {"clean-logs",    svnadmin__clean_logs, 0,
      N_("remove redundant Berkeley DB log files\n"
@@ -314,8 +305,7 @@
    ("usage: svnadmin create REPOS_PATH\n\n"
     "Create a new, empty repository at REPOS_PATH.\n"),
    {svnadmin__bdb_txn_nosync, svnadmin__bdb_log_keep,
-    svnadmin__config_dir, svnadmin__config_option,
-    svnadmin__fs_type, svnadmin__pre_1_4_compatible,
+    svnadmin__config_dir, svnadmin__fs_type, svnadmin__pre_1_4_compatible,
     svnadmin__pre_1_5_compatible, svnadmin__pre_1_6_compatible,
     svnadmin__pre_1_7_compatible} },
 
@@ -491,7 +481,6 @@
   const char *parent_dir;
 
   const char *config_dir;    /* Overriding Configuration Directory */
-  apr_array_header_t *config_options; /* Overriding specific options */
 };
 
 
@@ -1660,8 +1649,6 @@
   opt_state.start_revision.kind = svn_opt_revision_unspecified;
   opt_state.end_revision.kind = svn_opt_revision_unspecified;
   opt_state.memory_cache_size = svn_get_cache_config()->cache_size;
-  opt_state.config_options 
-            = apr_array_make(pool, 0, sizeof(svn_cmdline__config_argument_t*));
 
   /* Parse options. */
   err = svn_cmdline__getopt_init(&os, argc, argv, pool);
@@ -1799,14 +1786,6 @@
         opt_state.config_dir =
             apr_pstrdup(pool, svn_dirent_canonicalize(utf8_opt_arg, pool));
         break;
-      case svnadmin__config_option:
-        err = svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool);
-        if (!err)
-          err = svn_cmdline__parse_config_option(opt_state.config_options,
-                                                 utf8_opt_arg, pool);
-        if (err)
-          return svn_cmdline_handle_exit_error(err, pool, "svnadmin: ");
-        break;
       case svnadmin__wait:
         opt_state.wait = TRUE;
         break;