You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/03/04 16:56:21 UTC
svn commit: r1664059 [5/11] - in /subversion/branches/reuse-ra-session: ./
build/generator/ doc/ subversion/bindings/javahl/native/
subversion/bindings/swig/ subversion/bindings/swig/include/
subversion/bindings/swig/python/libsvn_swig_py/ subversion/b...
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/copy_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/copy_tests.py Wed Mar 4 15:56:18 2015
@@ -91,8 +91,7 @@ or a url (when false) copy source is use
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Helper for wc_copy_replace_with_props and
# repos_to_wc_copy_replace_with_props
@@ -139,8 +138,7 @@ def copy_replace_with_props(sbox, wc_cop
expected_status.tweak('A/D/G/rho', wc_rev='2')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Bring wc into sync
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -184,8 +182,7 @@ def copy_replace_with_props(sbox, wc_cop
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
######################################################################
@@ -324,9 +321,7 @@ def basic_copy_and_move_files(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Issue 1091, alpha2 would now have the wrong checksum and so a
# subsequent commit would fail
@@ -337,9 +332,7 @@ def basic_copy_and_move_files(sbox):
expected_status.tweak('A/C/alpha2', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Assure that attempts at local copy and move fail when a log
# message is provided.
@@ -391,9 +384,7 @@ def receive_copy_in_update(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Now update the other working copy; it should receive a full add of
# the newG directory and its contents.
@@ -465,9 +456,7 @@ def resurrect_deleted_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Use 'svn cp URL@1 URL' to resurrect the deleted directory, where
# the two URLs are identical. This used to trigger a failure.
@@ -512,9 +501,7 @@ def copy_deleted_dir_into_prefix(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
# Ok, copy from a deleted URL into a prefix of that URL, this used to
# result in an assert failing.
@@ -618,9 +605,7 @@ def copy_modify_commit(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
#----------------------------------------------------------------------
@@ -645,8 +630,7 @@ def copy_files_with_properties(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/G/rho', status=' ', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
# Set another property, but don't commit it yet
svntest.actions.run_and_verify_svn(None, [],
@@ -692,8 +676,7 @@ def copy_files_with_properties(sbox):
'A/D/G/rho_url' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
#----------------------------------------------------------------------
@@ -725,9 +708,7 @@ def copy_delete_commit(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
# copy a tree
svntest.actions.run_and_verify_svn(None, [], 'cp',
@@ -745,9 +726,7 @@ def copy_delete_commit(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
#----------------------------------------------------------------------
@@ -1340,11 +1319,9 @@ def revision_kinds_local_source(sbox):
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'), })
svntest.main.file_append(mu_path, "New r2 text.\n")
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
svntest.main.file_append(mu_path, "New r3 text.\n")
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
svntest.actions.run_and_verify_svn(None, [], 'up', '-r2', mu_path)
svntest.main.file_append(mu_path, "Working copy.\n")
@@ -1439,8 +1416,7 @@ def repos_to_wc_1634(sbox):
expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now copy the directory back.
E_url = sbox.repo_url + "/A/B/E@1"
@@ -1551,8 +1527,7 @@ def wc_to_wc_copy_deleted(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Copy including stuff in state not-present
svntest.actions.run_and_verify_svn(None, [], 'copy', B_path, B2_path)
@@ -1608,8 +1583,7 @@ def wc_to_wc_copy_deleted(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Test for copy into a non-existent URL path
@@ -1984,8 +1958,7 @@ def force_move(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(expected_file_content, [],
'cat',
sbox.repo_url + '/dest')
@@ -2046,9 +2019,7 @@ def copy_copied_file_and_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_copied_file_and_dir(sbox):
@@ -2101,9 +2072,7 @@ def move_copied_file_and_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_moved_file_and_dir(sbox):
@@ -2160,9 +2129,7 @@ def move_moved_file_and_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_file_within_moved_dir(sbox):
@@ -2229,9 +2196,7 @@ def move_file_within_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_file_out_of_moved_dir(sbox):
@@ -2297,9 +2262,7 @@ def move_file_out_of_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_dir_within_moved_dir(sbox):
@@ -2365,9 +2328,7 @@ def move_dir_within_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_dir_out_of_moved_dir(sbox):
@@ -2432,9 +2393,7 @@ def move_dir_out_of_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Includes regression testing for issue #3429 ("svn mv A B; svn mv B A"
# generates replace without history).
@@ -2463,9 +2422,7 @@ def move_file_back_and_forth(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Includes regression testing for issue #3429 ("svn mv A B; svn mv B A"
@@ -2610,9 +2567,7 @@ def copy_move_added_paths(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Run_and_verify_commit() doesn't handle status of unversioned paths
# so manually confirm unversioned paths got copied and moved too.
@@ -2703,9 +2658,7 @@ def copy_added_paths_with_props(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
svntest.actions.verify_disk(wc_dir, expected_disk.old_tree(), True)
def copy_added_paths_to_URL(sbox):
@@ -2795,9 +2748,7 @@ def copy_added_paths_to_URL(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Created expected output for update
expected_output = svntest.wc.State(wc_dir, {
@@ -2990,9 +2941,7 @@ def move_multiple_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3037,9 +2986,7 @@ def copy_multiple_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3212,8 +3159,7 @@ def copy_multiple_repo_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3516,9 +3462,7 @@ def old_dir_wc_to_wc(sbox):
# Commit the one file.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3558,9 +3502,7 @@ def copy_make_parents_wc_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Test copying and creating parents from the repo to the wc
@@ -3600,9 +3542,7 @@ def copy_make_parents_repo_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3787,8 +3727,7 @@ def URI_encoded_repos_to_wc(sbox):
{dest_name : Item(verb='Adding')})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
copy_URL_to_WC('A', 'A COPY', 2)
copy_URL_to_WC('A COPY', 'A_COPY_2', 3)
@@ -4012,9 +3951,9 @@ def path_move_and_copy_between_wcs_2475(
# Do a checkout, and verify the resulting output and disk contents.
svntest.actions.run_and_verify_checkout(repo_url2,
- wc2_dir,
- expected_output,
- expected_wc)
+ wc2_dir,
+ expected_output,
+ expected_wc)
# Copy a file from wc to wc2
mu_path = sbox.ospath('A/mu')
@@ -4162,8 +4101,7 @@ def copy_below_copy(sbox):
svntest.actions.run_and_verify_commit(sbox.wc_dir,
expected_output,
- expected_status,
- None, sbox.wc_dir)
+ expected_status)
def move_below_move(sbox):
"move a dir below a moved dir"
@@ -4224,8 +4162,7 @@ def move_below_move(sbox):
svntest.actions.run_and_verify_commit(sbox.wc_dir,
expected_output,
- expected_status,
- None, sbox.wc_dir)
+ expected_status)
def reverse_merge_move(sbox):
@@ -4346,7 +4283,7 @@ def nonrecursive_commit_of_copy(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir, '--depth', 'immediates')
# Regression test for issue #3474 - making a new subdir, moving files into it
@@ -4525,8 +4462,7 @@ def move_dir_containing_move(sbox):
'A/B_moved/F_moved', moved_from=None)
svntest.actions.run_and_verify_commit(sbox.wc_dir,
expected_output,
- expected_status,
- None, sbox.wc_dir)
+ expected_status)
def copy_dir_with_space(sbox):
"""copy a directory with whitespace to one without"""
@@ -4555,8 +4491,7 @@ def copy_dir_with_space(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [], 'cp',
sbox.ospath('E with spaces'),
@@ -4581,8 +4516,7 @@ def copy_dir_with_space(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [], 'mv',
sbox.ospath('E with spaces'),
@@ -4614,8 +4548,7 @@ def copy_dir_with_space(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Regression test for issue #3676
@Issue(3676)
@@ -4747,9 +4680,7 @@ def mixed_rev_copy_del(sbox):
expected_status.remove('A/B/E/alpha')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Update to r2, then update A/B/E/alpha and A/B/E/beta to r1
svntest.main.run_svn(None, 'up', wc_dir)
@@ -4766,8 +4697,7 @@ def mixed_rev_copy_del(sbox):
expected_status.tweak('A/B/E/beta', wc_rev=1)
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
- expected_status, [],
- None, None, None, None, None,
+ expected_status, [], False,
'-r1',
sbox.ospath('A/B/E/alpha'),
sbox.ospath('A/B/E/beta'))
@@ -4804,9 +4734,7 @@ def mixed_rev_copy_del(sbox):
expected_status.remove('A/B/E_copy/alpha', 'A/B/E_copy/beta')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def copy_delete_undo(sbox, use_revert):
"copy, delete child, undo"
@@ -5081,7 +5009,7 @@ def copy_wc_url_with_absent(sbox):
expected_output,
None,
None,
- None, None, None, None, None, False,
+ [], False,
wc_dir, '--set-depth', 'infinity')
# Except for A/no, the 3 directories should now have the same children
@@ -5662,8 +5590,7 @@ def wc_wc_copy_incomplete(sbox):
expected_status.remove('A/B2/E', 'A/B2/F')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
expected_status.add({
'A/B2/E' : Item(status='! ', wc_rev=3),
'A/B2/F' : Item(status='! ', wc_rev=3),
@@ -5724,8 +5651,7 @@ def three_nested_moves(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
def copy_to_unversioned_parent(sbox):
"copy to unversioned parent"
@@ -5863,8 +5789,7 @@ def ext_wc_copy_deleted(sbox):
})
svntest.actions.run_and_verify_commit(wc2_dir,
- expected_output, None, None,
- wc2_dir)
+ expected_output, None)
def copy_subtree_deleted(sbox):
"copy to-be-deleted subtree"
@@ -5883,7 +5808,7 @@ def copy_subtree_deleted(sbox):
'AA/B' : Item(verb='Deleting'),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, None, None,
+ expected_output, None, [],
sbox.ospath('AA'))
# Commit copy between working copies
@@ -5895,8 +5820,7 @@ def copy_subtree_deleted(sbox):
'AA2/B' : Item(verb='Deleting'),
})
svntest.actions.run_and_verify_commit(wc2_dir,
- expected_output, None, None,
- wc2_dir)
+ expected_output, None)
########################################################################
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/depth_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/depth_tests.py Wed Mar 4 15:56:18 2015
@@ -183,8 +183,7 @@ def depth_empty_update_bypass_single_fil
expected_status.tweak('iota', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-empty wc, expecting not to receive the change to iota.
expected_output = svntest.wc.State(wc_empty, { })
@@ -194,8 +193,7 @@ def depth_empty_update_bypass_single_fil
svntest.actions.run_and_verify_update(wc_empty,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
# And the wc should still be depth-empty.
verify_depth(None, "empty", wc_empty)
@@ -206,7 +204,7 @@ def depth_empty_update_bypass_single_fil
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=infinity", wc_empty)
# And the wc should still be depth-empty.
@@ -235,8 +233,7 @@ def depth_immediates_get_top_file_mod_on
expected_status.tweak('A/mu', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting to receive only the
# change to iota.
@@ -255,8 +252,7 @@ def depth_immediates_get_top_file_mod_on
svntest.actions.run_and_verify_update(wc_immediates,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
verify_depth(None, "immediates", wc_immediates)
@@ -286,9 +282,7 @@ def depth_empty_commit(sbox):
})
svntest.actions.run_and_verify_commit(wc_empty,
expected_output,
- expected_status,
- None,
- wc_empty)
+ expected_status)
#----------------------------------------------------------------------
def depth_empty_with_file(sbox):
@@ -320,8 +314,7 @@ def depth_empty_with_file(sbox):
expected_status.tweak('iota', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Delete iota in the "other" wc.
other_iota_path = os.path.join(wc, 'iota')
@@ -331,8 +324,7 @@ def depth_empty_with_file(sbox):
expected_status.remove('iota')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-empty wc just a little, expecting to receive
# the change in iota.
@@ -347,7 +339,7 @@ def depth_empty_with_file(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'-r2', wc_empty)
# Update the depth-empty wc all the way, expecting to receive the deletion
@@ -360,8 +352,7 @@ def depth_empty_with_file(sbox):
svntest.actions.run_and_verify_update(wc_empty,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
@@ -405,8 +396,7 @@ def depth_empty_with_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
A_path)
# Commit a change to A/mu in the "other" wc.
@@ -417,8 +407,7 @@ def depth_empty_with_dir(sbox):
expected_status.tweak('A/mu', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update "A" by name in wc_empty, expect to receive the change to A/mu.
expected_output = svntest.wc.State(wc_empty, { 'A/mu' : Item(status='U ') })
@@ -432,8 +421,7 @@ def depth_empty_with_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
A_path)
# Commit the deletion of A/mu from the "other" wc.
@@ -444,8 +432,7 @@ def depth_empty_with_dir(sbox):
expected_status.remove('A/mu')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update "A" by name in wc_empty, expect to A/mu to disappear.
@@ -461,8 +448,7 @@ def depth_empty_with_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
A_path)
@@ -495,8 +481,7 @@ def depth_immediates_bring_in_file(sbox)
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, None,
+ [], False,
A_mu_path)
# Run 'svn up A/D/gamma' to test the edge case 'Skipped'.
@@ -539,8 +524,7 @@ def depth_immediates_fill_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity',
A_path)
@@ -572,8 +556,7 @@ def depth_mixed_bring_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files',
A_path)
# Check that A was added at depth=files.
@@ -600,8 +583,7 @@ def depth_mixed_bring_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates',
B_path)
# Check that A/B was added at depth=immediates.
@@ -625,8 +607,7 @@ def depth_mixed_bring_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty',
C_path)
# Check that A/C was added at depth=empty.
@@ -649,8 +630,7 @@ def depth_empty_unreceive_delete(sbox):
expected_status.remove('iota')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-empty wc, expecting not to receive the deletion of iota.
expected_output = svntest.wc.State(wc_empty, { })
@@ -660,8 +640,7 @@ def depth_empty_unreceive_delete(sbox):
svntest.actions.run_and_verify_update(wc_empty,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
@@ -683,8 +662,7 @@ def depth_immediates_unreceive_delete(sb
expected_status.remove('A/mu')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting not to receive the deletion
# of A/mu.
@@ -701,8 +679,7 @@ def depth_immediates_unreceive_delete(sb
svntest.actions.run_and_verify_update(wc_immed,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
def depth_immediates_receive_delete(sbox):
@@ -725,8 +702,7 @@ def depth_immediates_receive_delete(sbox
})
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting to receive the deletion of A.
expected_output = svntest.wc.State(wc_immed, {
@@ -742,8 +718,7 @@ def depth_immediates_receive_delete(sbox
svntest.actions.run_and_verify_update(wc_immed,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
def depth_immediates_subdir_propset_1(sbox):
@@ -774,7 +749,7 @@ def depth_immediates_subdir_propset_1(sb
svntest.actions.run_and_verify_commit(wc_immediates,
expected_output,
expected_status,
- None,
+ [],
A_path)
# Create expected output tree for the update.
@@ -793,7 +768,7 @@ def depth_immediates_subdir_propset_1(sb
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
def depth_immediates_subdir_propset_2(sbox):
@@ -843,8 +818,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files')
verify_depth(None, "files")
@@ -865,8 +839,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates')
verify_depth(None, "immediates")
verify_depth(None, "empty", "A")
@@ -890,8 +863,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', 'A')
verify_depth(None, "immediates")
verify_depth(None, "files", "A")
@@ -922,8 +894,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity')
verify_depth("Non-infinity depth detected after an upgrade to depth-infinity",
"infinity")
@@ -981,7 +952,7 @@ def commit_propmods_with_depth_empty_hel
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
depth_arg,
wc_dir, D_path)
@@ -1152,7 +1123,7 @@ def commit_depth_immediates(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
'--depth', 'immediates',
wc_dir, G_path)
@@ -1183,8 +1154,7 @@ def depth_immediates_receive_new_dir(sbo
})
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting to receive just the
# new directory, without the file.
@@ -1205,8 +1175,7 @@ def depth_immediates_receive_new_dir(sbo
svntest.actions.run_and_verify_update(wc_immed,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
# Check that the new directory was added at depth=empty.
verify_depth(None, "empty", other_I_path)
@@ -1281,8 +1250,8 @@ def upgrade_from_above(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, None,
- '--set-depth=files')
+ [], False,
+ '--set-depth=files', '.')
verify_depth(None, "files")
finally:
os.chdir(saved_cwd)
@@ -1303,7 +1272,7 @@ def upgrade_from_above(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, None,
+ [], False,
'--set-depth=files', wc)
verify_depth(None, "files", wc)
@@ -1445,8 +1414,7 @@ def depthy_update_above_dir_to_be_delete
expected_output_func(wc_dir),
expected_disk,
expected_status_func(wc_dir),
- None, None, None, None, None,
- False,
+ [], False,
"--depth=%s" % depth, wc_dir)
@@ -1491,8 +1459,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', E_path)
verify_depth(None, "immediates", E_path)
@@ -1502,8 +1469,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', E_path)
verify_depth(None, "files", E_path)
@@ -1519,8 +1485,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', B_path)
verify_depth(None, "immediates", B_path)
verify_depth(None, "empty", E_path)
@@ -1539,8 +1504,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', H_path)
verify_depth(None, "empty", H_path)
@@ -1557,8 +1521,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', D_path)
verify_depth(None, "immediates", D_path)
verify_depth(None, "empty", G_path)
@@ -1576,8 +1539,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', D_path)
verify_depth(None, "empty", D_path)
@@ -1594,8 +1556,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", C_path)
@@ -1614,8 +1575,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', A_path)
verify_depth(None, "files", A_path)
@@ -1630,8 +1590,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', A_path)
verify_depth(None, "empty", A_path)
@@ -1646,8 +1605,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', wc_dir)
verify_depth(None, "files", wc_dir)
@@ -1718,8 +1676,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', D_path)
verify_depth(None, "immediates", D_path)
verify_depth(None, "empty", G_path)
@@ -1738,8 +1695,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", D_path)
@@ -1759,8 +1715,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", D_path)
@@ -1778,8 +1733,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", D_path)
@@ -1805,8 +1759,7 @@ def depth_folding_clean_trees_2(sbox):
# expected_output,
# expected_disk,
# expected_status,
-# None, None,
-# None, None, None, None,
+# [], False,
# '--set-depth', 'empty', A_path)
def depth_fold_expand_clean_trees(sbox):
@@ -1863,8 +1816,7 @@ def depth_fold_expand_clean_trees(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", B_path)
@@ -1891,8 +1843,7 @@ def depth_fold_expand_clean_trees(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', Other_A_path)
verify_depth(None, "files", Other_A_path)
@@ -1929,7 +1880,7 @@ def pull_in_tree_with_depth_option(sbox)
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=immediates", A_path)
# Check that the A directory was pull ed in at depth=immediates.
@@ -1993,8 +1944,7 @@ def fold_tree_with_unversioned_modified_
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', A_path)
verify_depth(None, "empty", A_path)
@@ -2012,8 +1962,7 @@ def depth_empty_update_on_file(sbox):
expected_status.tweak('iota', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Update iota with depth=empty.
expected_output = svntest.wc.State(wc_dir,
@@ -2024,7 +1973,7 @@ def depth_empty_update_on_file(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--depth=empty', '-r1', iota_path)
# Check the revision and created rev.
@@ -2060,8 +2009,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', E_path)
# verify_depth exclude? not implemented yet
@@ -2079,8 +2027,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', B_path)
verify_depth(None, "immediates", B_path)
@@ -2098,8 +2045,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', B_path)
# Explicitly pull in excluded path B.
@@ -2117,8 +2063,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
B_path)
# Test issue #
@@ -2132,8 +2077,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', iota_path)
# Update the whole WC to depth=infinity.
@@ -2149,8 +2093,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity', wc_dir)
def excluded_path_misc_operation(sbox):
@@ -2178,8 +2121,7 @@ def excluded_path_misc_operation(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', E_path)
# copy A/B to A/L, excluded entry should be copied too
@@ -2222,9 +2164,7 @@ def excluded_path_misc_operation(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Relocate wc, with excluded items in it.
repo_dir = sbox.repo_dir
@@ -2269,8 +2209,7 @@ def excluded_receive_remote_removal(sbox
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
"--set-depth", "exclude", B_path)
# Remove path B in the repos.
@@ -2285,9 +2224,7 @@ def excluded_receive_remote_removal(sbox
svntest.actions.run_and_verify_update(wc,
None,
expected_disk,
- expected_status,
- None, None,
- None, None, None, None)
+ expected_status)
# Introduce a new path with the same name B.
# This should succeed if the exclude entry is gone with the update,
@@ -2387,7 +2324,7 @@ def make_depth_tree_conflicts(sbox):
svntest.actions.run_and_verify_commit(wc,
expected_output,
expected_status,
- None,
+ [],
A)
# Go back to rev 1
@@ -2402,7 +2339,7 @@ def make_depth_tree_conflicts(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'-r1', A)
# Perform node deletions so that items become unversioned and
@@ -2444,7 +2381,7 @@ def make_depth_tree_conflicts(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
wc)
@@ -2524,8 +2461,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', B_path)
# Update to depth 'empty' for the excluded path A/B
@@ -2542,8 +2478,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', B_path)
verify_depth(None, "empty", B_path)
expected_info = {
@@ -2575,8 +2510,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', B_path)
verify_depth(None, "files", B_path)
expected_info = {
@@ -2614,8 +2548,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', B_path)
verify_depth(None, "immediates", B_path)
expected_info = {
@@ -2645,8 +2578,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity', B_path)
verify_depth(None, "infinity", B_path)
expected_info = {
@@ -2692,9 +2624,7 @@ def update_depth_empty_root_of_infinite_
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
- expected_status,
- None, None,
- None, None, None, None, wc_dir)
+ expected_status)
def sparse_update_with_dash_dash_parents(sbox):
"""update --parents"""
@@ -2734,7 +2664,7 @@ def sparse_update_with_dash_dash_parents
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--parents', alpha_path)
expected_output = svntest.wc.State(sbox.wc_dir, {
@@ -2756,7 +2686,7 @@ def sparse_update_with_dash_dash_parents
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--parents', pi_path)
expected_output = svntest.wc.State(sbox.wc_dir, {
@@ -2775,7 +2705,7 @@ def sparse_update_with_dash_dash_parents
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--parents', omega_path)
def update_below_depth_empty(sbox):
@@ -2792,8 +2722,8 @@ def update_below_depth_empty(sbox):
'A/D' : Item(status='D '),
})
svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None,
- None, None, None, None, None, None,
- False,
+ None,
+ [], False,
'--set-depth', 'empty', A)
svntest.actions.run_and_verify_svn(None, [],
@@ -2806,7 +2736,7 @@ def update_below_depth_empty(sbox):
# This update should just update the revision of the working copy
svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None,
- None, None)
+ None)
# Test for issue #4136.
@Issue(4136)
@@ -2827,9 +2757,7 @@ def commit_then_immediates_update(sbox):
expected_status.tweak('A/mu', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Now, update --depth immediates in the root of the working copy.
expected_output = svntest.wc.State(wc_dir, { })
@@ -2845,7 +2773,7 @@ def commit_then_immediates_update(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=immediates", wc_dir)
def revert_depth_files(sbox):
@@ -2886,7 +2814,7 @@ def spurious_nodes_row(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=empty", sbox.wc_dir)
val2 = svntest.wc.sqlite_stmt(sbox.wc_dir, "select count(*) from nodes")
if (val1 != val2):
@@ -2909,7 +2837,7 @@ def commit_excluded(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--set-depth=exclude",
sbox.ospath('A/D/G'))
@@ -2930,8 +2858,7 @@ def commit_excluded(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {
'A/D/G' : Item(status='A '),
@@ -2967,7 +2894,7 @@ def commit_excluded(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--set-depth=infinity", wc_dir)
#----------------------------------------------------------------------
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/diff_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/diff_tests.py Wed Mar 4 15:56:18 2015
@@ -709,7 +709,7 @@ def dont_diff_binary_file(sbox):
# Commit the new binary file, creating revision 2.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Update the whole working copy to HEAD (rev 2)
expected_output = svntest.wc.State(wc_dir, {})
@@ -729,8 +729,7 @@ def dont_diff_binary_file(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- 1) # verify props, too.
+ check_props=True)
# Make a local mod to the binary file.
svntest.main.file_append(theta_path, "some extra junk")
@@ -772,7 +771,7 @@ def dont_diff_binary_file(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Third diff use-case: 'svn diff -r2:3 wc' will compare two
# repository trees.
@@ -869,7 +868,7 @@ def diff_base_to_repos(sbox):
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
@@ -999,7 +998,7 @@ def diff_base_to_repos(sbox):
'A/D/newfile' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
@@ -1067,7 +1066,7 @@ def diff_deleted_in_head(sbox):
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
@@ -1090,7 +1089,7 @@ def diff_deleted_in_head(sbox):
'A/C')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Doing an 'svn diff -r1:2' on the URL of directory A should work,
# especially over the DAV layer.
@@ -1753,7 +1752,7 @@ def diff_force(sbox):
# Commit iota, creating revision 2.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Add another line, while keeping he file as binary.
svntest.main.file_append(iota_path, "another line")
@@ -1769,7 +1768,7 @@ def diff_force(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Check that we get diff when the first, the second and both files
# are marked as binary. First we'll use --force. Then we'll use
@@ -2613,7 +2612,7 @@ def diff_weird_author(sbox):
expected_status.tweak("A/mu", wc_rev=2)
svntest.actions.run_and_verify_commit(sbox.wc_dir, expected_output,
- expected_status, None, sbox.wc_dir)
+ expected_status)
svntest.main.run_svn(None,
"propset", "--revprop", "-r", "2", "svn:author",
@@ -2652,7 +2651,7 @@ def diff_ignore_whitespace(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None,)
# only whitespace changes, should return no changes
svntest.main.file_write(file_path,
@@ -2698,7 +2697,7 @@ def diff_ignore_eolstyle(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# commit only eol changes
svntest.main.file_write(file_path,
@@ -2746,7 +2745,7 @@ def diff_in_renamed_folder(sbox):
### child of the A/D/C copy. thus, it appears in the status output as a
### (M)odified child.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
expected_output = svntest.wc.State(wc_dir, {
'A/D/C/kappa' : Item(verb='Sending'),
@@ -2756,7 +2755,7 @@ def diff_in_renamed_folder(sbox):
for i in range(3, 5):
svntest.main.file_append(kappa_path, str(i) + "\n")
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
expected_output = make_diff_header(kappa_path, "revision 3",
"revision 4") + [
@@ -2906,7 +2905,7 @@ def diff_ignore_eolstyle_empty_lines(sbo
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# sleep to guarantee timestamp change
time.sleep(1.1)
@@ -3013,7 +3012,7 @@ def diff_summarize_xml(sbox):
[], wc_dir, paths, items, props, kinds, wc_dir)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# 1) Test --xml without --summarize
svntest.actions.run_and_verify_svn(
@@ -3402,7 +3401,7 @@ def diff_prop_missing_context(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
prop_val = "".join([
"line 3\n",
@@ -3459,7 +3458,7 @@ def diff_prop_multiple_hunks(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
prop_val = "".join([
"line 1\n",
@@ -3523,7 +3522,7 @@ def diff_git_empty_files(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
svntest.main.file_write(new_path, "")
svntest.main.run_svn(None, 'add', new_path)
@@ -3560,7 +3559,7 @@ def diff_git_with_props(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
svntest.main.file_write(new_path, "")
svntest.main.run_svn(None, 'add', new_path)
@@ -3602,7 +3601,7 @@ def diff_correct_wc_base_revnum(sbox):
'iota' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Child's base is now 2; parent's is still 1.
# Make a local mod.
@@ -3641,7 +3640,7 @@ def diff_git_with_props_on_dir(sbox):
sbox.simple_propset('k','v', '', 'A')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
was_cwd = os.getcwd()
os.chdir(wc_dir)
@@ -4371,7 +4370,7 @@ def diff_repos_empty_file_addition(sbox)
'newfile' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(sbox.wc_dir, expected_output,
- expected_status, None, sbox.wc_dir)
+ expected_status)
# Now diff the revision that added the empty file.
expected_output = [
@@ -4418,8 +4417,8 @@ def diff_missing_tree_conflict_victim(sb
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, None,
- False, '--ignore-ancestry', wc_dir)
+ [], False, False,
+ '--ignore-ancestry', wc_dir)
# 'svn diff' should show no change for the working copy
# This currently fails because svn errors out with a 'node not found' error
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries-dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries-dump.c?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries-dump.c (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries-dump.c Wed Mar 4 15:56:18 2015
@@ -271,6 +271,16 @@ tree_dump_dir(const char *local_abspath,
if (kind != svn_node_dir)
return SVN_NO_ERROR;
+ if (strcmp(local_abspath, bt->root_abspath) != 0)
+ {
+ svn_boolean_t is_wcroot;
+ SVN_ERR(svn_wc__db_is_wcroot(&is_wcroot, bt->wc_ctx->db,
+ local_abspath, scratch_pool));
+
+ if (is_wcroot)
+ return SVN_NO_ERROR; /* Report the stub, but not the data */
+ }
+
/* If LOCAL_ABSPATH a child of or equal to ROOT_ABSPATH, then display
a relative path starting with PREFIX_PATH. */
path = svn_dirent_skip_ancestor(bt->root_abspath, local_abspath);
@@ -288,19 +298,6 @@ tree_dump_dir(const char *local_abspath,
}
static svn_error_t *
-tree_dump_txn(void *baton, svn_sqlite__db_t *db, apr_pool_t *scratch_pool)
-{
- struct directory_walk_baton *bt = baton;
-
- SVN_ERR(svn_wc__internal_walk_children(bt->wc_ctx->db, bt->root_abspath, FALSE,
- NULL, tree_dump_dir, bt,
- svn_depth_infinity,
- NULL, NULL, scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
tree_dump(const char *path,
apr_pool_t *scratch_pool)
{
@@ -325,7 +322,12 @@ tree_dump(const char *path,
SVN_ERR(svn_wc__db_temp_borrow_sdb(&sdb, bt.wc_ctx->db, bt.root_abspath,
scratch_pool));
- SVN_ERR(svn_sqlite__with_lock(sdb, tree_dump_txn, &bt, scratch_pool));
+ SVN_SQLITE__WITH_LOCK(
+ svn_wc__internal_walk_children(db, bt.root_abspath, FALSE,
+ NULL, tree_dump_dir, &bt,
+ svn_depth_infinity,
+ NULL, NULL, scratch_pool),
+ sdb);
/* And close everything we've opened */
SVN_ERR(svn_wc_context_destroy(bt.wc_ctx));
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/entries_tests.py Wed Mar 4 15:56:18 2015
@@ -102,7 +102,7 @@ def basic_entries(sbox):
expected_status.tweak('A/B/E/beta', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
- None,
+ [],
alpha_path, beta_path)
# bump 'G' and iota another revision (3) for later testing
@@ -117,7 +117,7 @@ def basic_entries(sbox):
expected_status.tweak('A/D/G', 'iota', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
- None,
+ [],
G_path, iota_path)
# Add a file over the DELETED 'alpha'. It should be schedule-add.
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/export_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/export_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/export_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/export_tests.py Wed Mar 4 15:56:18 2015
@@ -500,8 +500,7 @@ def export_with_state_deleted(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E/alpha')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
export_target = sbox.add_wc_path('export')
expected_output = svntest.wc.State(export_target, {