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 2015/10/03 19:27:22 UTC
svn commit: r1706612 - /subversion/trunk/subversion/libsvn_fs_fs/pack.c
Author: stefan2
Date: Sat Oct 3 17:27:22 2015
New Revision: 1706612
URL: http://svn.apache.org/viewvc?rev=1706612&view=rev
Log:
Follow-up to r1705646: Remove remnants of the special treatment
of directory representations during FSFS format 7 pack.
* subversion/libsvn_fs_fs/pack.c
(path_order_t): Remove obsolete directory indicator flag.
(copy_node_to_temp): No need to set it anymore.
(compare_path_order): No longer separate files from directories.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/pack.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/pack.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/pack.c?rev=1706612&r1=1706611&r2=1706612&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/pack.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/pack.c Sat Oct 3 17:27:22 2015
@@ -108,9 +108,6 @@ typedef struct path_order_t
/* noderev predecessor count */
int predecessor_count;
- /* this is a directory node */
- svn_boolean_t is_dir;
-
/* length of the expanded representation content */
apr_int64_t expanded_size;
@@ -746,7 +743,6 @@ copy_node_to_temp(pack_context_t *contex
path_order->node_id = *svn_fs_fs__id_node_id(noderev->id);
path_order->revision = svn_fs_fs__id_rev(noderev->id);
path_order->predecessor_count = noderev->predecessor_count;
- path_order->is_dir = noderev->kind == svn_node_dir;
path_order->noderev_id = *svn_fs_fs__id_rev_item(noderev->id);
APR_ARRAY_PUSH(context->path_order, path_order_t *) = path_order;
@@ -763,13 +759,8 @@ compare_path_order(const path_order_t *
const path_order_t * lhs = *lhs_p;
const path_order_t * rhs = *rhs_p;
- /* cluster all directories */
- int diff = rhs->is_dir - lhs->is_dir;
- if (diff)
- return diff;
-
/* lexicographic order on path and node (i.e. latest first) */
- diff = svn_prefix_string__compare(lhs->path, rhs->path);
+ int diff = svn_prefix_string__compare(lhs->path, rhs->path);
if (diff)
return diff;