Author: rhuijben
Date: Sun Jun 5 16:52:44 2011
New Revision: 1132455
URL: http://svn.apache.org/viewvc?rev=1132455&view=rev
Log:
Remove two hacks from the info calculation.
* subversion/libsvn_wc/info.c
(build_info_for_entry): Store the real depth and changelist.
* subversion/svn/info-cmd.c
(print_info_xml): Print depth infinity for files with depth unknown.
* subversion/tests/cmdline/changelist_tests.py
(change_to_dir): Mark XFail. This issue wasn't fixed: the test was broken.
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/svn/info-cmd.c
subversion/trunk/subversion/tests/cmdline/changelist_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1132455&r1=1132454&r2=1132455&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Sun Jun 5 16:52:44 2011
@@ -245,10 +245,6 @@ build_info_for_entry(svn_info2_t **info,
}
/* ### Temporary hacks to keep our test suite happy: */
- if (db_kind == svn_wc__db_kind_dir)
- wc_info->changelist = NULL; /* Should be valid in the DB */
- if (db_kind != svn_wc__db_kind_dir)
- wc_info->depth = svn_depth_infinity; /* Should be unknown */
*info = tmpinfo;
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1132455&r1=1132454&r2=1132455&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Sun Jun 5 16:52:44 2011
@@ -136,8 +136,15 @@ print_info_xml(void *baton,
schedule_str(info->wc_info->schedule));
/* "<depth> xx </depth>" */
- svn_cl__xml_tagged_cdata(&sb, pool, "depth",
- svn_depth_to_word(info->wc_info->depth));
+ {
+ svn_depth_t depth = info->wc_info->depth;
+
+ /* In the entries world info just passed depth infinity for files */
+ if (depth == svn_depth_unknown && info->kind == svn_node_file)
+ depth = svn_depth_infinity;
+
+ svn_cl__xml_tagged_cdata(&sb, pool, "depth", svn_depth_to_word(depth));
+ }
/* "<copy-from-url> xx </copy-from-url>" */
svn_cl__xml_tagged_cdata(&sb, pool, "copy-from-url",
Modified: subversion/trunk/subversion/tests/cmdline/changelist_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/changelist_tests.py?rev=1132455&r1=1132454&r2=1132455&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/changelist_tests.py Sun Jun 5
16:52:44 2011
@@ -1042,6 +1042,7 @@ def move_added_keeps_changelist(sbox):
svntest.actions.run_and_verify_info(expected_infos, kappa2_path)
@Issue(3820)
+@XFail()
def change_to_dir(sbox):
"change file in changelist to dir"
