Author: rhuijben
Date: Tue May 10 12:25:28 2011
New Revision: 1101427
URL: http://svn.apache.org/viewvc?rev=1101427&view=rev
Log:
Simplify a check in the remote status walker.
[And hide that my next commit requires two followup patches to unbreak the
build.]
* subversion/libsvn_wc/status.c
(get_dir_status): Update comment.
(make_dir_baton): Simplify check using a new in 1.7 boolean.
Modified:
subversion/trunk/subversion/libsvn_wc/status.c
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1101427&r1=1101426&r2=1101427&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue May 10 12:25:28 2011
@@ -1150,9 +1150,7 @@ get_dir_status(const struct walk_status_
return SVN_NO_ERROR;
}
- /* Add empty status structures for each of the unversioned things.
- This also catches externals; not sure whether that's good or bad,
- but it's what's happening right now. */
+ /* Walk all the children of this directory. */
for (hi = apr_hash_first(subpool, all_children); hi; hi = apr_hash_next(hi))
{
const void *key;
@@ -1515,14 +1513,8 @@ make_dir_baton(void **dir_baton,
else
status_in_parent = eb->anchor_status;
- /* Order is important here. We can't depend on status_in_parent->entry
- being non-NULL until after we've checked all the conditions that
- might indicate that the parent is unversioned ("unversioned" for
- our purposes includes being an external or ignored item). */
if (status_in_parent
- && (status_in_parent->node_status != svn_wc_status_unversioned)
- && (status_in_parent->node_status != svn_wc_status_external)
- && (status_in_parent->node_status != svn_wc_status_ignored)
+ && status_in_parent->versioned
&& (status_in_parent->kind == svn_node_dir)
&& (! d->excluded)
&& (d->depth == svn_depth_unknown
