Author: hwright
Date: Sat May 5 21:29:57 2012
New Revision: 1334510
URL: http://svn.apache.org/viewvc?rev=1334510&view=rev
Log:
On the ev2-export branch:
Remove an API introduced on this branch in favor of an identical one on trunk.
* subversion/include/private/svn_wc_private.h
(svn_wc__node_pristine_read): Remove.
* subversion/libsvn_wc/node.c
(svn_wc__node_pristine_read): Remove.
* subversion/libsvn_client/commit_util.c
(do_item_commit): Use the new API.
Modified:
subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
subversion/branches/ev2-export/subversion/libsvn_wc/node.c
Modified:
subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h?rev=1334510&r1=1334509&r2=1334510&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
(original)
+++ subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
Sat May 5 21:29:57 2012
@@ -1100,22 +1100,6 @@ svn_wc__get_pristine_contents_by_checksu
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* If requested set *CONTENTS to a readable stream that will yield the pristine
- text identified by SHA1_CHECKSUM (must be a SHA-1 checksum) within the WC
- identified by WRI_ABSPATH in DB.
-
- Even if the pristine text is removed from the store while it is being
- read, the stream will remain valid and readable until it is closed.
-
- Allocate the stream in RESULT_POOL. */
-svn_error_t *
-svn_wc__node_pristine_read(svn_stream_t **contents,
- svn_wc_context_t *wc_ctx,
- const char *wri_abspath,
- const svn_checksum_t *sha1_checksum,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/* Set *TEMP_DIR_ABSPATH to a directory in which the caller should create
a uniquely named file for later installation as a pristine text file.
Modified: subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c?rev=1334510&r1=1334509&r2=1334510&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
(original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c Sat
May 5 21:29:57 2012
@@ -1636,9 +1636,11 @@ do_item_commit(svn_client_commit_item3_t
if (err)
goto fixup_error;
- err = svn_wc__node_pristine_read(&contents, ctx->wc_ctx, item->path,
- sha1_checksum, scratch_pool,
- scratch_pool);
+ err = svn_wc__get_pristine_contents_by_checksum(&contents, ctx->wc_ctx,
+ item->path,
+ sha1_checksum,
+ scratch_pool,
+ scratch_pool);
if (err)
goto fixup_error;
}
Modified: subversion/branches/ev2-export/subversion/libsvn_wc/node.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_wc/node.c?rev=1334510&r1=1334509&r2=1334510&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_wc/node.c Sat May 5
21:29:57 2012
@@ -1648,19 +1648,6 @@ svn_wc__node_pristine_install(svn_wc_con
}
svn_error_t *
-svn_wc__node_pristine_read(svn_stream_t **contents,
- svn_wc_context_t *wc_ctx,
- const char *wri_abspath,
- const svn_checksum_t *sha1_checksum,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- return svn_error_trace(svn_wc__db_pristine_read(contents, NULL, wc_ctx->db,
- wri_abspath, sha1_checksum,
- result_pool, scratch_pool));
-}
-
-svn_error_t *
svn_wc__node_pristine_get_tempdir(const char **temp_dir_abspath,
svn_wc_context_t *wc_ctx,
const char *wri_abspath,
