You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2012/10/11 16:25:36 UTC
svn commit: r1397072 - in /subversion/branches/auto-props-sdc/subversion:
include/svn_props.h libsvn_client/add.c libsvn_wc/props.c
Author: pburba
Date: Thu Oct 11 14:25:35 2012
New Revision: 1397072
URL: http://svn.apache.org/viewvc?rev=1397072&view=rev
Log:
On the auto-props-sdc branch: Rename the reserved inheritable auto-props
constant to be consistent with our other prop constants and to agree better
with the new constant value introduced in r1396372.
* subversion/include/svn_props.h
(SVN_CONFIG_PROP_PREFIX): Rename to...
(SVN_PROP_INHERITABLE_PREFIX): ...this.
(SVN_CONFIG_PROP_AUTO_PROPS): Rename to...
(SVN_PROP_INHERITABLE_AUTO_PROPS): ...this. Also fix the comment.
* subversion/libsvn_client/add.c
* subversion/libsvn_wc/props.c
Change SVN_CONFIG_PROP_AUTO_PROPS to SVN_PROP_INHERITABLE_AUTO_PROPS to
reflect the rename.
Modified:
subversion/branches/auto-props-sdc/subversion/include/svn_props.h
subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c
subversion/branches/auto-props-sdc/subversion/libsvn_wc/props.c
Modified: subversion/branches/auto-props-sdc/subversion/include/svn_props.h
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/include/svn_props.h?rev=1397072&r1=1397071&r2=1397072&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/include/svn_props.h (original)
+++ subversion/branches/auto-props-sdc/subversion/include/svn_props.h Thu Oct 11 14:25:35 2012
@@ -384,11 +384,11 @@ svn_prop_name_is_valid(const char *prop_
*/
#define SVN_PROP_MERGEINFO SVN_PROP_PREFIX "mergeinfo"
-/** Prefix for all Subersion configurable inhertiable properties. */
-#define SVN_CONFIG_PROP_PREFIX SVN_PROP_PREFIX "inheritable-"
+/** Prefix for all Subersion inhertiable properties. */
+#define SVN_PROP_INHERITABLE_PREFIX SVN_PROP_PREFIX "inheritable-"
-/** Merge info property used to record a resource's merge history. */
-#define SVN_CONFIG_PROP_AUTO_PROPS SVN_CONFIG_PROP_PREFIX "auto-props"
+/** Property used to record inheritable configuration auto-props. */
+#define SVN_PROP_INHERITABLE_AUTO_PROPS SVN_PROP_INHERITABLE_PREFIX "auto-props"
/** Meta-data properties.
*
Modified: subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c?rev=1397072&r1=1397071&r2=1397072&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c (original)
+++ subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c Thu Oct 11 14:25:35 2012
@@ -686,8 +686,8 @@ svn_client__get_all_auto_props(apr_hash_
while (err == NULL)
{
err = svn_client_propget5(&props, &inherited_config_auto_props,
- SVN_CONFIG_PROP_AUTO_PROPS, path_or_url, &rev,
- &rev, NULL, svn_depth_empty, NULL, ctx,
+ SVN_PROP_INHERITABLE_AUTO_PROPS, path_or_url,
+ &rev, &rev, NULL, svn_depth_empty, NULL, ctx,
scratch_pool, scratch_pool);
if (err)
{
@@ -716,7 +716,7 @@ svn_client__get_all_auto_props(apr_hash_
new_iprop->path_or_url = path_or_url;
new_iprop->prop_hash = apr_hash_make(scratch_pool);
apr_hash_set(new_iprop->prop_hash,
- SVN_CONFIG_PROP_AUTO_PROPS,
+ SVN_PROP_INHERITABLE_AUTO_PROPS,
APR_HASH_KEY_STRING,
config_auto_prop);
APR_ARRAY_PUSH(inherited_config_auto_props,
Modified: subversion/branches/auto-props-sdc/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/libsvn_wc/props.c?rev=1397072&r1=1397071&r2=1397072&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/auto-props-sdc/subversion/libsvn_wc/props.c Thu Oct 11 14:25:35 2012
@@ -1675,7 +1675,7 @@ validate_prop_against_node_kind(const ch
const char *file_prohibit[] = { SVN_PROP_IGNORE,
SVN_PROP_EXTERNALS,
- SVN_CONFIG_PROP_AUTO_PROPS,
+ SVN_PROP_INHERITABLE_AUTO_PROPS,
NULL };
const char *dir_prohibit[] = { SVN_PROP_EXECUTABLE,
SVN_PROP_KEYWORDS,