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 2012/12/05 16:45:30 UTC
svn commit: r1417492 - in /subversion/trunk/subversion: libsvn_wc/adm_ops.c
libsvn_wc/entries.c libsvn_wc/props.c libsvn_wc/status.c
libsvn_wc/update_editor.c libsvn_wc/wc_db.c libsvn_wc/wc_db.h
libsvn_wc/workqueue.h tests/libsvn_wc/db-test.c
Author: rhuijben
Date: Wed Dec 5 15:45:28 2012
New Revision: 1417492
URL: http://svn.apache.org/viewvc?rev=1417492&view=rev
Log:
Standardize the naming of the recorded size and time variable names.
No functional changes.
* subversion/libsvn_wc/adm_ops.c
(revert_restore): Rename local variable.
* subversion/libsvn_wc/entries.c
(db_node_t): Rename variables in struct.
(insert_node,
write_entry): Update users.
* subversion/libsvn_wc/props.c
(do_propset): Update comment.
* subversion/libsvn_wc/status.c
(read_info,
assemble_status): Update struct usage.
* subversion/libsvn_wc/update_editor.c
(svn_wc_add_repos_file4): Update comment.
* subversion/libsvn_wc/wc_db.c
(read_info): Rename argument in prototype.
(insert_base_node): Rename variable.
(record_baton_t): Add comment. Use proper variable names.
(db_record_fileinfo,
svn_wc__db_global_record_fileinfo,
set_props_txn): Update baton usage.
(remove_node_txn): Rename variable.
(read_info,
svn_wc__db_read_info_internal,
svn_wc__db_read_info): Rename argument.
(read_children_info): Update struct usage.
(has_local_mods): Rename variable.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_read_info): Rename argument and update documentation.
(svn_wc__db_info_t): Rename variable.
(svn_wc__db_global_record_fileinfo): Rename arguments and update
documentation.
* subversion/libsvn_wc/workqueue.h
(svn_wc__wq_build_file_install): Update documentation.
* subversion/tests/libsvn_wc/db-test.c
(test_working_info): Rename a few variables.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/status.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.h
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Dec 5 15:45:28 2012
@@ -1600,7 +1600,7 @@ revert_restore(svn_wc__db_t *db,
svn_boolean_t notify_required;
const apr_array_header_t *conflict_files;
svn_filesize_t recorded_size;
- apr_time_t recorded_mod_time;
+ apr_time_t recorded_time;
apr_finfo_t finfo;
#ifdef HAVE_SYMLINK
svn_boolean_t special;
@@ -1620,7 +1620,7 @@ revert_restore(svn_wc__db_t *db,
err = svn_wc__db_read_info(&status, &kind,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- &recorded_size, &recorded_mod_time, NULL,
+ &recorded_size, &recorded_time, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
db, local_abspath, scratch_pool, scratch_pool);
@@ -1651,7 +1651,7 @@ revert_restore(svn_wc__db_t *db,
status = svn_wc__db_status_normal;
kind = svn_kind_unknown;
recorded_size = SVN_INVALID_FILESIZE;
- recorded_mod_time = 0;
+ recorded_time = 0;
}
}
else if (err)
@@ -1774,9 +1774,9 @@ revert_restore(svn_wc__db_t *db,
ourselves. And we already have everything we need, because
we called stat ourselves. */
if (recorded_size != SVN_INVALID_FILESIZE
- && recorded_mod_time != 0
+ && recorded_time != 0
&& recorded_size == finfo.size
- && recorded_mod_time == finfo.mtime)
+ && recorded_time == finfo.mtime)
{
modified = FALSE;
}
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Dec 5 15:45:28 2012
@@ -64,12 +64,12 @@ typedef struct db_node_t {
svn_revnum_t revision;
svn_node_kind_t kind; /* ### should switch to svn_kind_t */
svn_checksum_t *checksum;
- svn_filesize_t translated_size;
+ svn_filesize_t recorded_size;
svn_revnum_t changed_rev;
apr_time_t changed_date;
const char *changed_author;
svn_depth_t depth;
- apr_time_t last_mod_time;
+ apr_time_t recorded_time;
apr_hash_t *properties;
svn_boolean_t file_external;
} db_node_t;
@@ -1463,7 +1463,7 @@ insert_node(svn_sqlite__db_t *sdb,
node->changed_rev,
node->changed_date,
node->changed_author,
- node->last_mod_time));
+ node->recorded_time));
if (node->repos_relpath)
{
@@ -1513,8 +1513,8 @@ insert_node(svn_sqlite__db_t *sdb,
SVN_ERR(svn_sqlite__bind_properties(stmt, 15, node->properties,
scratch_pool));
- if (node->translated_size != SVN_INVALID_FILESIZE)
- SVN_ERR(svn_sqlite__bind_int64(stmt, 16, node->translated_size));
+ if (node->recorded_size != SVN_INVALID_FILESIZE)
+ SVN_ERR(svn_sqlite__bind_int64(stmt, 16, node->recorded_size));
if (node->file_external)
SVN_ERR(svn_sqlite__bind_int(stmt, 20, 1));
@@ -1905,8 +1905,8 @@ write_entry(struct write_baton **entry_n
base_node->op_depth = 0;
base_node->parent_relpath = parent_relpath;
base_node->revision = entry->revision;
- base_node->last_mod_time = entry->text_time;
- base_node->translated_size = entry->working_size;
+ base_node->recorded_time = entry->text_time;
+ base_node->recorded_size = entry->working_size;
if (entry->depth != svn_depth_exclude)
base_node->depth = entry->depth;
@@ -2103,12 +2103,12 @@ write_entry(struct write_baton **entry_n
below_working_node->checksum =
text_base_info->revert_base.sha1_checksum;
}
- below_working_node->translated_size = 0;
+ below_working_node->recorded_size = 0;
below_working_node->changed_rev = SVN_INVALID_REVNUM;
below_working_node->changed_date = 0;
below_working_node->changed_author = NULL;
below_working_node->depth = svn_depth_infinity;
- below_working_node->last_mod_time = 0;
+ below_working_node->recorded_time = 0;
below_working_node->properties = NULL;
SVN_ERR(insert_node(sdb, below_working_node, scratch_pool));
}
@@ -2120,8 +2120,8 @@ write_entry(struct write_baton **entry_n
working_node->local_relpath = local_relpath;
working_node->parent_relpath = parent_relpath;
working_node->changed_rev = SVN_INVALID_REVNUM;
- working_node->last_mod_time = entry->text_time;
- working_node->translated_size = entry->working_size;
+ working_node->recorded_time = entry->text_time;
+ working_node->recorded_size = entry->working_size;
if (entry->depth != svn_depth_exclude)
working_node->depth = entry->depth;
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Wed Dec 5 15:45:28 2012
@@ -1827,17 +1827,17 @@ do_propset(svn_wc__db_t *db,
scratch_pool))
{
/* If the keywords have changed, then the translation of the file
- may be different. We should invalidate the cached TRANSLATED_SIZE
- and LAST_MOD_TIME on this node.
+ may be different. We should invalidate the RECORDED_SIZE
+ and RECORDED_TIME on this node.
Note that we don't immediately re-translate the file. But a
"has it changed?" check in the future will do a translation
from the pristine, and it will want to compare the (new)
- resulting TRANSLATED_SIZE against the working copy file.
+ resulting RECORDED_SIZE against the working copy file.
Also, when this file is (de)translated with the new keywords,
then it could be different, relative to the pristine. We want
- to ensure the LAST_MOD_TIME is different, to indicate that
+ to ensure the RECORDED_TIME is different, to indicate that
a full detranslate/compare is performed. */
clear_recorded_info = TRUE;
}
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Wed Dec 5 15:45:28 2012
@@ -261,7 +261,7 @@ read_info(const struct svn_wc__db_info_t
&mtb->changed_author, &mtb->depth,
&checksum, NULL, &original_repos_relpath, NULL,
NULL, NULL, &mtb->lock, &mtb->recorded_size,
- &mtb->recorded_mod_time, &mtb->changelist,
+ &mtb->recorded_time, &mtb->changelist,
&mtb->conflicted, &mtb->op_root,
&mtb->had_props, &mtb->props_mod,
&mtb->have_base, &mtb->have_more_work, NULL,
@@ -621,9 +621,9 @@ assemble_status(svn_wc_status3_t **statu
else if (ignore_text_mods
||(dirent
&& info->recorded_size != SVN_INVALID_FILESIZE
- && info->recorded_mod_time != 0
+ && info->recorded_time != 0
&& info->recorded_size == dirent->filesize
- && info->recorded_mod_time == dirent->mtime))
+ && info->recorded_time == dirent->mtime))
text_modified_p = FALSE;
else
{
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Dec 5 15:45:28 2012
@@ -5325,7 +5325,7 @@ svn_wc_add_repos_file4(svn_wc_context_t
/* If new contents were provided, then we do NOT want to record the
file information. We assume the new contents do not match the
- "proper" values for TRANSLATED_SIZE and LAST_MOD_TIME. */
+ "proper" values for RECORDED_SIZE and RECORDED_TIME. */
record_fileinfo = (new_contents == NULL);
/* Install the working copy file (with appropriate translation) from
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Dec 5 15:45:28 2012
@@ -342,7 +342,7 @@ read_info(svn_wc__db_status_t *status,
svn_revnum_t *original_revision,
svn_wc__db_lock_t **lock,
svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
+ apr_time_t *recorded_time,
const char **changelist,
svn_boolean_t *conflicted,
svn_boolean_t *op_root,
@@ -722,7 +722,7 @@ insert_base_node(void *baton,
apr_int64_t repos_id = pibb->repos_id;
svn_sqlite__stmt_t *stmt;
svn_filesize_t recorded_size = SVN_INVALID_FILESIZE;
- apr_int64_t recorded_mod_time;
+ apr_int64_t recorded_time;
/* The directory at the WCROOT has a NULL parent_relpath. Otherwise,
bind the appropriate parent_relpath. */
@@ -748,7 +748,7 @@ insert_base_node(void *baton,
{
/* Preserve size and modification time if caller asked us to. */
recorded_size = get_recorded_size(stmt, 6);
- recorded_mod_time = svn_sqlite__column_int64(stmt, 12);
+ recorded_time = svn_sqlite__column_int64(stmt, 12);
}
SVN_ERR(svn_sqlite__reset(stmt));
}
@@ -790,7 +790,7 @@ insert_base_node(void *baton,
if (recorded_size != SVN_INVALID_FILESIZE)
{
SVN_ERR(svn_sqlite__bind_int64(stmt, 16, recorded_size));
- SVN_ERR(svn_sqlite__bind_int64(stmt, 17, recorded_mod_time));
+ SVN_ERR(svn_sqlite__bind_int64(stmt, 17, recorded_time));
}
}
@@ -5019,13 +5019,14 @@ svn_wc__db_op_add_symlink(svn_wc__db_t *
return SVN_NO_ERROR;
}
+/* Baton for db_record_fileinfo */
struct record_baton_t {
- svn_filesize_t translated_size;
- apr_time_t last_mod_time;
+ svn_filesize_t recorded_size;
+ apr_time_t recorded_time;
};
-/* Record TRANSLATED_SIZE and LAST_MOD_TIME into top layer in NODES */
+/* Record RECORDED_SIZE and RECORDED_TIME into top layer in NODES */
static svn_error_t *
db_record_fileinfo(void *baton,
svn_wc__db_wcroot_t *wcroot,
@@ -5039,7 +5040,7 @@ db_record_fileinfo(void *baton,
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_UPDATE_NODE_FILEINFO));
SVN_ERR(svn_sqlite__bindf(stmt, "isii", wcroot->wc_id, local_relpath,
- rb->translated_size, rb->last_mod_time));
+ rb->recorded_size, rb->recorded_time));
SVN_ERR(svn_sqlite__update(&affected_rows, stmt));
SVN_ERR_ASSERT(affected_rows == 1);
@@ -5051,8 +5052,8 @@ db_record_fileinfo(void *baton,
svn_error_t *
svn_wc__db_global_record_fileinfo(svn_wc__db_t *db,
const char *local_abspath,
- svn_filesize_t translated_size,
- apr_time_t last_mod_time,
+ svn_filesize_t recorded_size,
+ apr_time_t recorded_time,
apr_pool_t *scratch_pool)
{
svn_wc__db_wcroot_t *wcroot;
@@ -5065,8 +5066,8 @@ svn_wc__db_global_record_fileinfo(svn_wc
local_abspath, scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- rb.translated_size = translated_size;
- rb.last_mod_time = last_mod_time;
+ rb.recorded_size = recorded_size;
+ rb.recorded_time = recorded_time;
SVN_ERR(db_record_fileinfo(&rb, wcroot, local_relpath, scratch_pool));
@@ -5155,8 +5156,8 @@ set_props_txn(void *baton,
if (spb->clear_recorded_info)
{
struct record_baton_t rb;
- rb.translated_size = SVN_INVALID_FILESIZE;
- rb.last_mod_time = 0;
+ rb.recorded_size = SVN_INVALID_FILESIZE;
+ rb.recorded_time = 0;
SVN_ERR(db_record_fileinfo(&rb, wcroot, local_relpath, scratch_pool));
}
@@ -6430,7 +6431,7 @@ remove_node_txn(void *baton,
svn_kind_t child_kind;
svn_boolean_t have_checksum;
svn_filesize_t recorded_size;
- apr_int64_t recorded_mod_time;
+ apr_int64_t recorded_time;
const svn_io_dirent2_t *dirent;
svn_boolean_t modified_p = TRUE;
svn_skel_t *work_item = NULL;
@@ -6447,7 +6448,7 @@ remove_node_txn(void *baton,
{
have_checksum = !svn_sqlite__column_is_null(stmt, 2);
recorded_size = get_recorded_size(stmt, 3);
- recorded_mod_time = svn_sqlite__column_int64(stmt, 4);
+ recorded_time = svn_sqlite__column_int64(stmt, 4);
}
if (rnb->cancel_func)
@@ -6472,7 +6473,7 @@ remove_node_txn(void *baton,
else if (child_kind == svn_kind_file
&& dirent->kind == svn_node_file
&& dirent->filesize == recorded_size
- && dirent->mtime == recorded_mod_time)
+ && dirent->mtime == recorded_time)
{
modified_p = FALSE; /* File matches recorded state */
}
@@ -7523,7 +7524,7 @@ read_info(svn_wc__db_status_t *status,
svn_revnum_t *original_revision,
svn_wc__db_lock_t **lock,
svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
+ apr_time_t *recorded_time,
const char **changelist,
svn_boolean_t *conflicted,
svn_boolean_t *op_root,
@@ -7620,9 +7621,9 @@ read_info(svn_wc__db_status_t *status,
*changed_author = svn_sqlite__column_text(stmt_info, 10,
result_pool);
}
- if (recorded_mod_time)
+ if (recorded_time)
{
- *recorded_mod_time = svn_sqlite__column_int64(stmt_info, 13);
+ *recorded_time = svn_sqlite__column_int64(stmt_info, 13);
}
if (depth)
{
@@ -7802,8 +7803,8 @@ read_info(svn_wc__db_status_t *status,
*lock = NULL;
if (recorded_size)
*recorded_size = 0;
- if (recorded_mod_time)
- *recorded_mod_time = 0;
+ if (recorded_time)
+ *recorded_time = 0;
if (changelist)
*changelist = svn_sqlite__column_text(stmt_act, 0, result_pool);
if (op_root)
@@ -7861,7 +7862,7 @@ svn_wc__db_read_info_internal(svn_wc__db
svn_revnum_t *original_revision,
svn_wc__db_lock_t **lock,
svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
+ apr_time_t *recorded_time,
const char **changelist,
svn_boolean_t *conflicted,
svn_boolean_t *op_root,
@@ -7880,7 +7881,7 @@ svn_wc__db_read_info_internal(svn_wc__db
changed_rev, changed_date, changed_author,
depth, checksum, target, original_repos_relpath,
original_repos_id, original_revision, lock,
- recorded_size, recorded_mod_time, changelist, conflicted,
+ recorded_size, recorded_time, changelist, conflicted,
op_root, had_props, props_mod,
have_base, have_more_work, have_work,
wcroot, local_relpath, result_pool, scratch_pool));
@@ -7906,7 +7907,7 @@ svn_wc__db_read_info(svn_wc__db_status_t
svn_revnum_t *original_revision,
svn_wc__db_lock_t **lock,
svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
+ apr_time_t *recorded_time,
const char **changelist,
svn_boolean_t *conflicted,
svn_boolean_t *op_root,
@@ -7934,7 +7935,7 @@ svn_wc__db_read_info(svn_wc__db_status_t
changed_rev, changed_date, changed_author,
depth, checksum, target, original_repos_relpath,
&original_repos_id, original_revision, lock,
- recorded_size, recorded_mod_time, changelist, conflicted,
+ recorded_size, recorded_time, changelist, conflicted,
op_root, have_props, props_mod,
have_base, have_more_work, have_work,
wcroot, local_relpath, result_pool, scratch_pool));
@@ -8106,7 +8107,7 @@ read_children_info(void *baton,
scratch_pool));
}
- child->recorded_mod_time = svn_sqlite__column_int64(stmt, 13);
+ child->recorded_time = svn_sqlite__column_int64(stmt, 13);
child->recorded_size = get_recorded_size(stmt, 7);
child->has_checksum = !svn_sqlite__column_is_null(stmt, 6);
child->copied = op_depth > 0 && !svn_sqlite__column_is_null(stmt, 2);
@@ -14072,7 +14073,7 @@ has_local_mods(svn_boolean_t *is_modifie
{
const char *node_abspath;
svn_filesize_t recorded_size;
- apr_time_t recorded_mod_time;
+ apr_time_t recorded_time;
svn_boolean_t skip_check = FALSE;
svn_error_t *err;
@@ -14093,10 +14094,10 @@ has_local_mods(svn_boolean_t *is_modifie
iterpool);
recorded_size = get_recorded_size(stmt, 1);
- recorded_mod_time = svn_sqlite__column_int64(stmt, 2);
+ recorded_time = svn_sqlite__column_int64(stmt, 2);
if (recorded_size != SVN_INVALID_FILESIZE
- && recorded_mod_time != 0)
+ && recorded_time != 0)
{
const svn_io_dirent2_t *dirent;
@@ -14113,7 +14114,7 @@ has_local_mods(svn_boolean_t *is_modifie
break;
}
else if (dirent->filesize == recorded_size
- && dirent->mtime == recorded_mod_time)
+ && dirent->mtime == recorded_time)
{
/* The file is not modified */
skip_check = TRUE;
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Wed Dec 5 15:45:28 2012
@@ -1723,7 +1723,7 @@ svn_wc__db_revert_list_done(svn_wc__db_t
LOCK NULL
RECORDED_SIZE SVN_INVALID_FILESIZE
- RECORDED_MOD_TIME 0
+ RECORDED_TIME 0
CHANGELIST NULL
CONFLICTED FALSE
@@ -1875,7 +1875,7 @@ svn_wc__db_read_info(svn_wc__db_status_t
/* Recorded for files present in the working copy */
svn_filesize_t *recorded_size,
- apr_time_t *recorded_mod_time,
+ apr_time_t *recorded_time,
/* From ACTUAL */
const char **changelist,
@@ -1911,7 +1911,7 @@ struct svn_wc__db_info_t {
svn_depth_t depth;
svn_filesize_t recorded_size;
- apr_time_t recorded_mod_time;
+ apr_time_t recorded_time;
const char *changelist;
svn_boolean_t conflicted;
@@ -2501,23 +2501,23 @@ svn_wc__db_op_bump_revisions_post_update
apr_pool_t *scratch_pool);
-/* Record the TRANSLATED_SIZE and LAST_MOD_TIME for a versioned node.
+/* Record the RECORDED_SIZE and RECORDED_TIME for a versioned node.
This function will record the information within the WORKING node,
if present, or within the BASE tree. If neither node is present, then
SVN_ERR_WC_PATH_NOT_FOUND will be returned.
- TRANSLATED_SIZE may be SVN_INVALID_FILESIZE, which will be recorded
+ RECORDED_SIZE may be SVN_INVALID_FILESIZE, which will be recorded
as such, implying "unknown size".
- LAST_MOD_TIME may be 0, which will be recorded as such, implying
+ RECORDED_TIME may be 0, which will be recorded as such, implying
"unknown last mod time".
*/
svn_error_t *
svn_wc__db_global_record_fileinfo(svn_wc__db_t *db,
const char *local_abspath,
- svn_filesize_t translated_size,
- apr_time_t last_mod_time,
+ svn_filesize_t recorded_size,
+ apr_time_t recorded_time,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.h?rev=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.h (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.h Wed Dec 5 15:45:28 2012
@@ -93,8 +93,8 @@ svn_wc__wq_run(svn_wc__db_t *db,
/* Set *WORK_ITEM to a new work item that will install the working
copy file at LOCAL_ABSPATH. If USE_COMMIT_TIMES is TRUE, then the newly
installed file will use the nodes CHANGE_DATE for the file timestamp.
- If RECORD_FILEINFO is TRUE, then the resulting LAST_MOD_TIME and
- TRANSLATED_SIZE will be recorded in the database.
+ If RECORD_FILEINFO is TRUE, then the resulting RECORDED_TIME and
+ RECORDED_SIZE will be recorded in the database.
If SOURCE_ABSPATH is NULL, then the pristine contents will be installed
(with appropriate translation). If SOURCE_ABSPATH is not NULL, then it
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=1417492&r1=1417491&r2=1417492&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Wed Dec 5 15:45:28 2012
@@ -805,10 +805,10 @@ test_working_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;
+ apr_time_t recorded_time;
svn_depth_t depth;
const svn_checksum_t *checksum;
- svn_filesize_t translated_size;
+ svn_filesize_t recorded_size;
const char *target;
const char *changelist;
const char *original_repos_relpath;
@@ -834,7 +834,7 @@ test_working_info(apr_pool_t *pool)
&changed_rev, &changed_date, &changed_author,
&depth, &checksum, &target, &original_repos_relpath,
&original_root_url, &original_uuid, &original_revnum,
- &lock, &translated_size, &last_mod_time, &changelist,
+ &lock, &recorded_size, &recorded_time, &changelist,
&conflicted, &op_root, &had_props, &props_mod,
&have_base, &have_more_work, &have_work,
db, svn_dirent_join(local_abspath, "I", pool),
@@ -850,7 +850,7 @@ test_working_info(apr_pool_t *pool)
SVN_TEST_STRING_ASSERT(changed_author, AUTHOR_2);
SVN_TEST_ASSERT(depth == svn_depth_immediates);
SVN_TEST_ASSERT(checksum == NULL);
- SVN_TEST_ASSERT(translated_size == SVN_INVALID_FILESIZE);
+ SVN_TEST_ASSERT(recorded_size == SVN_INVALID_FILESIZE);
SVN_TEST_ASSERT(target == NULL);
SVN_TEST_STRING_ASSERT(changelist, "changelist");
SVN_TEST_STRING_ASSERT(original_repos_relpath, "some/dir");