You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/10/30 12:53:31 UTC
svn commit: r1403672 - in /subversion/trunk/subversion/libsvn_wc: wc_db.c
wc_db_private.h
Author: stsp
Date: Tue Oct 30 11:53:30 2012
New Revision: 1403672
URL: http://svn.apache.org/viewvc?rev=1403672&view=rev
Log:
Expose scan_deletion() from wc_db.c for use by other wc_db source files.
* subversion/libsvn_wc/wc_db_private.h
(svn_wc__db_scan_deletion_internal): Declare.
* subversion/libsvn_wc/wc_db.c
(scan_deletion): Remove forward declaration, and rename to ...
(svn_wc__db_scan_deletion_internal): ... this.
(get_info_for_copy, read_url_txn, svn_wc__db_global_relocate,
scan_deletion_txn, svn_wc__db_scan_deletion): Update scan_deletion() callers.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db_private.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=1403672&r1=1403671&r2=1403672&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Oct 30 11:53:30 2012
@@ -410,16 +410,6 @@ scan_addition(svn_wc__db_status_t *statu
apr_pool_t *scratch_pool);
static svn_error_t *
-scan_deletion(const char **base_del_relpath,
- const char **moved_to_relpath,
- const char **work_del_relpath,
- const char **moved_to_op_root_relpath,
- svn_wc__db_wcroot_t *wcroot,
- const char *local_relpath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-static svn_error_t *
convert_to_working_status(svn_wc__db_status_t *working_status,
svn_wc__db_status_t status);
@@ -3784,9 +3774,10 @@ get_info_for_copy(apr_int64_t *copyfrom_
{
const char *base_del_relpath, *work_del_relpath;
- SVN_ERR(scan_deletion(&base_del_relpath, NULL, &work_del_relpath,
- NULL, wcroot, local_relpath, scratch_pool,
- scratch_pool));
+ SVN_ERR(svn_wc__db_scan_deletion_internal(&base_del_relpath, NULL,
+ &work_del_relpath,
+ NULL, wcroot, local_relpath,
+ scratch_pool, scratch_pool));
if (work_del_relpath)
{
const char *op_root_relpath;
@@ -8561,9 +8552,12 @@ read_url_txn(void *baton,
const char *base_del_relpath;
const char *work_del_relpath;
- SVN_ERR(scan_deletion(&base_del_relpath, NULL, &work_del_relpath,
- NULL, wcroot, local_relpath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_scan_deletion_internal(&base_del_relpath, NULL,
+ &work_del_relpath,
+ NULL, wcroot,
+ local_relpath,
+ scratch_pool,
+ scratch_pool));
if (base_del_relpath)
{
@@ -9543,9 +9537,12 @@ svn_wc__db_global_relocate(svn_wc__db_t
if (status == svn_wc__db_status_deleted)
{
const char *work_del_relpath;
- SVN_ERR(scan_deletion(NULL, NULL, &work_del_relpath, NULL,
- wcroot, local_dir_relpath,
- scratch_pool, scratch_pool));
+
+ SVN_ERR(svn_wc__db_scan_deletion_internal(NULL, NULL,
+ &work_del_relpath, NULL,
+ wcroot, local_dir_relpath,
+ scratch_pool,
+ scratch_pool));
if (work_del_relpath)
{
/* Deleted within a copy/move */
@@ -11409,17 +11406,15 @@ scan_deletion_txn(void *baton,
}
-/* Like svn_wc__db_scan_deletion(), but with WCROOT+LOCAL_RELPATH instead of
- DB+LOCAL_ABSPATH, and outputting relpaths instead of abspaths. */
-static svn_error_t *
-scan_deletion(const char **base_del_relpath,
- const char **moved_to_relpath,
- const char **work_del_relpath,
- const char **moved_to_op_root_relpath,
- svn_wc__db_wcroot_t *wcroot,
- const char *local_relpath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_error_t *
+svn_wc__db_scan_deletion_internal(const char **base_del_relpath,
+ const char **moved_to_relpath,
+ const char **work_del_relpath,
+ const char **moved_to_op_root_relpath,
+ svn_wc__db_wcroot_t *wcroot,
+ const char *local_relpath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
struct scan_deletion_baton_t sd_baton;
@@ -11456,9 +11451,12 @@ svn_wc__db_scan_deletion(const char **ba
local_abspath, scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- SVN_ERR(scan_deletion(&base_del_relpath, &moved_to_relpath,
- &work_del_relpath, &moved_to_op_root_relpath, wcroot,
- local_relpath, scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_scan_deletion_internal(&base_del_relpath,
+ &moved_to_relpath,
+ &work_del_relpath,
+ &moved_to_op_root_relpath, wcroot,
+ local_relpath, scratch_pool,
+ scratch_pool));
if (base_del_abspath)
{
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_private.h?rev=1403672&r1=1403671&r2=1403672&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_private.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_private.h Tue Oct 30 11:53:30 2012
@@ -208,6 +208,18 @@ svn_wc__db_read_info_internal(svn_wc__db
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Like svn_wc__db_scan_deletion(), but with WCROOT+LOCAL_RELPATH instead of
+ DB+LOCAL_ABSPATH, and outputting relpaths instead of abspaths. */
+svn_error_t *
+svn_wc__db_scan_deletion_internal(const char **base_del_relpath,
+ const char **moved_to_relpath,
+ const char **work_del_relpath,
+ const char **moved_to_op_root_relpath,
+ svn_wc__db_wcroot_t *wcroot,
+ const char *local_relpath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
/* Transaction handling */