subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1336099 - in /subversion/trunk/subversion/svn: cl.h diff-cmd.c main.c
Date Wed, 09 May 2012 11:18:58 GMT
Author: stsp
Date: Wed May  9 11:18:58 2012
New Revision: 1336099

URL: http://svn.apache.org/viewvc?rev=1336099&view=rev
Log:
Rename the use_patch_diff_format variable in the 'svn' client code to
patch_compatible. The new name matches the corresponding command line option.

No functional change.

* subversion/svn/main.c
  (svn_cl__longopt_t, svn_cl__options, svn_cl__cmd_table, main): Rename
    use_patch_diff_format to patch_compatible.

* subversion/svn/cl.h
  (svn_cl__opt_state_t): Rename use_patch_diff_format to patch_compatible.

* subversion/svn/diff-cmd.c
  (svn_cl__diff): Track above rename.

Modified:
    subversion/trunk/subversion/svn/cl.h
    subversion/trunk/subversion/svn/diff-cmd.c
    subversion/trunk/subversion/svn/main.c

Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1336099&r1=1336098&r2=1336099&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Wed May  9 11:18:58 2012
@@ -231,7 +231,7 @@ typedef struct svn_cl__opt_state_t
   svn_boolean_t show_diff;        /* produce diff output (maps to --diff) */
   svn_boolean_t internal_diff;    /* override diff_cmd in config file */
   svn_boolean_t use_git_diff_format; /* Use git's extended diff format */
-  svn_boolean_t use_patch_diff_format; /* Output compatible with GNU patch */
+  svn_boolean_t patch_compatible; /* Output compatible with GNU patch */
   svn_boolean_t allow_mixed_rev; /* Allow operation on mixed-revision WC */
   svn_boolean_t include_externals; /* Recurses (in)to file & dir externals */
 } svn_cl__opt_state_t;

Modified: subversion/trunk/subversion/svn/diff-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/diff-cmd.c?rev=1336099&r1=1336098&r2=1336099&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/diff-cmd.c (original)
+++ subversion/trunk/subversion/svn/diff-cmd.c Wed May  9 11:18:58 2012
@@ -172,9 +172,9 @@ svn_cl__diff(apr_getopt_t *os,
   apr_pool_t *iterpool;
   svn_boolean_t pegged_diff = FALSE;
   svn_boolean_t show_copies_as_adds =
-    opt_state->use_patch_diff_format ? TRUE : opt_state->show_copies_as_adds;
+    opt_state->patch_compatible ? TRUE : opt_state->show_copies_as_adds;
   svn_boolean_t ignore_properties =
-    opt_state->use_patch_diff_format ? TRUE : opt_state->ignore_properties;
+    opt_state->patch_compatible ? TRUE : opt_state->ignore_properties;
   int i;
   const svn_client_diff_summarize_func_t summarize_func =
     (opt_state->xml ? summarize_xml : summarize_regular);

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1336099&r1=1336098&r2=1336099&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed May  9 11:18:58 2012
@@ -124,7 +124,7 @@ typedef enum svn_cl__longopt_t {
   opt_diff,
   opt_internal_diff,
   opt_use_git_diff_format,
-  opt_use_patch_diff_format,
+  opt_patch_compatible,
   opt_allow_mixed_revisions,
   opt_include_externals,
   opt_symmetric,
@@ -348,7 +348,7 @@ const apr_getopt_option_t svn_cl__option
                        N_("override diff-cmd specified in config file")},
   {"git", opt_use_git_diff_format, 0,
                        N_("use git's extended diff format")},
-  {"patch-compatible", opt_use_patch_diff_format, 0,
+  {"patch-compatible", opt_patch_compatible, 0,
                        N_("generate diff suitable for generic third-party\n"
                        "                             "
                        "patch tools; currently the same as\n"
@@ -554,7 +554,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
     {'r', 'c', opt_old_cmd, opt_new_cmd, 'N', opt_depth, opt_diff_cmd,
      opt_internal_diff, 'x', opt_no_diff_deleted, opt_ignore_properties,
      opt_show_copies_as_adds, opt_notice_ancestry, opt_summarize, opt_changelist,
-     opt_force, opt_xml, opt_use_git_diff_format, opt_use_patch_diff_format} },
+     opt_force, opt_xml, opt_use_git_diff_format, opt_patch_compatible} },
   { "export", svn_cl__export, {0}, N_
     ("Create an unversioned copy of a tree.\n"
      "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -2114,8 +2114,8 @@ main(int argc, const char *argv[])
       case opt_internal_diff:
         opt_state.internal_diff = TRUE;
         break;
-      case opt_use_patch_diff_format:
-        opt_state.use_patch_diff_format = TRUE;
+      case opt_patch_compatible:
+        opt_state.patch_compatible = TRUE;
         break;
       case opt_use_git_diff_format:
         opt_state.use_git_diff_format = TRUE;



Mime
View raw message