You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/04/05 00:36:11 UTC
svn commit: r1088811 - in /subversion/trunk/subversion: libsvn_wc/adm_ops.c
tests/cmdline/copy_tests.py tests/cmdline/depth_tests.py
tests/cmdline/revert_tests.py tests/cmdline/schedule_tests.py
tests/cmdline/update_tests.py tests/cmdline/upgrade_tests.py
Author: philip
Date: Mon Apr 4 22:36:10 2011
New Revision: 1088811
URL: http://svn.apache.org/viewvc?rev=1088811&view=rev
Log:
Enable the new revert code. Revert now notifies for all children of
added trees, so adjust the expectations for 3 tests. Remove XFAIL
from another 7 tests. The old, redundant code is still present.
* subversion/libsvn_wc/adm_ops.c:
(revert_internal): Remove SVN_NEW_REVERT conditional.
* subversion/tests/cmdline/copy_tests.py
(copy_delete_revert): Remove XFAIL.
* subversion/tests/cmdline/revert_tests.py
(status_of_missing_dir_after_revert_replaced_with_history_dir): Expect
revert notification for added children.
(revert_child_of_copy, revert_non_recusive_after_delete,
revert_permissions_only): Remove XFAIL.
* subversion/tests/cmdline/depth_tests.py
(excluded_path_misc_operation): Expect revert notification for added
children
* subversion/tests/cmdline/schedule_tests.py
(revert_nested_adds): Expect revert notification for added children
* subversion/tests/cmdline/update_tests.py
(revive_children_of_copy): Remove XFAIL.
* subversion/tests/cmdline/upgrade_tests.py
(x3_1_4_6, x3_1_6_12): Remove XFAIL.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/revert_tests.py
subversion/trunk/subversion/tests/cmdline/schedule_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1088811&r1=1088810&r2=1088811&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Apr 4 22:36:10 2011
@@ -1332,7 +1332,6 @@ verify_revert_depth(svn_wc__db_t *db,
return SVN_NO_ERROR;
}
-#ifdef SVN_NEW_REVERT
/* Remove conflict file NAME, which may not exist, associated with
* *LOCAL_ABSPATH and set NOTIFY_REQUIRED to TRUE if the file was
* present and removed. */
@@ -1767,7 +1766,6 @@ new_revert_partial(svn_wc__db_t *db,
return SVN_NO_ERROR;
}
-#endif
/* This is just the guts of svn_wc_revert4() save that it accepts a
hash CHANGELIST_HASH whose keys are changelist names instead of an
@@ -1797,7 +1795,6 @@ revert_internal(svn_wc__db_t *db,
const char *op_root_abspath = NULL;
svn_error_t *err;
-#ifdef SVN_NEW_REVERT
if (changelist_hash)
return svn_error_return(new_revert_changelist(db, revert_root,
local_abspath, depth,
@@ -1829,7 +1826,6 @@ revert_internal(svn_wc__db_t *db,
/* Other depths, throw an error? */
return SVN_NO_ERROR;
-#endif
/* Check cancellation here, so recursive calls get checked early. */
if (cancel_func)
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1088811&r1=1088810&r2=1088811&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Apr 4 22:36:10 2011
@@ -4858,7 +4858,6 @@ def copy_delete_delete(sbox):
"copy, delete child, delete copy"
copy_delete_undo(sbox, False)
-@XFail()
@Issue(3784)
def copy_delete_revert(sbox):
"copy, delete child, revert copy"
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1088811&r1=1088810&r2=1088811&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Mon Apr 4 22:36:10 2011
@@ -2221,7 +2221,11 @@ def excluded_path_misc_operation(sbox):
#verify_depth(None, "empty", LE_path)
# revert A/L, with an excluded item in the tree
- expected_output = ["Reverted '"+L_path+"'\n"]
+ revert_paths = [L_path] + [os.path.join(L_path, child)
+ for child in ['E', 'F', 'lambda']]
+ expected_output = svntest.verify.UnorderedOutput([
+ "Reverted '%s'\n" % path for path in revert_paths])
+
svntest.actions.run_and_verify_svn(None, expected_output, [],
'revert', '--depth=infinity', L_path)
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1088811&r1=1088810&r2=1088811&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Mon Apr 4 22:36:10 2011
@@ -856,7 +856,8 @@ def status_of_missing_dir_after_revert_r
dry_run = 0)
# now test if the revert works ok
- revert_paths = [G_path]
+ revert_paths = [G_path] + [os.path.join(G_path, child)
+ for child in ['alpha', 'beta', 'pi', 'rho', 'tau']]
expected_output = svntest.verify.UnorderedOutput([
"Reverted '%s'\n" % path for path in revert_paths])
@@ -1020,7 +1021,6 @@ def revert_added_tree(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
-@XFail()
@Issue(3834)
def revert_child_of_copy(sbox):
"revert a child of a copied directory"
@@ -1054,7 +1054,6 @@ def revert_child_of_copy(sbox):
'revert', sbox.ospath('A/B/E2/beta'))
svntest.actions.run_and_verify_status(wc_dir, expected_status)
-@XFail()
@Issue(3783)
def revert_non_recusive_after_delete(sbox):
"non-recursive revert after delete"
@@ -1087,7 +1086,6 @@ def revert_non_recusive_after_delete(sbo
expected_status.tweak('A/B/E', status=' ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
-@XFail()
def revert_permissions_only(sbox):
"permission-only reverts"
Modified: subversion/trunk/subversion/tests/cmdline/schedule_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/schedule_tests.py?rev=1088811&r1=1088810&r2=1088811&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/schedule_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/schedule_tests.py Mon Apr 4 22:36:10 2011
@@ -312,7 +312,13 @@ def revert_nested_adds(sbox):
X_path = sbox.ospath('X')
Y_path = sbox.ospath('A/C/Y')
Z_path = sbox.ospath('A/D/H/Z')
- files = [X_path, Y_path, Z_path]
+ files = ([X_path, Y_path, Z_path]
+ + [os.path.join(X_path, child)
+ for child in ['P', 'delta']]
+ + [os.path.join(Y_path, child)
+ for child in ['Q', 'epsilon', 'upsilon']]
+ + [os.path.join(Z_path, child)
+ for child in ['R', 'zeta']])
exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
'revert',
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1088811&r1=1088810&r2=1088811&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Apr 4 22:36:10 2011
@@ -5363,7 +5363,6 @@ def update_nonexistent_child_of_copy(sbo
if os.path.exists('A2/mu'):
raise svntest.Failure("A2/mu improperly revived")
-@XFail()
@Issue(3807)
def revive_children_of_copy(sbox):
"""undelete a child of a copied dir"""
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1088811&r1=1088810&r2=1088811&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Mon Apr 4 22:36:10 2011
@@ -564,7 +564,6 @@ def x3_1_4_0(sbox):
do_x3_upgrade(sbox)
-@XFail()
@Issue(3811)
def x3_1_4_6(sbox):
"3x same wc upgrade 1.4.6 test"
@@ -574,7 +573,6 @@ def x3_1_4_6(sbox):
do_x3_upgrade(sbox)
-@XFail()
@Issue(3811)
def x3_1_6_12(sbox):
"3x same wc upgrade 1.6.12 test"