You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/10/10 14:52:49 UTC
svn commit: r1396577 - in /subversion/trunk/subversion:
libsvn_client/cleanup.c libsvn_client/merge.c svn/propedit-cmd.c
Author: hwright
Date: Wed Oct 10 12:52:49 2012
New Revision: 1396577
URL: http://svn.apache.org/viewvc?rev=1396577&view=rev
Log:
Remove deprecated function use, bump callers from svn_client_propget4() to
svn_client_propget5().
* subversion/svn/propedit-cmd.c
(svn_cl__propedit),
* subversion/libsvn_client/merge.c
(get_wc_explicit_mergeinfo_catalog),
* subversion/libsvn_client/cleanup.c
(svn_client_upgrade):
Use svn_client_propget5(), but don't fetch inherited properties.
Modified:
subversion/trunk/subversion/libsvn_client/cleanup.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/svn/propedit-cmd.c
Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1396577&r1=1396576&r2=1396577&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Wed Oct 10 12:52:49 2012
@@ -144,8 +144,9 @@ svn_client_upgrade(const char *path,
upgrade to avoid that errors in the externals causes the wc upgrade to
fail. Thanks to caching the performance penalty of walking the wc a
second time shouldn't be too severe */
- SVN_ERR(svn_client_propget4(&externals, SVN_PROP_EXTERNALS, local_abspath,
- &rev, &rev, NULL, svn_depth_infinity, NULL, ctx,
+ SVN_ERR(svn_client_propget5(&externals, NULL, SVN_PROP_EXTERNALS,
+ local_abspath, &rev, &rev, NULL,
+ svn_depth_infinity, NULL, ctx,
scratch_pool, scratch_pool));
iterpool = svn_pool_create(scratch_pool);
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1396577&r1=1396576&r2=1396577&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Oct 10 12:52:49 2012
@@ -5733,10 +5733,10 @@ get_wc_explicit_mergeinfo_catalog(apr_ha
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
apr_hash_index_t *hi;
- SVN_ERR(svn_client_propget4(subtrees_with_mergeinfo, SVN_PROP_MERGEINFO,
- target_abspath, &working_revision,
- &working_revision, NULL, depth, NULL,
- ctx, result_pool, scratch_pool));
+ SVN_ERR(svn_client_propget5(subtrees_with_mergeinfo, NULL,
+ SVN_PROP_MERGEINFO, target_abspath,
+ &working_revision, &working_revision, NULL,
+ depth, NULL, ctx, result_pool, scratch_pool));
/* Convert property values to svn_mergeinfo_t. */
for (hi = apr_hash_first(scratch_pool, *subtrees_with_mergeinfo);
Modified: subversion/trunk/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propedit-cmd.c?rev=1396577&r1=1396576&r2=1396577&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/propedit-cmd.c (original)
+++ subversion/trunk/subversion/svn/propedit-cmd.c Wed Oct 10 12:52:49 2012
@@ -228,7 +228,7 @@ svn_cl__propedit(apr_getopt_t *os,
peg_revision.kind = svn_opt_revision_unspecified;
/* Fetch the current property. */
- SVN_ERR(svn_client_propget4(&props, pname_utf8, abspath_or_url,
+ SVN_ERR(svn_client_propget5(&props, NULL, pname_utf8, abspath_or_url,
&peg_revision,
&(opt_state->start_revision),
&base_rev, svn_depth_empty,