You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2010/03/17 18:44:50 UTC
svn commit: r924381 - in /subversion/trunk/subversion/libsvn_wc: wc_db.c
wc_db.h
Author: neels
Date: Wed Mar 17 17:44:49 2010
New Revision: 924381
URL: http://svn.apache.org/viewvc?rev=924381&view=rev
Log:
Removing svn_wc__db_pristine_write() as discussed on dev@.
Instead of this function, a "convenience wrapper" around
svn_wc__db_pristine_get_tempdir() and svn_wc__db_pristine_install() may be
provided that provides a write stream to the callers.
Currently, most callers want a write stream, and currently, APR does not take
advantage of OS-copy operations anyway.
[[[
Thread: pristine store design
e.g. Message-ID: <6c...@mail.gmail.com>
http://mail-archives.apache.org/mod_mbox/subversion-dev/201002.mbox/%3C6cca3db31002161228u760e6073rae88f0d7b0e35dfd@mail.gmail.com%3E
]]]
* subversion/libsvn_wc/wc_db.c,
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_pristine_write): Remove function.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=924381&r1=924380&r2=924381&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Mar 17 17:44:49 2010
@@ -2362,43 +2362,6 @@ svn_wc__db_pristine_read(svn_stream_t **
svn_error_t *
-svn_wc__db_pristine_write(svn_stream_t **contents,
- svn_wc__db_t *db,
- const char *wri_abspath,
- const svn_checksum_t *checksum,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_ASSERT(contents != NULL);
- SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath));
- SVN_ERR_ASSERT(checksum != NULL);
-
- VERIFY_CHECKSUM_KIND(checksum);
-
- NOT_IMPLEMENTED();
-
-#if 0
- const char *path;
-
- SVN_ERR(get_pristine_fname(&path, pdh, checksum,
-#ifndef SVN__SKIP_SUBDIR
- TRUE /* create_subdir */,
-#endif
- scratch_pool, scratch_pool));
-
- SVN_ERR(svn_stream_open_writable(contents, path, result_pool, scratch_pool));
-
- /* ### we should wrap the stream. count the bytes. at close, then we
- ### should write the count into the sqlite database. */
- /* ### euh... no. stream closure could happen after an error, so there
- ### isn't enough information here. */
-
- return SVN_NO_ERROR;
-#endif
-}
-
-
-svn_error_t *
svn_wc__db_pristine_get_tempdir(const char **temp_dir_abspath,
svn_wc__db_t *db,
const char *wri_abspath,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=924381&r1=924380&r2=924381&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Wed Mar 17 17:44:49 2010
@@ -797,19 +797,6 @@ svn_wc__db_pristine_read(svn_stream_t **
apr_pool_t *scratch_pool);
-/* ### caller pushes contents into storage, keyed by @a checksum.
- ### note: if caller has a source stream, then it should use
- ### svn_stream_copy3 to pull/push the content into storage. */
-/* ### @a contents may NOT be NULL. */
-svn_error_t *
-svn_wc__db_pristine_write(svn_stream_t **contents,
- svn_wc__db_t *db,
- const char *wri_abspath,
- const svn_checksum_t *checksum,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
/* ### get a tempdir to drop files for later installation. */
/* ### dlr: Why is a less specific temp dir insufficient?
### bh: See svn_wc__db_pristine_install() */