You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/19 22:54:57 UTC
svn commit: r935738 - in /subversion/trunk/subversion/libsvn_client: cat.c
export.c mergeinfo.c
Author: gstein
Date: Mon Apr 19 20:54:57 2010
New Revision: 935738
URL: http://svn.apache.org/viewvc?rev=935738&view=rev
Log:
Use svn_wc_get_pristine_props() where appropriate, instead of
svn_wc_prop_diffs2()
* subversion/libsvn_client/cat.c:
(cat_local_file): switch to svn_wc_get_pristine_props
* subversion/libsvn_client/export.c:
(copy_one_versioned_file): switch to svn_wc_get_pristine_props
* subversion/libsvn_client/mergeinfo.c:
(svn_client__get_wc_or_repos_mergeinfo_catalog): switch to
svn_wc_get_pristine_props
Modified:
subversion/trunk/subversion/libsvn_client/cat.c
subversion/trunk/subversion/libsvn_client/export.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
Modified: subversion/trunk/subversion/libsvn_client/cat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cat.c?rev=935738&r1=935737&r2=935738&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cat.c (original)
+++ subversion/trunk/subversion/libsvn_client/cat.c Mon Apr 19 20:54:57 2010
@@ -86,14 +86,13 @@ cat_local_file(svn_wc_context_t *wc_ctx,
{
SVN_ERR(svn_wc_get_pristine_contents2(&input, wc_ctx, local_abspath,
scratch_pool, scratch_pool));
-
if (input == NULL)
return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
_("'%s' has no base revision until it is committed"),
svn_dirent_local_style(local_abspath, scratch_pool));
- SVN_ERR(svn_wc_get_prop_diffs2(NULL, &props, wc_ctx, local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc_get_pristine_props(&props, wc_ctx, local_abspath,
+ scratch_pool, scratch_pool));
}
else
{
Modified: subversion/trunk/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=935738&r1=935737&r2=935738&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Mon Apr 19 20:54:57 2010
@@ -156,8 +156,8 @@ copy_one_versioned_file(const char *from
if (source == NULL)
return SVN_NO_ERROR;
- SVN_ERR(svn_wc_get_prop_diffs2(NULL, &props, wc_ctx, from_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc_get_pristine_props(&props, wc_ctx, from_abspath,
+ scratch_pool, scratch_pool));
}
else
{
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=935738&r1=935737&r2=935738&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Mon Apr 19 20:54:57 2010
@@ -597,10 +597,10 @@ svn_client__get_wc_or_repos_mergeinfo_ca
/* Check to see if we have local modifications which removed all of
TARGET_WCPATH's pristine mergeinfo. If that is the case then
- TARGET_WCPATH effetively has no mergeinfo. */
- SVN_ERR(svn_wc_get_prop_diffs2(NULL, &original_props, ctx->wc_ctx,
- local_abspath, result_pool,
- scratch_pool));
+ TARGET_WCPATH effectively has no mergeinfo. */
+ SVN_ERR(svn_wc_get_pristine_props(&original_props,
+ ctx->wc_ctx, local_abspath,
+ result_pool, scratch_pool));
if (!apr_hash_get(original_props, SVN_PROP_MERGEINFO,
APR_HASH_KEY_STRING))
{