You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/03/15 15:15:56 UTC
svn commit: r1081797 - in /subversion/trunk/subversion: libsvn_wc/
tests/libsvn_wc/
Author: rhuijben
Date: Tue Mar 15 14:15:56 2011
New Revision: 1081797
URL: http://svn.apache.org/viewvc?rev=1081797&view=rev
Log:
Add an UPDATE_ROOT argument to svn_wc__db_base_get_info() and update all
callers to just pass NULL for it.
* subversion/libsvn_wc/wc_db.c
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_base_get_info): Add update_root argument.
* subversion/libsvn_wc/adm_crawler.c
* subversion/libsvn_wc/adm_files.c
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_wc/ambient_depth_filter_editor.c
* subversion/libsvn_wc/crop.c
* subversion/libsvn_wc/diff.c
* subversion/libsvn_wc/entries.c
* subversion/libsvn_wc/node.c
* subversion/libsvn_wc/update_editor.c
* subversion/libsvn_wc/workqueue.c
* subversion/tests/libsvn_wc/db-test.c
(*): Update all callers.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/trunk/subversion/libsvn_wc/crop.c
subversion/trunk/subversion/libsvn_wc/diff.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/libsvn_wc/workqueue.c
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Mar 15 14:15:56 2011
@@ -363,7 +363,7 @@ report_revisions_and_depths(svn_wc__db_t
&this_repos_root_url,
NULL, NULL, NULL, NULL, NULL,
&this_depth,
- NULL, NULL, NULL, &this_lock,
+ NULL, NULL, NULL, &this_lock, NULL,
db, this_abspath, iterpool, iterpool));
/* First check for exclusion */
@@ -691,7 +691,7 @@ find_base_rev(svn_revnum_t *base_rev,
return svn_error_return(
svn_wc__db_base_get_info(NULL, NULL, base_rev, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL,
+ NULL, NULL,
db, local_abspath, pool, pool));
if (status == svn_wc__db_status_added)
@@ -766,7 +766,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
&repos_relpath, &repos_root,
NULL, NULL, NULL, NULL, NULL,
&target_depth, NULL, NULL, NULL,
- &target_lock,
+ &target_lock, NULL,
db, local_abspath, scratch_pool,
scratch_pool);
@@ -931,7 +931,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
err = svn_wc__db_base_get_info(&parent_status, NULL, NULL,
&parent_repos_relpath, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL,
+ NULL, NULL, NULL,
db, parent_abspath,
scratch_pool, scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Tue Mar 15 14:15:56 2011
@@ -226,7 +226,7 @@ svn_wc__ultimate_base_text_path(const ch
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, &checksum,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
if (checksum == NULL)
@@ -278,7 +278,7 @@ svn_wc__get_ultimate_base_contents(svn_s
SVN_ERR(svn_wc__db_base_get_info(&status, &kind, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, &checksum,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
if (kind != svn_wc__db_kind_file)
@@ -381,7 +381,7 @@ svn_wc__get_ultimate_base_checksums(cons
err = svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, &checksum,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath,
result_pool, scratch_pool);
if ((err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Mar 15 14:15:56 2011
@@ -640,7 +640,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
svn_wc__db_status_t base_status;
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
db, local_abspath, pool, pool));
if (base_status == svn_wc__db_status_not_present)
@@ -1549,7 +1549,7 @@ revert_internal(svn_wc__db_t *db,
if (! unversioned && have_base)
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
db, local_abspath, pool, pool));
replaced = ! unversioned && (status == svn_wc__db_status_added
@@ -1940,7 +1940,7 @@ svn_wc__internal_remove_from_revision_co
err = svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
&base_sha1_checksum,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool);
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
Modified: subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c Tue Mar 15 14:15:56 2011
@@ -142,7 +142,7 @@ ambient_read_info(svn_boolean_t *hidden,
if (read_base)
err = svn_wc__db_base_get_info(status, kind, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, depth, NULL, NULL,
- NULL, NULL,
+ NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool);
else
Modified: subversion/trunk/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Tue Mar 15 14:15:56 2011
@@ -275,7 +275,7 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
SVN_ERR(svn_wc__db_base_get_info(NULL, &kind, &revision, &repos_relpath,
&repos_root, &repos_uuid, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL,
+ NULL, NULL,
wc_ctx->db, local_abspath,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Tue Mar 15 14:15:56 2011
@@ -166,7 +166,7 @@ get_nearest_pristine_text_as_file(const
err = svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, &checksum,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool);
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
@@ -588,7 +588,7 @@ file_diff(struct dir_baton *db,
if (have_base)
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, &revert_base_revnum,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
eb->db, local_abspath, pool, pool));
replaced = ((status == svn_wc__db_status_added)
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue Mar 15 14:15:56 2011
@@ -227,6 +227,7 @@ get_base_info_for_deleted(svn_wc_entry_t
&entry->working_size,
NULL,
NULL,
+ NULL,
db,
entry_abspath,
result_pool,
@@ -382,6 +383,7 @@ read_one_entry(const svn_wc_entry_t **ne
const char *original_root_url;
svn_boolean_t conflicted;
svn_boolean_t have_base;
+ svn_boolean_t update_root = FALSE;
entry->name = name;
@@ -579,6 +581,7 @@ read_one_entry(const svn_wc_entry_t **ne
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
+ &update_root,
db, entry_abspath,
scratch_pool,
scratch_pool));
@@ -926,7 +929,7 @@ read_one_entry(const svn_wc_entry_t **ne
/* Let's check for a file external.
### right now this is ugly, since we have no good way querying
### for a file external OR retrieving properties. ugh. */
- if (entry->kind == svn_node_file)
+ if (update_root && entry->kind == svn_node_file)
SVN_ERR(check_file_external(entry, db, entry_abspath, result_pool,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue Mar 15 14:15:56 2011
@@ -889,7 +889,7 @@ svn_wc__internal_is_replaced(svn_boolean
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -941,7 +941,7 @@ svn_wc__node_get_base_rev(svn_revnum_t *
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
wc_ctx->db, local_abspath,
scratch_pool, scratch_pool));
}
@@ -997,7 +997,7 @@ svn_wc__node_get_working_rev_info(svn_re
NULL, NULL, changed_rev,
changed_date, changed_author,
NULL, NULL, NULL, NULL, NULL,
- NULL, wc_ctx->db,
+ NULL, NULL, wc_ctx->db,
base_del_abspath, result_pool,
scratch_pool));
}
@@ -1008,7 +1008,7 @@ svn_wc__node_get_working_rev_info(svn_re
svn_revnum_t base_rev;
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, &base_rev, NULL, NULL,
NULL, changed_rev, changed_date,
- changed_author, NULL, NULL, NULL,
+ changed_author, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, wc_ctx->db, local_abspath,
result_pool, scratch_pool));
@@ -1120,7 +1120,7 @@ svn_wc__node_get_lock_info(const char **
err = svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- &lock,
+ &lock, NULL,
wc_ctx->db, local_abspath,
result_pool, scratch_pool);
@@ -1304,7 +1304,7 @@ svn_wc__internal_node_get_schedule(svn_w
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
- NULL,
+ NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Mar 15 14:15:56 2011
@@ -748,7 +748,7 @@ complete_directory(struct edit_baton *eb
have to worry about removing it. */
err = svn_wc__db_base_get_info(&status, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL,
+ NULL, NULL, NULL,
eb->db, eb->target_abspath, pool, pool);
if (err)
{
@@ -789,6 +789,7 @@ complete_directory(struct edit_baton *eb
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, &depth, NULL, NULL, NULL, NULL,
+ NULL,
eb->db, local_abspath,
iterpool, iterpool));
@@ -827,7 +828,7 @@ complete_directory(struct edit_baton *eb
node_abspath = svn_dirent_join(local_abspath, name, iterpool);
SVN_ERR(svn_wc__db_base_get_info(&status, &kind, &revnum,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
eb->db, node_abspath,
@@ -1264,9 +1265,10 @@ open_root(void *edit_baton,
svn_wc__db_status_t status;
/* Read the depth from the entry. */
- SVN_ERR(svn_wc__db_base_get_info(&status, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, &depth, NULL, NULL, NULL,
- NULL, eb->db, db->local_abspath, pool, pool));
+ SVN_ERR(svn_wc__db_base_get_info(&status, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, &depth, NULL, NULL,
+ NULL, NULL, NULL,
+ eb->db, db->local_abspath, pool, pool));
db->ambient_depth = depth;
db->was_incomplete = (status == svn_wc__db_status_incomplete);
@@ -1506,7 +1508,7 @@ create_tree_conflict(svn_wc_conflict_des
&left_repos_relpath,
&repos_root_url,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
eb->db,
local_abspath,
result_pool,
@@ -1667,7 +1669,7 @@ check_tree_conflict(svn_wc_conflict_desc
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
- NULL, NULL,
+ NULL, NULL, NULL,
eb->db, local_abspath,
pool,
pool));
@@ -2532,7 +2534,7 @@ open_directory(const char *path,
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, &db->old_revision,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&db->ambient_depth, NULL, NULL, NULL,
- NULL,
+ NULL, NULL,
eb->db, db->local_abspath, pool, pool));
db->was_incomplete = (base_status == svn_wc__db_status_incomplete);
@@ -2843,6 +2845,7 @@ close_directory(void *dir_baton,
&changed_date,
&changed_author,
NULL, &depth, NULL, NULL, NULL, NULL,
+ NULL,
eb->db, db->local_abspath,
pool, pool));
@@ -3732,7 +3735,7 @@ merge_file(svn_skel_t **work_items,
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, &revision, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
db, fb->local_abspath,
scratch_pool, scratch_pool));
@@ -4333,7 +4336,7 @@ close_file(void *file_baton,
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL,
- &new_checksum, NULL, NULL, NULL,
+ &new_checksum, NULL, NULL, NULL, NULL,
eb->db, fb->local_abspath,
pool, pool));
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Mar 15 14:15:56 2011
@@ -1757,10 +1757,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
/* Like svn_wc__db_base_get_info(), but taking WCROOT+LOCAL_RELPATH instead of
- DB+LOCAL_ABSPATH and outputting REPOS_ID instead of URL+UUID.
-
- If UPDATE_ROOT is not null, set *UPDATE_ROOT to TRUE if the node should only
- be updated when it is the root of an update (E.G. file externals) */
+ DB+LOCAL_ABSPATH and outputting REPOS_ID instead of URL+UUID. */
static svn_error_t *
base_get_info(svn_wc__db_status_t *status,
svn_wc__db_kind_t *kind,
@@ -1909,6 +1906,7 @@ svn_wc__db_base_get_info(svn_wc__db_stat
svn_filesize_t *translated_size,
const char **target,
svn_wc__db_lock_t **lock,
+ svn_boolean_t *update_root,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -1928,7 +1926,7 @@ svn_wc__db_base_get_info(svn_wc__db_stat
SVN_ERR(base_get_info(status, kind, revision, repos_relpath, &repos_id,
changed_rev, changed_date, changed_author,
last_mod_time, depth, checksum, translated_size,
- target, lock, NULL,
+ target, lock, update_root,
wcroot, local_relpath, result_pool, scratch_pool));
SVN_ERR_ASSERT(repos_id != INVALID_REPOS_ID);
SVN_ERR(fetch_repos_info(repos_root_url, repos_uuid,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue Mar 15 14:15:56 2011
@@ -719,6 +719,9 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
If TARGET is requested, and the node is NOT a symlink, then it will
be set to NULL.
+ If UPDATE_ROOT is requested, set it to TRUE if the node should only
+ be updated when it is the root of an update (e.g. file externals).
+
All returned data will be allocated in RESULT_POOL. All temporary
allocations will be made in SCRATCH_POOL.
*/
@@ -738,6 +741,7 @@ svn_wc__db_base_get_info(svn_wc__db_stat
svn_filesize_t *translated_size,
const char **target,
svn_wc__db_lock_t **lock,
+ svn_boolean_t *update_root,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Mar 15 14:15:56 2011
@@ -324,7 +324,7 @@ verify_pristine_present(svn_wc__db_t *db
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
- &base_checksum, NULL, NULL, NULL,
+ &base_checksum, NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
if (base_checksum != NULL)
@@ -515,7 +515,7 @@ remove_base_node(svn_wc__db_t *db,
else
SVN_ERR(svn_wc__db_base_get_info(&base_status, &base_kind, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -605,7 +605,7 @@ run_base_remove(svn_wc__db_t *db,
SVN_ERR(svn_wc__db_base_get_info(NULL, &kind, &revision, &repos_relpath,
&repos_root_url, &repos_uuid, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL,
+ NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
}
@@ -697,7 +697,7 @@ run_deletion_postcommit(svn_wc__db_t *db
before deleting the file, */
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, &parent_revision, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
db, svn_dirent_dirname(local_abspath,
scratch_pool),
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1081797&r1=1081796&r2=1081797&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Tue Mar 15 14:15:56 2011
@@ -426,7 +426,7 @@ test_getting_info(apr_pool_t *pool)
&status, &kind, &revision,
&repos_relpath, &repos_root_url, &repos_uuid,
&changed_rev, &changed_date, &changed_author, &last_mod_time,
- &depth, &checksum, &translated_size, &target, &lock,
+ &depth, &checksum, &translated_size, &target, &lock, NULL,
db, local_abspath,
pool, pool));
SVN_TEST_ASSERT(kind == svn_wc__db_kind_dir);
@@ -450,7 +450,7 @@ test_getting_info(apr_pool_t *pool)
NULL, &kind, NULL,
&repos_relpath, &repos_root_url, &repos_uuid,
NULL, NULL, NULL, NULL,
- NULL, &checksum, &translated_size, NULL, NULL,
+ NULL, &checksum, &translated_size, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "A", pool),
pool, pool));
SVN_TEST_ASSERT(kind == svn_wc__db_kind_file);
@@ -465,7 +465,7 @@ test_getting_info(apr_pool_t *pool)
&status, &kind, &revision,
&repos_relpath, &repos_root_url, &repos_uuid,
&changed_rev, &changed_date, &changed_author, &last_mod_time,
- &depth, &checksum, &translated_size, &target, &lock,
+ &depth, &checksum, &translated_size, &target, &lock, NULL,
db, svn_dirent_join(local_abspath, "B", pool),
pool, pool));
SVN_TEST_ASSERT(kind == svn_wc__db_kind_symlink);
@@ -489,7 +489,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "C", pool),
pool, pool));
SVN_TEST_ASSERT(kind == svn_wc__db_kind_unknown);
@@ -501,7 +501,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "D", pool),
pool, pool));
SVN_TEST_ASSERT(status == svn_wc__db_status_not_present);
@@ -512,7 +512,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "E", pool),
pool, pool));
SVN_TEST_ASSERT(status == svn_wc__db_status_incomplete);
@@ -522,7 +522,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, &checksum, &translated_size, NULL, NULL,
+ NULL, NULL, &checksum, &translated_size, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "F", pool),
pool, pool));
SVN_TEST_STRING_ASSERT(SHA1_1,
@@ -534,7 +534,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
&repos_relpath, &repos_root_url, &repos_uuid,
&changed_rev, &changed_date, &changed_author,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "G", pool),
pool, pool));
SVN_TEST_STRING_ASSERT(repos_relpath, "G-alt");
@@ -549,7 +549,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, &checksum, &translated_size, &target, NULL,
+ NULL, NULL, &checksum, &translated_size, &target, NULL, NULL,
db, svn_dirent_join(local_abspath, "H", pool),
pool, pool));
SVN_TEST_ASSERT(checksum == NULL);
@@ -562,7 +562,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "missing-file", pool),
pool, pool);
SVN_TEST_ASSERT(err != NULL && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND);
@@ -591,7 +591,7 @@ validate_node(svn_wc__db_t *db,
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, path,
scratch_pool, scratch_pool));
SVN_TEST_ASSERT(kind == expected_kind);