You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/01/18 13:17:58 UTC

svn commit: r1435106 - in /subversion/trunk: subversion/libsvn_ra_svn/ subversion/svn/ subversion/svnadmin/ subversion/svndumpfilter/ subversion/svnlook/ subversion/svnrdump/ tools/client-side/svn-bench/ tools/dev/benchmarks/suite1/ tools/examples/ too...

Author: danielsh
Date: Fri Jan 18 12:17:58 2013
New Revision: 1435106

URL: http://svn.apache.org/viewvc?rev=1435106&view=rev
Log:
Fix a misleading error message: "Unknown command: 'svn'".

* subversion/libsvn_ra_svn/editorp.c (svn_ra_svn_drive_editor2):
* subversion/libsvn_ra_svn/marshal.c (svn_ra_svn_handle_commands2):
    Say "Unknown editor command" instead.

* subversion/svn/svn.c (sub_main):
* subversion/svnadmin/svnadmin.c (sub_main):
* subversion/svndumpfilter/svndumpfilter.c (main):
* subversion/svnlook/svnlook.c (main):
* subversion/svnrdump/svnrdump.c (main):
* tools/client-side/svn-bench/svn-bench.c (sub_main):
* tools/dev/benchmarks/suite1/benchmark.py:
* tools/examples/svnshell.rb (SvnShell.dispatch):
* tools/server-side/svnauthz.c (sub_main):
    Say "Unknown subcommand" instead.

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/editorp.c
    subversion/trunk/subversion/libsvn_ra_svn/marshal.c
    subversion/trunk/subversion/svn/svn.c
    subversion/trunk/subversion/svnadmin/svnadmin.c
    subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
    subversion/trunk/subversion/svnlook/svnlook.c
    subversion/trunk/subversion/svnrdump/svnrdump.c
    subversion/trunk/tools/client-side/svn-bench/svn-bench.c
    subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py
    subversion/trunk/tools/examples/svnshell.rb
    subversion/trunk/tools/server-side/svnauthz.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Fri Jan 18 12:17:58 2013
@@ -976,7 +976,7 @@ svn_error_t *svn_ra_svn_drive_editor2(sv
           else
             {
               err = svn_error_createf(SVN_ERR_RA_SVN_UNKNOWN_CMD, NULL,
-                                      _("Unknown command '%s'"), cmd);
+                                      _("Unknown editor command '%s'"), cmd);
               err = svn_error_create(SVN_ERR_RA_SVN_CMD_ERR, err, NULL);
             }
         }

Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Fri Jan 18 12:17:58 2013
@@ -1799,7 +1799,7 @@ svn_error_t *svn_ra_svn_handle_commands2
       else
         {
           err = svn_error_createf(SVN_ERR_RA_SVN_UNKNOWN_CMD, NULL,
-                                  _("Unknown command '%s'"), cmdname);
+                                  _("Unknown editor command '%s'"), cmdname);
           err = svn_error_create(SVN_ERR_RA_SVN_CMD_ERR, err, NULL);
         }
 

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Fri Jan 18 12:17:58 2013
@@ -2292,7 +2292,7 @@ sub_main(int argc, const char *argv[], a
                                                   first_arg, pool));
               svn_error_clear
                 (svn_cmdline_fprintf(stderr, pool,
-                                     _("Unknown command: '%s'\n"),
+                                     _("Unknown subcommand: '%s'\n"),
                                      first_arg_utf8));
               svn_cl__help(NULL, NULL, pool);
               return EXIT_FAILURE;

Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri Jan 18 12:17:58 2013
@@ -2125,9 +2125,10 @@ sub_main(int argc, const char *argv[], a
               const char *first_arg_utf8;
               SVN_INT_ERR(svn_utf_cstring_to_utf8(&first_arg_utf8,
                                                   first_arg, pool));
-              svn_error_clear(svn_cmdline_fprintf(stderr, pool,
-                                                  _("Unknown command: '%s'\n"),
-                                                  first_arg_utf8));
+              svn_error_clear(
+                svn_cmdline_fprintf(stderr, pool,
+                                    _("Unknown subcommand: '%s'\n"),
+                                    first_arg_utf8));
               SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
               return EXIT_FAILURE;
             }

Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Fri Jan 18 12:17:58 2013
@@ -1494,9 +1494,10 @@ main(int argc, const char *argv[])
                 return svn_cmdline_handle_exit_error(err, pool,
                                                      "svndumpfilter: ");
 
-              svn_error_clear(svn_cmdline_fprintf(stderr, pool,
-                                                  _("Unknown command: '%s'\n"),
-                                                  first_arg_utf8));
+              svn_error_clear(
+                svn_cmdline_fprintf(stderr, pool,
+                                    _("Unknown subcommand: '%s'\n"),
+                                    first_arg_utf8));
               SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
               svn_pool_destroy(pool);
               return EXIT_FAILURE;

Modified: subversion/trunk/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/svnlook.c (original)
+++ subversion/trunk/subversion/svnlook/svnlook.c Fri Jan 18 12:17:58 2013
@@ -2658,10 +2658,10 @@ main(int argc, const char *argv[])
                                             pool);
               if (err)
                 return svn_cmdline_handle_exit_error(err, pool, "svnlook: ");
-              svn_error_clear
-                (svn_cmdline_fprintf(stderr, pool,
-                                     _("Unknown command: '%s'\n"),
-                                     first_arg_utf8));
+              svn_error_clear(
+                svn_cmdline_fprintf(stderr, pool,
+                                    _("Unknown subcommand: '%s'\n"),
+                                    first_arg_utf8));
               SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
               svn_pool_destroy(pool);
               return EXIT_FAILURE;

Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri Jan 18 12:17:58 2013
@@ -1039,9 +1039,10 @@ main(int argc, const char **argv)
               err = svn_utf_cstring_to_utf8(&first_arg_utf8, first_arg, pool);
               if (err)
                 return svn_cmdline_handle_exit_error(err, pool, "svnrdump: ");
-              svn_error_clear(svn_cmdline_fprintf(stderr, pool,
-                                                  _("Unknown command: '%s'\n"),
-                                                  first_arg_utf8));
+              svn_error_clear(
+                svn_cmdline_fprintf(stderr, pool,
+                                    _("Unknown subcommand: '%s'\n"),
+                                    first_arg_utf8));
               SVNRDUMP_ERR(help_cmd(NULL, NULL, pool));
               svn_pool_destroy(pool);
               exit(EXIT_FAILURE);

Modified: subversion/trunk/tools/client-side/svn-bench/svn-bench.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-bench/svn-bench.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-bench/svn-bench.c (original)
+++ subversion/trunk/tools/client-side/svn-bench/svn-bench.c Fri Jan 18 12:17:58 2013
@@ -684,7 +684,7 @@ sub_main(int argc, const char *argv[], a
                                                   first_arg, pool));
               svn_error_clear
                 (svn_cmdline_fprintf(stderr, pool,
-                                     _("Unknown command: '%s'\n"),
+                                     _("Unknown subcommand: '%s'\n"),
                                      first_arg_utf8));
               svn_cl__help(NULL, NULL, pool);
               return EXIT_FAILURE;

Modified: subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py (original)
+++ subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py Fri Jan 18 12:17:58 2013
@@ -1306,4 +1306,4 @@ if __name__ == '__main__':
       usage()
 
   else:
-    usage('Unknown command argument: %s' % cmd)
+    usage('Unknown subcommand argument: %s' % cmd)

Modified: subversion/trunk/tools/examples/svnshell.rb
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/examples/svnshell.rb?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/tools/examples/svnshell.rb (original)
+++ subversion/trunk/tools/examples/svnshell.rb Fri Jan 18 12:17:58 2013
@@ -125,7 +125,7 @@ class SvnShell
         puts("Invalid argument for #{cmd}: #{args.join(' ')}")
       end
     else
-      puts("Unknown command: #{cmd}")
+      puts("Unknown subcommand: #{cmd}")
       puts("Try one of these commands: ", WORDS.sort.join(" "))
     end
   end

Modified: subversion/trunk/tools/server-side/svnauthz.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnauthz.c?rev=1435106&r1=1435105&r2=1435106&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnauthz.c (original)
+++ subversion/trunk/tools/server-side/svnauthz.c Fri Jan 18 12:17:58 2013
@@ -492,9 +492,10 @@ sub_main(int argc, const char *argv[], a
               os->ind++;
               SVN_INT_ERR(svn_utf_cstring_to_utf8(&first_arg_utf8,
                                                   first_arg, pool));
-              svn_error_clear(svn_cmdline_fprintf(stderr, pool,
-                                                  ("Unknown command: '%s'\n"),
-                                                  first_arg_utf8));
+              svn_error_clear(
+                svn_cmdline_fprintf(stderr, pool,
+                                    ("Unknown subcommand: '%s'\n"),
+                                    first_arg_utf8));
               SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
               return EXIT_FAILURE;
             }