Author: rhuijben
Date: Tue May 3 21:42:57 2011
New Revision: 1099273
URL: http://svn.apache.org/viewvc?rev=1099273&view=rev
Log:
Remove two unused arguments from svn_wc__db_base_get_info(). The recorded size
and recorded modification time values only make sense when you look at the
highest layer of NODES, so you would have to call _read_info to verify that
anyway.
* subversion/libsvn_wc/adm_crawler.c
(find_base_rev,
svn_wc_crawl_revisions5): Update caller.
* subversion/libsvn_wc/adm_ops.c
(svn_wc__internal_remove_from_revision_control): Update caller.
* subversion/libsvn_wc/ambient_depth_filter_editor.c
(ambient_read_info): Update caller.
* subversion/libsvn_wc/crop.c
(svn_wc_exclude): Update caller.
* subversion/libsvn_wc/diff_editor.c
(get_pristine_file,
file_diff,
open_file,
close_file): Update caller
* subversion/libsvn_wc/diff_local.c
(file_diff): Update caller.
* subversion/libsvn_wc/entries.c
(get_info_for_deleted,
read_one_entry): Update caller.
* subversion/libsvn_wc/info.c
(build_info_for_entry): Update caller.
* subversion/libsvn_wc/node.c
(svn_wc__node_get_base_rev,
svn_wc__node_get_pre_ng_status_data,
svn_wc__node_get_lock_info,
svn_wc__node_get_origin,
svn_wc__node_get_commit_status): Update caller.
* subversion/libsvn_wc/update_editor.c
(open_root,
create_tree_conflict,
check_tree_conflict,
delete_entry,
open_directory,
close_directory,
open_file,
close_edit): Update caller.
* subversion/libsvn_wc/wc_db.c
(base_get_info): Remove 2 arguments.
(svn_wc__db_base_get_info): Remove 2 arguments.
(get_info_for_copy,
bump_node_revision,
bump_revisions_post_update,
end_directory_update): Update callers.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_base_get_info): Remove 2 arguments.
* subversion/libsvn_wc/workqueue.c
(remove_base_node): Update caller.
* subversion/tests/libsvn_wc/db-test.c
(test_getting_info,
validate_node): Update callers.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.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_editor.c
subversion/trunk/subversion/libsvn_wc/diff_local.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/info.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=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue May 3 21:42:57 2011
@@ -694,7 +694,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, NULL,
+ NULL, NULL,
db, local_abspath, pool, pool));
if (status == svn_wc__db_status_added)
@@ -771,8 +771,8 @@ svn_wc_crawl_revisions5(svn_wc_context_t
err = svn_wc__db_base_get_info(&status, &target_kind, &target_rev,
&repos_relpath, &repos_root_url,
NULL, NULL, NULL, NULL, &target_depth,
- NULL, NULL, &target_lock, NULL,
- NULL, &had_props, NULL, NULL,
+ NULL, NULL, &target_lock,
+ &had_props, NULL, NULL,
db, local_abspath, scratch_pool,
scratch_pool);
@@ -948,7 +948,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,
+ NULL, NULL, NULL,
db, parent_abspath,
scratch_pool, scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue May 3 21:42:57 2011
@@ -2020,8 +2020,8 @@ svn_wc__internal_remove_from_revision_co
/* Find the checksum(s) of the node's one or two pristine texts. Note
that read_info() may give us the one from BASE_NODE again. */
err = svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
- &base_sha1_checksum, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ &base_sha1_checksum, NULL,
NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool);
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=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
(original)
+++ subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c Tue May
3 21:42:57 2011
@@ -128,7 +128,7 @@ ambient_read_info(svn_wc__db_status_t *s
err = svn_wc__db_base_get_info(status, kind, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, depth, 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/crop.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Tue May 3 21:42:57 2011
@@ -276,7 +276,7 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
if (have_base)
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, NULL,
NULL, NULL, NULL, NULL,
wc_ctx->db, local_abspath,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Tue May 3 21:42:57 2011
@@ -177,7 +177,7 @@ get_pristine_file(const char **result_ab
{
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, &checksum,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
NULL,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -562,7 +562,6 @@ file_diff(struct edit_baton *eb,
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,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -1467,7 +1466,7 @@ open_file(const char *path,
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, &fb->base_checksum, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
eb->db, fb->local_abspath,
fb->pool, fb->pool));
@@ -1653,7 +1652,7 @@ close_file(void *file_baton,
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
&pristine_checksum,
- NULL, NULL, NULL, NULL,
+ NULL, NULL,
&had_props, NULL, NULL,
db, fb->local_abspath,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/diff_local.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_local.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_local.c Tue May 3 21:42:57 2011
@@ -177,7 +177,7 @@ file_diff(struct diff_baton *eb,
&base_revision,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, &base_checksum, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue May 3 21:42:57 2011
@@ -227,8 +227,6 @@ get_info_for_deleted(svn_wc_entry_t *ent
checksum,
NULL,
NULL /* lock */,
- NULL /* recorded_size */,
- NULL /* recorded_mod_time */,
NULL,
NULL,
NULL,
@@ -305,7 +303,7 @@ get_info_for_deleted(svn_wc_entry_t *ent
SVN_ERR(svn_wc__db_base_get_info(&status, NULL, &entry->revision,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL,
db, entry_abspath,
result_pool, scratch_pool));
@@ -571,8 +569,8 @@ read_one_entry(const svn_wc_entry_t **ne
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- NULL, NULL, NULL,
- NULL, &update_root, NULL,
+ NULL, NULL,
+ &update_root, NULL,
db, entry_abspath,
scratch_pool,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Tue May 3 21:42:57 2011
@@ -199,7 +199,6 @@ build_info_for_entry(svn_info2_t **info,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
&lock, NULL, NULL, NULL,
- NULL, NULL,
wc_ctx->db, local_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=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue May 3 21:42:57 2011
@@ -853,8 +853,8 @@ svn_wc__node_get_base_rev(svn_revnum_t *
svn_error_t *err;
err = svn_wc__db_base_get_info(NULL, NULL, base_revision, NULL,
- NULL, NULL, NULL, 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);
@@ -907,7 +907,7 @@ svn_wc__node_get_pre_ng_status_data(svn_
if (have_base && !have_more_work)
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, revision, NULL, NULL, NULL,
changed_rev, changed_date, changed_author,
- NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
wc_ctx->db, local_abspath,
result_pool, scratch_pool));
@@ -1021,7 +1021,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, &lock, NULL,
- NULL, NULL, NULL, NULL,
+ NULL, NULL,
wc_ctx->db, local_abspath,
result_pool, scratch_pool);
@@ -1464,7 +1464,7 @@ svn_wc__node_get_origin(svn_boolean_t *i
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, revision, repos_relpath,
repos_root_url, repos_uuid, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL,
wc_ctx->db, local_abspath,
result_pool, scratch_pool));
}
@@ -1576,8 +1576,7 @@ svn_wc__node_get_commit_status(svn_node_
{
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, revision, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, update_root,
- NULL,
+ NULL, NULL, update_root, NULL,
wc_ctx->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=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue May 3 21:42:57
2011
@@ -992,7 +992,7 @@ open_root(void *edit_baton,
/* Read the depth from the entry. */
SVN_ERR(svn_wc__db_base_get_info(&status, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, &depth, NULL, NULL, NULL,
+ NULL, NULL, NULL, &depth, NULL,
NULL, NULL, NULL, NULL, NULL,
eb->db, db->local_abspath, pool, pool));
db->ambient_depth = depth;
@@ -1206,8 +1206,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, NULL, NULL, NULL,
eb->db,
local_abspath,
result_pool,
@@ -1360,7 +1359,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,
+ NULL, NULL, NULL,
eb->db, local_abspath,
pool,
pool));
@@ -1628,7 +1627,7 @@ delete_entry(const char *path,
SVN_ERR(svn_wc__db_base_get_info(&base_status, &base_kind, NULL,
&repos_relpath,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
eb->db, local_abspath,
scratch_pool, scratch_pool));
@@ -2136,7 +2135,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,
&db->ambient_depth, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL,
eb->db, db->local_abspath, pool, pool));
db->was_incomplete = (base_status == svn_wc__db_status_incomplete);
@@ -2460,7 +2459,7 @@ close_directory(void *dir_baton,
&changed_date,
&changed_author,
&depth, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
+ NULL, NULL,
eb->db, db->local_abspath,
scratch_pool, scratch_pool));
@@ -3008,7 +3007,7 @@ open_file(const char *path,
SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, &fb->old_revision,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&fb->original_checksum, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL,
eb->db, fb->local_abspath,
fb->pool, scratch_pool));
@@ -4114,7 +4113,7 @@ close_edit(void *edit_baton,
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,
+ NULL, NULL, NULL, NULL,
eb->db, eb->target_abspath,
scratch_pool, scratch_pool);
if (err)
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue May 3 21:42:57 2011
@@ -1924,8 +1924,6 @@ base_get_info(svn_wc__db_status_t *statu
const svn_checksum_t **checksum,
const char **target,
svn_wc__db_lock_t **lock,
- svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
svn_boolean_t *had_props,
svn_boolean_t *update_root,
svn_boolean_t *needs_full_update,
@@ -1978,10 +1976,6 @@ base_get_info(svn_wc__db_status_t *statu
/* Result may be NULL. */
*changed_author = svn_sqlite__column_text(stmt, 9, result_pool);
}
- if (recorded_mod_time)
- {
- *recorded_mod_time = svn_sqlite__column_int64(stmt, 12);
- }
if (depth)
{
if (node_kind != svn_wc__db_kind_dir)
@@ -2016,10 +2010,6 @@ base_get_info(svn_wc__db_status_t *statu
scratch_pool));
}
}
- if (recorded_size)
- {
- *recorded_size = get_recorded_size(stmt, 6);
- }
if (target)
{
if (node_kind != svn_wc__db_kind_symlink)
@@ -2070,8 +2060,6 @@ svn_wc__db_base_get_info(svn_wc__db_stat
const svn_checksum_t **checksum,
const char **target,
svn_wc__db_lock_t **lock,
- svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
svn_boolean_t *had_props,
svn_boolean_t *update_root,
svn_boolean_t *needs_full_update,
@@ -2092,8 +2080,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, depth,
- checksum, target, lock, recorded_size,
- recorded_mod_time, had_props,
+ checksum, target, lock, had_props,
update_root, needs_full_update,
wcroot, local_relpath, result_pool, scratch_pool));
SVN_ERR_ASSERT(repos_id != INVALID_REPOS_ID);
@@ -2563,7 +2550,7 @@ get_info_for_copy(apr_int64_t *copyfrom_
{
SVN_ERR(base_get_info(NULL, NULL, copyfrom_rev, copyfrom_relpath,
copyfrom_id,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
wcroot, base_del_relpath,
result_pool, scratch_pool));
@@ -7629,7 +7616,7 @@ bump_node_revision(svn_wc__db_wcroot_t *
return SVN_NO_ERROR;
SVN_ERR(base_get_info(&status, &db_kind, &revision, &repos_relpath,
- &repos_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ &repos_id, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, &update_root, NULL,
wcroot, local_relpath,
scratch_pool, scratch_pool));
@@ -7749,7 +7736,7 @@ bump_revisions_post_update(void *baton,
apr_int64_t new_repos_id = -1;
err = base_get_info(&status, &kind, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
wcroot, local_relpath, scratch_pool, scratch_pool);
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
{
@@ -9946,7 +9933,7 @@ end_directory_update(void *baton,
svn_wc__db_status_t base_status;
SVN_ERR(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, NULL, NULL, NULL,
wcroot, local_relpath, scratch_pool, scratch_pool));
SVN_ERR_ASSERT(base_status == svn_wc__db_status_incomplete);
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue May 3 21:42:57 2011
@@ -710,9 +710,6 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
TARGET NULL
LOCK NULL
- RECORDED_SIZE SVN_INVALID_FILESIZE
- RECORDED_MOD_TIME 0
-
HAD_PROPS FALSE
UPDATE_ROOT FALSE
@@ -729,9 +726,6 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
If CHECKSUM is requested, and the node is NOT a file, then it will
be set to NULL.
- If RECORDED_SIZE is requested, and the node is NOT a file, then
- it will be set to SVN_INVALID_FILESIZE.
-
If TARGET is requested, and the node is NOT a symlink, then it will
be set to NULL.
@@ -758,8 +752,6 @@ svn_wc__db_base_get_info(svn_wc__db_stat
const svn_checksum_t **checksum,
const char **target,
svn_wc__db_lock_t **lock,
- svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
svn_boolean_t *had_props,
svn_boolean_t *update_root,
svn_boolean_t *needs_full_update,
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue May 3 21:42:57 2011
@@ -147,7 +147,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, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -269,7 +269,7 @@ run_base_remove(svn_wc__db_t *db,
¬_present_rev, &repos_relpath,
&repos_root_url, &repos_uuid, 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/tests/libsvn_wc/db-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1099273&r1=1099272&r2=1099273&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Tue May 3 21:42:57
2011
@@ -407,10 +407,8 @@ test_getting_info(apr_pool_t *pool)
svn_revnum_t changed_rev;
apr_time_t changed_date;
const char *changed_author;
- apr_time_t last_mod_time;
svn_depth_t depth;
const svn_checksum_t *checksum;
- svn_filesize_t translated_size;
const char *target;
svn_boolean_t had_props;
svn_boolean_t update_root;
@@ -427,7 +425,7 @@ test_getting_info(apr_pool_t *pool)
&status, &kind, &revision,
&repos_relpath, &repos_root_url, &repos_uuid,
&changed_rev, &changed_date, &changed_author,&depth, &checksum,
- &target, &lock, &translated_size, &last_mod_time, &had_props,
+ &target, &lock, &had_props,
&update_root, &needs_full_update,
db, local_abspath,
pool, pool));
@@ -440,10 +438,8 @@ test_getting_info(apr_pool_t *pool)
SVN_TEST_ASSERT(changed_rev == 1);
SVN_TEST_ASSERT(changed_date == TIME_1a);
SVN_TEST_STRING_ASSERT(changed_author, AUTHOR_1);
- SVN_TEST_ASSERT(last_mod_time == 0);
SVN_TEST_ASSERT(depth == svn_depth_infinity);
SVN_TEST_ASSERT(checksum == NULL);
- SVN_TEST_ASSERT(translated_size == SVN_INVALID_FILESIZE);
SVN_TEST_ASSERT(target == NULL);
SVN_TEST_ASSERT(lock == NULL);
@@ -452,13 +448,12 @@ test_getting_info(apr_pool_t *pool)
NULL, &kind, NULL,
&repos_relpath, &repos_root_url, &repos_uuid,
NULL, NULL, NULL, NULL,
- &checksum, NULL, NULL, &translated_size,
- NULL, NULL, NULL, NULL,
+ &checksum, NULL, NULL,
+ NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "A", pool),
pool, pool));
SVN_TEST_ASSERT(kind == svn_wc__db_kind_file);
SVN_TEST_STRING_ASSERT(SHA1_1, svn_checksum_to_cstring(checksum, pool));
- SVN_TEST_ASSERT(translated_size == 10);
SVN_TEST_STRING_ASSERT(repos_relpath, "A");
SVN_TEST_STRING_ASSERT(repos_root_url, ROOT_ONE);
SVN_TEST_STRING_ASSERT(repos_uuid, UUID_ONE);
@@ -468,8 +463,8 @@ test_getting_info(apr_pool_t *pool)
&status, &kind, &revision,
&repos_relpath, &repos_root_url, &repos_uuid,
&changed_rev, &changed_date, &changed_author,
- &depth, &checksum, &target, &lock, &translated_size,
- &last_mod_time, NULL, NULL, NULL,
+ &depth, &checksum, &target, &lock,
+ NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "B", pool),
pool, pool));
SVN_TEST_ASSERT(kind == svn_wc__db_kind_symlink);
@@ -483,7 +478,6 @@ test_getting_info(apr_pool_t *pool)
SVN_TEST_ASSERT(changed_author == NULL);
SVN_TEST_ASSERT(depth == svn_depth_unknown);
SVN_TEST_ASSERT(checksum == NULL);
- SVN_TEST_ASSERT(translated_size == SVN_INVALID_FILESIZE);
SVN_TEST_ASSERT(target == NULL);
SVN_TEST_ASSERT(lock == NULL);
@@ -494,7 +488,7 @@ test_getting_info(apr_pool_t *pool)
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);
@@ -507,7 +501,7 @@ test_getting_info(apr_pool_t *pool)
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);
@@ -519,7 +513,7 @@ test_getting_info(apr_pool_t *pool)
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);
@@ -530,13 +524,12 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, &checksum, NULL,
- NULL, &translated_size, NULL,
+ NULL,
NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "F", pool),
pool, pool));
SVN_TEST_STRING_ASSERT(SHA1_1,
svn_checksum_to_cstring(checksum, pool));
- SVN_TEST_ASSERT(translated_size == 15);
/* Test: alternate repository (switched file). */
SVN_ERR(svn_wc__db_base_get_info(
@@ -545,7 +538,7 @@ test_getting_info(apr_pool_t *pool)
&changed_rev, &changed_date, &changed_author,
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");
@@ -561,12 +554,11 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, &checksum, &target,
- NULL, &translated_size, NULL,
+ NULL,
NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "H", pool),
pool, pool));
SVN_TEST_ASSERT(checksum == NULL);
- SVN_TEST_ASSERT(translated_size == SVN_INVALID_FILESIZE);
SVN_TEST_STRING_ASSERT(target, "H-target");
/* Test: missing node. */
@@ -576,7 +568,7 @@ test_getting_info(apr_pool_t *pool)
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);
@@ -606,7 +598,7 @@ validate_node(svn_wc__db_t *db,
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);
