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 2013/07/03 00:50:38 UTC
svn commit: r1499140 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Tue Jul 2 22:50:37 2013
New Revision: 1499140
URL: http://svn.apache.org/r1499140
Log:
Remove some code from FSFS that has no effect: When we look up a
noderev by ID, the returned noderev will have exactly that ID.
So, contrary to the code's claim, there will be no update.
* subversion/libsvn_fs_fs/fs_fs.c
(write_final_changed_path_info): remove "ID update" section
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1499140&r1=1499139&r2=1499140&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Jul 2 22:50:37 2013
@@ -8291,12 +8291,9 @@ write_final_changed_path_info(apr_off_t
sorted_changed_paths = svn_sort__hash(changed_paths,
svn_sort_compare_items_lexically, pool);
- /* Iterate through the changed paths one at a time, and convert the
- temporary node-id into a permanent one for each change entry. */
+ /* Write all items to disk in the new order. */
for (i = 0; i < sorted_changed_paths->nelts; ++i)
{
- node_revision_t *noderev;
- const svn_fs_id_t *id;
svn_fs_path_change2_t *change;
const char *path;
@@ -8305,21 +8302,6 @@ write_final_changed_path_info(apr_off_t
change = APR_ARRAY_IDX(sorted_changed_paths, i, svn_sort__item_t).value;
path = APR_ARRAY_IDX(sorted_changed_paths, i, svn_sort__item_t).key;
- id = change->node_rev_id;
-
- /* If this was a delete of a mutable node, then it is OK to
- leave the change entry pointing to the non-existent temporary
- node, since it will never be used. */
- if ((change->change_kind != svn_fs_path_change_delete) &&
- (! svn_fs_fs__id_txn_id(id)))
- {
- SVN_ERR(svn_fs_fs__get_node_revision(&noderev, fs, id, iterpool));
-
- /* noderev has the permanent node-id at this point, so we just
- substitute it for the temporary one. */
- change->node_rev_id = noderev->id;
- }
-
/* Write out the new entry into the final rev-file. */
SVN_ERR(write_change_entry(file, path, change, include_node_kinds,
iterpool));