svn commit: r1501106 - in /subversion/branches/invoke-diff-cmd-feature/subversion: libsvn_subr/deprecated.c libsvn_subr/io.c svnlook/svnlook.c

[gb...@apache.org]

Author: gbg
Date: Tue Jul  9 06:24:18 2013
New Revision: 1501106

URL: http://svn.apache.org/r1501106
Log:
On the --invoke-diff-cmd branch: Revert changes to svnlook help, fix
braces, indentation and extra semi-colon.

* subversion/svnlook/svnlook.c
  (options_table): Reverse the order back to it's original state and
  reinstate original diff-cmd help string.

* subversion/libsvn_subr/deprecate.c
  (svn_io_run_diff2): Fix braces and indentation.

* subversion/libsvn_subr/io.c
  (svn_io_create_custom_diff_cmd): Remove extraneous semi-colon.

Modified:
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/deprecated.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/deprecated.c?rev=1501106&r1=1501105&r2=1501106&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/deprecated.c Tue Jul  9 06:24:18 2013
@@ -1324,10 +1324,11 @@ svn_io_run_diff2(const char *dir,
   if (user_args != NULL)
     {
       int j;
-      for (j = 0; j < num_user_args; ++j) {
-        svn_stringbuf_appendcstr(com, user_args[j]);
-        svn_stringbuf_appendcstr(com, " ");
-      }
+      for (j = 0; j < num_user_args; ++j) 
+        {
+          svn_stringbuf_appendcstr(com, user_args[j]);
+          svn_stringbuf_appendcstr(com, " ");
+        }
     }
   else /* assume -u if the user didn't give us any args */
     svn_stringbuf_appendcstr(com, "-u "); 

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c?rev=1501106&r1=1501105&r2=1501106&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c Tue Jul  9 06:24:18 2013
@@ -2845,7 +2845,7 @@ svn_io_create_custom_diff_cmd(const char
   apr_array_header_t *tmp;
   const char ** result;
   int argv;
-  apr_pool_t *scratch_pool = svn_pool_create(pool);; 
+  apr_pool_t *scratch_pool = svn_pool_create(pool);
 
   tmp = svn_cstring_split(cmd, " ", TRUE, scratch_pool);
 

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c?rev=1501106&r1=1501105&r2=1501106&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c Tue Jul  9 06:24:18 2013
@@ -133,12 +133,12 @@ static const apr_getopt_option_t options
   {"no-diff-deleted",   svnlook__no_diff_deleted, 0,
    N_("do not print differences for deleted files")},
 
+  {"diff-cmd",          svnlook__diff_cmd, 1,
+   N_("use ARG as diff command")},
+
   {"invoke-diff-cmd",   svnlook__invoke_diff_cmd, 1,
    N_("Customizable diff command (see svn help diff)")},
 
-  {"diff-cmd",          svnlook__diff_cmd, 1,
-   N_("deprecated, use --invoke-diff-cmd instead")},
-
   {"ignore-properties",   svnlook__ignore_properties, 0,
    N_("ignore properties during the operation")},