svn commit: r1336092 - in /subversion/trunk/subversion/svn: cl.h diff-cmd.c main.c

[st...@apache.org]

Author: stsp
Date: Wed May  9 11:10:50 2012
New Revision: 1336092

URL: http://svn.apache.org/viewvc?rev=1336092&view=rev
Log:
Rename ignore_prop_diff and ignore_props variables in the 'svn' client
code to ignore_properties. 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
    opt_ignore_props to opt_ignore_properties.

* subversion/svn/cl.h
  (svn_cl__opt_state_t): Rename ignore_props to ignore_properties.

* subversion/svn/diff-cmd.c
  (svn_cl__diff): Track above rename, and rename the local variable
    ignore_prop_diff to ignore_properties.

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=1336092&r1=1336091&r2=1336092&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Wed May  9 11:10:50 2012
@@ -184,7 +184,7 @@ typedef struct svn_cl__opt_state_t
   svn_boolean_t no_ignore;       /* disregard default ignores & svn:ignore's */
   svn_boolean_t no_auth_cache;   /* do not cache authentication information */
   svn_boolean_t no_diff_deleted; /* do not show diffs for deleted files */
-  svn_boolean_t ignore_props;    /* ignore properties */
+  svn_boolean_t ignore_properties; /* ignore properties */
   svn_boolean_t show_copies_as_adds; /* do not diff copies with their source */
   svn_boolean_t notice_ancestry; /* notice ancestry for diff-y operations */
   svn_boolean_t ignore_ancestry; /* ignore ancestry for merge-y operations */

Modified: subversion/trunk/subversion/svn/diff-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/diff-cmd.c?rev=1336092&r1=1336091&r2=1336092&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/diff-cmd.c (original)
+++ subversion/trunk/subversion/svn/diff-cmd.c Wed May  9 11:10:50 2012
@@ -173,8 +173,8 @@ svn_cl__diff(apr_getopt_t *os,
   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;
-  svn_boolean_t ignore_prop_diff =
-    opt_state->use_patch_diff_format ? TRUE : opt_state->ignore_props;
+  svn_boolean_t ignore_properties =
+    opt_state->use_patch_diff_format ? TRUE : opt_state->ignore_properties;
   int i;
   const svn_client_diff_summarize_func_t summarize_func =
     (opt_state->xml ? summarize_xml : summarize_regular);
@@ -373,7 +373,7 @@ svn_cl__diff(apr_getopt_t *os,
                      opt_state->no_diff_deleted,
                      show_copies_as_adds,
                      opt_state->force,
-                     ignore_prop_diff,
+                     ignore_properties,
                      opt_state->use_git_diff_format,
                      svn_cmdline_output_encoding(pool),
                      outstream,
@@ -419,7 +419,7 @@ svn_cl__diff(apr_getopt_t *os,
                      opt_state->no_diff_deleted,
                      show_copies_as_adds,
                      opt_state->force,
-                     ignore_prop_diff,
+                     ignore_properties,
                      opt_state->use_git_diff_format,
                      svn_cmdline_output_encoding(pool),
                      outstream,

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1336092&r1=1336091&r2=1336092&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed May  9 11:10:50 2012
@@ -89,7 +89,7 @@ typedef enum svn_cl__longopt_t {
   opt_no_auth_cache,
   opt_no_autoprops,
   opt_no_diff_deleted,
-  opt_ignore_props,
+  opt_ignore_properties,
   opt_no_ignore,
   opt_no_unlock,
   opt_non_interactive,
@@ -242,7 +242,7 @@ const apr_getopt_option_t svn_cl__option
                     N_("try operation but make no changes")},
   {"no-diff-deleted", opt_no_diff_deleted, 0,
                     N_("do not print differences for deleted files")},
-  {"ignore-properties", opt_ignore_props, 0,
+  {"ignore-properties", opt_ignore_properties, 0,
                     N_("ignore properties during the operation")},
   {"notice-ancestry", opt_notice_ancestry, 0,
                     N_("notice ancestry when calculating differences")},
@@ -552,7 +552,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "\n"
      "  Use just 'svn diff' to display local modifications in a working copy.\n"),
     {'r', 'c', opt_old_cmd, opt_new_cmd, 'N', opt_depth, opt_diff_cmd,
-     opt_internal_diff, 'x', opt_no_diff_deleted, opt_ignore_props,
+     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} },
   { "export", svn_cl__export, {0}, N_
@@ -1928,8 +1928,8 @@ main(int argc, const char *argv[])
       case opt_no_diff_deleted:
         opt_state.no_diff_deleted = TRUE;
         break;
-      case opt_ignore_props:
-        opt_state.ignore_props = TRUE;
+      case opt_ignore_properties:
+        opt_state.ignore_properties = TRUE;
         break;
       case opt_show_copies_as_adds:
         opt_state.show_copies_as_adds = TRUE;