You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/09 13:04:58 UTC
svn commit: r1336086 - in /subversion/trunk/subversion: include/svn_client.h
libsvn_client/diff.c
Author: stsp
Date: Wed May 9 11:04:57 2012
New Revision: 1336086
URL: http://svn.apache.org/viewvc?rev=1336086&view=rev
Log:
Rename ignore_prop_diff parameter of svn_client_diff6() to ignore_properties.
The new name matches the corresponding command line option.
No functional change.
* subversion/include/svn_client.h
(svn_client_diff6, svn_client_diff_peg6): Rename parameter as above,
update docstring.
* subversion/libsvn_client/diff.c
(diff_cmd_baton, diff_props_changed, do_arbitrary_files_diff,
svn_client_diff6, svn_client_diff_peg6): Rename parameter as above.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1336086&r1=1336085&r2=1336086&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed May 9 11:04:57 2012
@@ -2883,7 +2883,7 @@ svn_client_blame(const char *path_or_url
* will be used.
* ### Do we need to say more about the format? A reference perhaps?
*
- * If @a ignore_prop_diff is TRUE, do not show property differences.
+ * If @a ignore_properties is TRUE, do not show property differences.
*
* Generated headers are encoded using @a header_encoding.
*
@@ -2929,7 +2929,7 @@ svn_client_diff6(const apr_array_header_
svn_boolean_t no_diff_deleted,
svn_boolean_t show_copies_as_adds,
svn_boolean_t ignore_content_type,
- svn_boolean_t ignore_prop_diff,
+ svn_boolean_t ignore_properties,
svn_boolean_t use_git_diff_format,
const char *header_encoding,
svn_stream_t *outstream,
@@ -3089,7 +3089,7 @@ svn_client_diff_peg6(const apr_array_hea
svn_boolean_t no_diff_deleted,
svn_boolean_t show_copies_as_adds,
svn_boolean_t ignore_content_type,
- svn_boolean_t ignore_prop_diff,
+ svn_boolean_t ignore_properties,
svn_boolean_t use_git_diff_format,
const char *header_encoding,
svn_stream_t *outstream,
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1336086&r1=1336085&r2=1336086&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Wed May 9 11:04:57 2012
@@ -777,7 +777,7 @@ struct diff_cmd_baton {
const char *relative_to_dir;
/* Whether property differences are ignored. */
- svn_boolean_t ignore_prop_diff;
+ svn_boolean_t ignore_properties;
/* Whether we're producing a git-style diff. */
svn_boolean_t use_git_diff_format;
@@ -831,7 +831,7 @@ diff_props_changed(svn_wc_notify_state_t
svn_boolean_t show_diff_header;
/* If property differences are ignored, there's nothing to do. */
- if (diff_cmd_baton->ignore_prop_diff)
+ if (diff_cmd_baton->ignore_properties)
return SVN_NO_ERROR;
SVN_ERR(svn_categorize_props(propchanges, NULL, NULL, &props,
@@ -1836,7 +1836,7 @@ do_arbitrary_files_diff(const char *loca
if (ctx->cancel_func)
SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
- if (diff_cmd_baton->ignore_prop_diff)
+ if (diff_cmd_baton->ignore_properties)
{
original_props = apr_hash_make(scratch_pool);
modified_props = apr_hash_make(scratch_pool);
@@ -2937,7 +2937,7 @@ svn_client_diff6(const apr_array_header_
svn_boolean_t no_diff_deleted,
svn_boolean_t show_copies_as_adds,
svn_boolean_t ignore_content_type,
- svn_boolean_t ignore_prop_diff,
+ svn_boolean_t ignore_properties,
svn_boolean_t use_git_diff_format,
const char *header_encoding,
svn_stream_t *outstream,
@@ -2967,7 +2967,7 @@ svn_client_diff6(const apr_array_header_
diff_cmd_baton.force_empty = FALSE;
diff_cmd_baton.force_binary = ignore_content_type;
- diff_cmd_baton.ignore_prop_diff = ignore_prop_diff;
+ diff_cmd_baton.ignore_properties = ignore_properties;
diff_cmd_baton.relative_to_dir = relative_to_dir;
diff_cmd_baton.use_git_diff_format = use_git_diff_format;
diff_cmd_baton.no_diff_deleted = no_diff_deleted;
@@ -2996,7 +2996,7 @@ svn_client_diff_peg6(const apr_array_hea
svn_boolean_t no_diff_deleted,
svn_boolean_t show_copies_as_adds,
svn_boolean_t ignore_content_type,
- svn_boolean_t ignore_prop_diff,
+ svn_boolean_t ignore_properties,
svn_boolean_t use_git_diff_format,
const char *header_encoding,
svn_stream_t *outstream,
@@ -3022,7 +3022,7 @@ svn_client_diff_peg6(const apr_array_hea
diff_cmd_baton.force_empty = FALSE;
diff_cmd_baton.force_binary = ignore_content_type;
- diff_cmd_baton.ignore_prop_diff = ignore_prop_diff;
+ diff_cmd_baton.ignore_properties = ignore_properties;
diff_cmd_baton.relative_to_dir = relative_to_dir;
diff_cmd_baton.use_git_diff_format = use_git_diff_format;
diff_cmd_baton.no_diff_deleted = no_diff_deleted;