Author: rhuijben
Date: Sun Feb 22 14:45:37 2015
New Revision: 1661480
URL: http://svn.apache.org/r1661480
Log:
Following up on r1661476, make not-present nodes in WORKING show up in svn
info as depth excluded and kind unknown.
Not showing them is similar to how we handle this status in BASE, but these
nodes are visible in 'svn status' as a DELETE, so we should provide some
info, instead of the 'doesn't exist' introduced in r1661479.
* subversion/libsvn_wc/info.c
(build_info_for_node): Revert some changes of r1661479.
* subversion/tests/cmdline/info_tests.py
(node_hidden_info): Update expected results.
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/tests/cmdline/info_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1661480&r1=1661479&r2=1661480&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Sun Feb 22 14:45:37 2015
@@ -219,9 +219,13 @@ build_info_for_node(svn_wc__info2_t **in
if (w_status == svn_wc__db_status_deleted)
{
- /* We have a working not-present status... */
- *info = NULL;
- return SVN_NO_ERROR;
+ /* We have a working not-present status. We don't know anything
+ about this node, but it *is visible* in STATUS.
+
+ Let's tell that it is excluded */
+
+ wc_info->depth = svn_depth_exclude;
+ tmpinfo->kind = svn_node_unknown;
}
/* And now fetch the url and revision of what will be deleted */
Modified: subversion/trunk/subversion/tests/cmdline/info_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/info_tests.py?rev=1661480&r1=1661479&r2=1661480&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Sun Feb 22 14:45:37
2015
@@ -609,24 +609,30 @@ def node_hidden_info(sbox):
svntest.actions.run_and_verify_svn(None, expected_err,
'info', sbox.ospath('A/B/E/alpha'))
- # Running info on WORKING not-present fails
- expected_err = '.*(E|W)155010: The node \'.*alpha\' was not found.*'
- svntest.actions.run_and_verify_svn(None, expected_err,
- 'info', sbox.ospath('E/alpha'))
-
expected_info = [
{
'Path': re.escape(sbox.ospath('A/B/E/beta')),
+ 'Schedule': 'normal',
+ 'Depth': 'exclude',
+ 'Node Kind': 'file',
+ },
+ {
+ 'Path': re.escape(sbox.ospath('E/alpha')),
+ 'Schedule': 'delete',
'Depth': 'exclude',
+ 'Node Kind': 'unknown',
},
{
'Path': re.escape(sbox.ospath('E/beta')),
+ 'Schedule': 'normal',
'Depth': 'exclude',
+ 'Node Kind': 'file',
}
]
svntest.actions.run_and_verify_info(expected_info,
sbox.ospath('A/B/E/beta'),
+ sbox.ospath('E/alpha'),
sbox.ospath('E/beta'))
