subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1239617 - in /subversion/trunk/subversion/svn: cl.h diff-cmd.c main.c
Date Thu, 02 Feb 2012 13:46:11 GMT
Author: stsp
Date: Thu Feb  2 13:46:11 2012
New Revision: 1239617

URL: http://svn.apache.org/viewvc?rev=1239617&view=rev
Log:
Rename the new --no-diff-properties option to --ignore-properties.
This allows the option to be re-used by other subcommands in the future.

Suggested by: hwright

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

* subversion/svn/main.c
  (svn_cl__longopt_t, svn_cl__cmd_table): Rename opt_no_diff_props to
   opt_ignore_props.
  (svn_cl__options): Rename --no-diff-properties to --ignore-properties
   and update a reference to the old name in the help text of 'svn diff'.
  (main): Track renamed fields.

* subversion/svn/diff-cmd.c
  (svn_cl__diff): Track renamed fields.

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=1239617&r1=1239616&r2=1239617&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Thu Feb  2 13:46:11 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 no_diff_props;   /* do not show diffs for properties */
+  svn_boolean_t ignore_props;    /* 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=1239617&r1=1239616&r2=1239617&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/diff-cmd.c (original)
+++ subversion/trunk/subversion/svn/diff-cmd.c Thu Feb  2 13:46:11 2012
@@ -174,7 +174,7 @@ svn_cl__diff(apr_getopt_t *os,
   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->no_diff_props;
+    opt_state->use_patch_diff_format ? TRUE : opt_state->ignore_props;
   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=1239617&r1=1239616&r2=1239617&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Thu Feb  2 13:46:11 2012
@@ -89,7 +89,7 @@ typedef enum svn_cl__longopt_t {
   opt_no_auth_cache,
   opt_no_autoprops,
   opt_no_diff_deleted,
-  opt_no_diff_props,
+  opt_ignore_props,
   opt_no_ignore,
   opt_no_unlock,
   opt_non_interactive,
@@ -241,8 +241,8 @@ 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")},
-  {"no-diff-properties", opt_no_diff_props, 0,
-                    N_("do not print differences for properties")},
+  {"ignore-properties", opt_ignore_props, 0,
+                    N_("ignore properties during the operation")},
   {"notice-ancestry", opt_notice_ancestry, 0,
                     N_("notice ancestry when calculating differences")},
   {"ignore-ancestry", opt_ignore_ancestry, 0,
@@ -352,7 +352,7 @@ const apr_getopt_option_t svn_cl__option
                        "                             "
                        "patch tools; currently the same as\n"
                        "                             "
-                       "--show-copies-as-adds --no-diff-properties\n"
+                       "--show-copies-as-adds --ignore-properties\n"
                        )},
   {"allow-mixed-revisions", opt_allow_mixed_revisions, 0,
                        N_("Allow merge into mixed-revision working copy.\n"
@@ -549,7 +549,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_no_diff_props,
+     opt_internal_diff, 'x', opt_no_diff_deleted, opt_ignore_props,
      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_
@@ -1919,8 +1919,8 @@ main(int argc, const char *argv[])
       case opt_no_diff_deleted:
         opt_state.no_diff_deleted = TRUE;
         break;
-      case opt_no_diff_props:
-        opt_state.no_diff_props = TRUE;
+      case opt_ignore_props:
+        opt_state.ignore_props = TRUE;
         break;
       case opt_show_copies_as_adds:
         opt_state.show_copies_as_adds = TRUE;



Mime
View raw message