You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/02/10 12:41:59 UTC
svn commit: r1658686 [12/19] - in /subversion/branches/pin-externals: ./
build/generator/ build/generator/templates/ subversion/bindings/swig/
subversion/include/ subversion/libsvn_client/ subversion/libsvn_fs_fs/
subversion/libsvn_fs_x/ subversion/lib...
Modified: subversion/branches/pin-externals/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/merge_tests.py Tue Feb 10 11:41:57 2015
@@ -208,7 +208,7 @@ def textual_merges_galore(sbox):
# We skip A/D/G/rho in this merge; it will be tested with a separate
# merge command. Temporarily put it back to revision 1, so this
# merge succeeds cleanly.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', '-r', '1', other_rho_path)
# For A/D/G/tau, we append few different lines, to conflict with the
@@ -280,7 +280,6 @@ def textual_merges_galore(sbox):
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[-3]],
['G ' + other_rho_path + '\n',
' G ' + other_rho_path + '\n',]),
@@ -355,7 +354,7 @@ def textual_merges_galore(sbox):
svntest.tree.detect_conflict_files, list(tau_conflict_support_files))
- svntest.actions.run_and_verify_svn(None, [], '.*W200017: Property.*not found',
+ svntest.actions.run_and_verify_svn([], '.*W200017: Property.*not found',
'propget', SVN_PROP_MERGEINFO,
os.path.join(other_wc,
"A", "D", "G", "rho"))
@@ -510,14 +509,14 @@ def simple_property_merges(sbox):
beta_path = sbox.ospath('A/B/E/beta')
E_path = sbox.ospath('A/B/E')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
alpha_path)
# A binary, non-UTF8 property value
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo\201val',
beta_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
E_path)
@@ -533,29 +532,29 @@ def simple_property_merges(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Copy B to B2 as rev 3
B_url = sbox.repo_url + '/A/B'
B2_url = sbox.repo_url + '/A/B2'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'copy', '-m', 'copy B to B2',
B_url, B2_url)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Modify a property and add a property for the file and directory
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'mod_foo', alpha_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'bar', 'bar_val', alpha_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'mod\201foo', beta_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'bar', 'bar\201val', beta_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'mod_foo', E_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'bar', 'bar_val', E_path)
# Commit change as rev 4
@@ -573,7 +572,7 @@ def simple_property_merges(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
pristine_status = expected_status
pristine_status.tweak(wc_rev=4)
@@ -622,7 +621,7 @@ def simple_property_merges(sbox):
None, None, None, None, None, 1)
# Revert merge
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', '--recursive', wc_dir)
svntest.actions.run_and_verify_status(wc_dir, pristine_status)
@@ -678,22 +677,21 @@ def simple_property_merges(sbox):
# issue 1109 : single file property merge. This test performs a merge
# that should be a no-op (adding properties that are already present).
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', '--recursive', wc_dir)
svntest.actions.run_and_verify_status(wc_dir, pristine_status)
# Copy A at rev 4 to A2 to make revision 5.
A_url = sbox.repo_url + '/A'
A2_url = sbox.repo_url + '/A2'
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 5.\n'], [],
'copy', '-m', 'copy A to A2',
A_url, A2_url)
# Re-root the WC at A2.
svntest.main.safe_rmtree(wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+ svntest.actions.run_and_verify_svn(None, [], 'checkout',
A2_url, wc_dir)
# Attempt to re-merge rev 4 of the original A's alpha. Mergeinfo
@@ -703,10 +701,10 @@ def simple_property_merges(sbox):
alpha_path = sbox.ospath('B/E/alpha')
# Cannot use run_and_verify_merge with a file target
- svntest.actions.run_and_verify_svn(None, [], [], 'merge', '-r', '3:4',
+ svntest.actions.run_and_verify_svn([], [], 'merge', '-r', '3:4',
alpha_url, alpha_path)
- exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
'pl', alpha_path)
saw_foo = 0
@@ -765,10 +763,10 @@ def merge_similar_unrelated_trees(sbox):
os.rename(os.path.join(base2_path, 'A', 'B', 'beta'),
os.path.join(base2_path, 'A', 'B', 'zeta'))
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'add', base1_path, base2_path, apply_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'rev 2', wc_dir)
expected_output = wc.State(apply_path, {
@@ -779,7 +777,7 @@ def merge_similar_unrelated_trees(sbox):
# run_and_verify_merge doesn't support 'svn merge URL URL path'
### TODO: We can use run_and_verify_merge() here now.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'merge',
'--ignore-ancestry',
base1_url, base2_url,
@@ -828,7 +826,7 @@ def merge_one_file_helper(sbox, arg_flav
wc_dir)
# Backdate rho to revision 1, so we can merge in the rev 2 changes.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', '-r', '1', rho_path)
# Try one merge with an explicit target; it should succeed.
@@ -837,21 +835,18 @@ def merge_one_file_helper(sbox, arg_flav
# right. I think something is still assuming a directory target.
if arg_flav == 'r':
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[2]],
['U ' + rho_path + '\n',
' U ' + rho_path + '\n']),
[], 'merge', '-r', '1:2', rho_url, rho_path)
elif arg_flav == 'c':
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[2]],
['U ' + rho_path + '\n',
' U ' + rho_path + '\n']),
[], 'merge', '-c', '2', rho_url, rho_path)
elif arg_flav == '*':
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[2]],
['U ' + rho_path + '\n',
' U ' + rho_path + '\n']),
@@ -867,7 +862,7 @@ def merge_one_file_helper(sbox, arg_flav
raise svntest.Failure("Unexpected text in merged '" + rho_path + "'")
# Restore rho to pristine revision 1, for another merge.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', rho_path)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', rho_path)
expected_status.tweak('A/D/G/rho', status=' ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -895,7 +890,7 @@ def merge_one_file_helper(sbox, arg_flav
rho_expected_status = 'MM'
merge_cmd.append(rho_url)
- svntest.actions.run_and_verify_svn(None, expected_output, [], *merge_cmd)
+ svntest.actions.run_and_verify_svn(expected_output, [], *merge_cmd)
# Inspect rho, make sure it's right.
rho_text = svntest.tree.get_text('rho')
@@ -992,15 +987,13 @@ def merge_with_implicit_target_helper(sb
# merge using filename for sourcepath
# Cannot use run_and_verify_merge with a file target
if arg_flav == 'r':
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[2]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[2]],
['U mu\n',
' U mu\n']),
[],
'merge', '-r', '1:2', 'mu')
elif arg_flav == 'c':
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[2]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[2]],
['U mu\n',
' U mu\n']),
[],
@@ -1010,9 +1003,8 @@ def merge_with_implicit_target_helper(sb
# Without a peg revision, the default merge range of BASE:1 (which
# is a no-op) will be chosen. Let's do it both ways (no-op first,
# of course).
- svntest.actions.run_and_verify_svn(None, None, [], 'merge', 'mu')
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[2]],
+ svntest.actions.run_and_verify_svn(None, [], 'merge', 'mu')
+ svntest.actions.run_and_verify_svn(expected_merge_output([[2]],
['U mu\n',
' U mu\n']),
[],
@@ -1024,8 +1016,7 @@ def merge_with_implicit_target_helper(sb
# merge using URL for sourcepath
if arg_flav == 'r':
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[-2]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[-2]],
['G mu\n',
' U mu\n',
' G mu\n',],
@@ -1033,8 +1024,7 @@ def merge_with_implicit_target_helper(sb
[],
'merge', '-r', '2:1', mu_url)
elif arg_flav == 'c':
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[-2]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[-2]],
['G mu\n',
' U mu\n',
' G mu\n'],
@@ -1045,8 +1035,7 @@ def merge_with_implicit_target_helper(sb
# Implicit merge source URL and revision range detection is for
# forward merges only (e.g. non-reverts). Undo application of
# r2 to enable continuation of the test case.
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[-2]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[-2]],
['G mu\n',
' U mu\n',
' G mu\n'],
@@ -1131,8 +1120,7 @@ def merge_with_prev(sbox):
# Try to revert the last change to mu via svn merge
# Cannot use run_and_verify_merge with a file target
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[-2]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[-2]],
['U mu\n',
' U mu\n'],
elides=True),
@@ -1154,11 +1142,11 @@ def merge_with_prev(sbox):
os.chdir(another_wc)
# ensure 'A' will be at revision 2
- svntest.actions.run_and_verify_svn(None, None, [], 'up')
+ svntest.actions.run_and_verify_svn(None, [], 'up')
# now try a revert on a directory, and verify that it removed the zot
# file we had added previously
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'merge', '-r', 'COMMITTED:PREV',
'A', 'A')
@@ -1274,21 +1262,21 @@ def merge_in_new_file_and_diff(sbox):
trunk_url = sbox.repo_url + '/A/B/E'
# Create a branch
- svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+ svntest.actions.run_and_verify_svn(None, [], 'cp',
trunk_url,
sbox.repo_url + '/branch',
'-m', "Creating the Branch")
# Update to revision 2.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'update', wc_dir)
new_file_path = sbox.ospath('A/B/E/newfile')
svntest.main.file_write(new_file_path, "newfile\n")
# Add the new file, and commit revision 3.
- svntest.actions.run_and_verify_svn(None, None, [], "add", new_file_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [], "add", new_file_path)
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m',
"Changing the trunk.", wc_dir)
@@ -1346,7 +1334,7 @@ def merge_in_new_file_and_diff(sbox):
"## -0,0 +0,1 ##\n",
" Merged /A/B/E:r2-3\n",
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
+ svntest.actions.run_and_verify_svn(expected_output, [], 'diff',
'--show-copies-as-adds', branch_path)
@@ -1439,7 +1427,7 @@ def merge_skips_obstructions(sbox):
# unversioned file called "Q" will obstruct the adding of the
# directory of the same name.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', '-R', wc_dir)
os.unlink(os.path.join(C_path, "foo"))
svntest.main.safe_rmtree(os.path.join(C_path, "Q"))
@@ -1480,12 +1468,12 @@ def merge_skips_obstructions(sbox):
# Revert the local mods, and commit the deletion of iota and A/D/G. (r3)
os.unlink(os.path.join(C_path, "foo"))
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
svntest.actions.run_and_verify_status(wc_dir, pre_merge_status)
iota_path = sbox.ospath('iota')
G_path = sbox.ospath('A/D/G')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', iota_path, G_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', iota_path, G_path)
expected_output = wc.State(wc_dir, {
'A/D/G' : Item(verb='Deleting'),
@@ -1543,7 +1531,7 @@ def merge_skips_obstructions(sbox):
# Revert the local mods, and commit a change to A/B/lambda (r4), and then
# commit the deletion of the same file. (r5)
svntest.main.safe_rmtree(G_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
expected_status.tweak('', status=' ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1558,7 +1546,7 @@ def merge_skips_obstructions(sbox):
expected_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', lambda_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', lambda_path)
expected_output = wc.State(wc_dir, {
'A/B/lambda' : Item(verb='Deleting'),
@@ -1609,10 +1597,10 @@ def merge_skips_obstructions(sbox):
# working file. Then re-run the -r3:4 merge, and see how svn deals
# with a file being under version control, but missing.
- svntest.actions.run_and_verify_svn(None, None, [], 'add', lambda_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', lambda_path)
# Mergeinfo prop changed so update to avoid out of date error.
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_output = wc.State(wc_dir, {
'' : Item(verb='Sending'),
@@ -1673,9 +1661,9 @@ def merge_into_missing(sbox):
Q_path = os.path.join(F_path, 'Q')
foo_path = os.path.join(F_path, 'foo')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', Q_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', Q_path)
svntest.main.file_append(foo_path, "foo")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', foo_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', foo_path)
expected_output = wc.State(wc_dir, {
'A/B/F/Q' : Item(verb='Adding'),
@@ -1694,11 +1682,11 @@ def merge_into_missing(sbox):
R_path = os.path.join(Q_path, 'R')
bar_path = os.path.join(R_path, 'bar')
baz_path = os.path.join(Q_path, 'baz')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', R_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', R_path)
svntest.main.file_append(bar_path, "bar")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', bar_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', bar_path)
svntest.main.file_append(baz_path, "baz")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', baz_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', baz_path)
expected_output = wc.State(wc_dir, {
'A/B/F/Q/R' : Item(verb='Adding'),
@@ -1819,8 +1807,8 @@ def dry_run_adds_file_with_prop(sbox):
# Commit a new file which has a property.
zig_path = sbox.ospath('A/B/E/zig')
svntest.main.file_append(zig_path, "zig contents")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', zig_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [], 'add', zig_path)
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
zig_path)
@@ -2001,8 +1989,7 @@ def merge_binary_with_common_ancestry(sb
os.chdir(K_path)
theta_J_url = sbox.repo_url + '/J/theta'
theta_L_url = sbox.repo_url + '/L/theta'
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output(None,
+ svntest.actions.run_and_verify_svn(expected_merge_output(None,
['U theta\n',
' U theta\n',
' G theta\n',],
@@ -2050,11 +2037,11 @@ def merge_funny_chars_on_path(sbox):
target_path = os.path.join(wc_dir, 'A', 'B', 'E', '%s' % target[1],
target[2])
svntest.main.file_append(target_path, "%s/%s" % (target[1], target[2]))
- svntest.actions.run_and_verify_svn(None, None, [], 'add', target_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'add', target_dir)
elif target[0] == 'f':
target_path = os.path.join(wc_dir, 'A', 'B', 'E', '%s' % target[1])
svntest.main.file_append(target_path, "%s" % target[1])
- svntest.actions.run_and_verify_svn(None, None, [], 'add', target_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', target_path)
else:
raise svntest.Failure
@@ -2062,12 +2049,12 @@ def merge_funny_chars_on_path(sbox):
for target in add_by_mkdir:
if target[0] == 'd':
target_dir = os.path.join(wc_dir, 'A', 'B', 'E', target[1])
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', target_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', target_dir)
if target[2]:
target_path = os.path.join(wc_dir, 'A', 'B', 'E', '%s' % target[1],
target[2])
svntest.main.file_append(target_path, "%s/%s" % (target[1], target[2]))
- svntest.actions.run_and_verify_svn(None, None, [], 'add', target_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', target_path)
expected_output_dic = {}
expected_status_dic = {}
@@ -2171,29 +2158,29 @@ def merge_keyword_expansions(sbox):
os.mkdir(tpath)
svntest.main.run_svn(None, "add", tpath)
# Commit r2.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
"ci", "-m", "r2", wcpath)
# Copy t to b.
svntest.main.run_svn(None, "cp", tpath, bpath)
# Commit r3
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
"ci", "-m", "r3", wcpath)
# Add a file to t.
svntest.main.file_append(t_fpath, "$Revision$")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'add', t_fpath)
# Ask for keyword expansion in the file.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'svn:keywords', 'Revision',
t_fpath)
# Commit r4
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'r4', wcpath)
# Update the wc before the merge.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'update', wcpath)
expected_status = svntest.actions.get_virginal_state(wcpath, 4)
@@ -2242,7 +2229,7 @@ def merge_prop_change_to_deleted_target(
# Add a property to alpha.
alpha_path = sbox.ospath('A/B/E/alpha')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
alpha_path)
@@ -2255,11 +2242,11 @@ def merge_prop_change_to_deleted_target(
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', wc_dir)
# Remove alpha entirely.
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', alpha_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', alpha_path)
expected_output = wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Deleting'),
})
@@ -2276,8 +2263,7 @@ def merge_prop_change_to_deleted_target(
# --ignore-ancestry here because our merge logic will otherwise
# prevent a merge of changes we already have.
os.chdir(wc_dir)
- svntest.actions.run_and_verify_svn("Merge errored unexpectedly",
- svntest.verify.AnyOutput, [], 'merge',
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], 'merge',
'-r1:2', '--ignore-ancestry', '.')
#----------------------------------------------------------------------
@@ -2303,8 +2289,8 @@ def merge_dir_replace(sbox):
new_file3 = os.path.join(bar_path, "new file 3")
# Make a couple of directories, and add some files within them.
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', bar_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', foo_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', bar_path)
svntest.main.file_append(new_file3, "Initial text in new file 3.\n")
svntest.main.run_svn(None, "add", new_file3)
svntest.main.file_append(foo_file, "Initial text in file foo.\n")
@@ -2414,8 +2400,8 @@ def merge_dir_and_file_replace(sbox):
# Recreate foo and 'new file 2' in F and add a new folder with a file
bar_path = os.path.join(foo_path, 'bar')
new_file3 = os.path.join(bar_path, "new file 3")
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', bar_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', foo_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', bar_path)
svntest.main.file_append(new_file3, "Initial text in new file 3.\n")
svntest.main.run_svn(None, "add", new_file3)
svntest.main.file_append(new_file2, "New text in new file 2.\n")
@@ -2507,11 +2493,11 @@ def merge_dir_and_file_replace(sbox):
# Confirm the files are present in the repository.
new_file_2_url = sbox.repo_url + '/A/C/foo/new file 2'
- svntest.actions.run_and_verify_svn(None, ["New text in new file 2.\n"],
+ svntest.actions.run_and_verify_svn(["New text in new file 2.\n"],
[], 'cat',
new_file_2_url)
new_file_3_url = sbox.repo_url + '/A/C/foo/bar/new file 3'
- svntest.actions.run_and_verify_svn(None, ["Initial text in new file 3.\n"],
+ svntest.actions.run_and_verify_svn(["Initial text in new file 3.\n"],
[], 'cat',
new_file_3_url)
@@ -2527,12 +2513,12 @@ def merge_file_with_space_in_its_name(sb
# Make r2.
svntest.main.file_append(new_file, "Initial text in the file.\n")
svntest.main.run_svn(None, "add", new_file)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
"ci", "-m", "r2", wc_dir)
# Make r3.
svntest.main.file_append(new_file, "Next line of text in the file.\n")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
"ci", "-m", "r3", wc_dir)
# Try to reverse merge.
@@ -2542,7 +2528,7 @@ def merge_file_with_space_in_its_name(sb
# file (i.e., the URL basename) lives.
os.chdir(wc_dir)
target_url = sbox.repo_url + '/new%20file'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
"merge", "-r3:2", target_url)
#----------------------------------------------------------------------
@@ -2563,7 +2549,7 @@ def merge_dir_branches(sbox):
# Create foo in F
foo_path = os.path.join(F_path, 'foo')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', foo_path)
expected_output = wc.State(wc_dir, {
'A/B/F/foo' : Item(verb='Adding'),
@@ -2586,7 +2572,7 @@ def merge_dir_branches(sbox):
# syntax of the merge command.
### TODO: We can use run_and_verify_merge() here now.
expected_output = expected_merge_output(None, "A " + foo_path + "\n")
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'merge', '--allow-mixed-revisions',
C_url, F_url, wc_dir)
@@ -2616,10 +2602,10 @@ def safe_property_merge(sbox):
beta_path = sbox.ospath('A/B/E/beta')
E_path = sbox.ospath('A/B/E')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
alpha_path, beta_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
E_path)
@@ -2634,25 +2620,25 @@ def safe_property_merge(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Copy B to B2 as rev 3 (making a branch)
B_url = sbox.repo_url + '/A/B'
B2_url = sbox.repo_url + '/A/B2'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'copy', '-m', 'copy B to B2',
B_url, B2_url)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Change the properties underneath B again, and commit as r4
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val2',
alpha_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propdel', 'foo',
beta_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val2',
E_path)
expected_output = svntest.wc.State(wc_dir, {
@@ -2663,17 +2649,17 @@ def safe_property_merge(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, None,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Make local propchanges to E, alpha and beta in the branch.
alpha_path2 = sbox.ospath('A/B2/E/alpha')
beta_path2 = sbox.ospath('A/B2/E/beta')
E_path2 = sbox.ospath('A/B2/E')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'branchval',
alpha_path2, beta_path2)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'branchval',
E_path2)
@@ -2746,10 +2732,10 @@ def property_merge_from_branch(sbox):
alpha_path = sbox.ospath('A/B/E/alpha')
E_path = sbox.ospath('A/B/E')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
alpha_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
E_path)
@@ -2762,22 +2748,22 @@ def property_merge_from_branch(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Copy B to B2 as rev 3 (making a branch)
B_url = sbox.repo_url + '/A/B'
B2_url = sbox.repo_url + '/A/B2'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'copy', '-m', 'copy B to B2',
B_url, B2_url)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Change the properties underneath B again, and commit as r4
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val2',
alpha_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val2',
E_path)
expected_output = svntest.wc.State(wc_dir, {
@@ -2787,16 +2773,16 @@ def property_merge_from_branch(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, None,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Make different propchanges changes to the B2 branch and commit as r5.
alpha_path2 = sbox.ospath('A/B2/E/alpha')
E_path2 = sbox.ospath('A/B2/E')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'branchval',
alpha_path2)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'branchval',
E_path2)
expected_output = svntest.wc.State(wc_dir, {
@@ -2806,7 +2792,7 @@ def property_merge_from_branch(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, None,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Now merge the recent B change to the branch. There are no local
# mods anywhere, but we should still get property conflicts anyway!
@@ -2873,7 +2859,7 @@ def property_merge_undo_redo(sbox):
# Add a property to a file, commit as r2.
alpha_path = sbox.ospath('A/B/E/alpha')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
alpha_path)
@@ -2886,7 +2872,7 @@ def property_merge_undo_redo(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Use 'svn merge' to undo the commit. ('svn merge -r2:1')
# Result should be a single local-prop-mod.
@@ -2970,25 +2956,24 @@ def cherry_pick_text_conflict(sbox):
branch_mu_path = sbox.ospath('copy-of-A/mu')
# Create a branch of A.
- svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+ svntest.actions.run_and_verify_svn(None, [], 'cp',
A_url, branch_A_url,
'-m', "Creating copy-of-A")
# Update to get the branch.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'update', wc_dir)
# Change mu's text on the branch, producing r3 through r6.
for rev in range(3, 7):
svntest.main.file_append(branch_mu_path, ("r%d\n" % rev) * 3)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m',
'Add lines to mu in r%d.' % rev, wc_dir)
# Mark r5 as merged into trunk, to create disparate revision ranges
# which need to be merged.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
[' U ' + A_path + '\n']),
[], 'merge', '-c5', '--record-only',
@@ -3074,7 +3059,7 @@ def merge_file_replace(sbox):
# File scheduled for deletion
rho_path = sbox.ospath('A/D/G/rho')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', rho_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/G/rho', status='D ')
@@ -3093,7 +3078,7 @@ def merge_file_replace(sbox):
None, wc_dir)
# Create and add a new file.
svntest.main.file_write(rho_path, "new rho\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', rho_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', rho_path)
# Commit revsion 3
expected_status.add({
@@ -3166,7 +3151,7 @@ def merge_file_replace_to_mixed_rev_wc(s
# File scheduled for deletion
rho_path = sbox.ospath('A/D/G/rho')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', rho_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/G/rho', status='D ')
@@ -3197,7 +3182,7 @@ def merge_file_replace_to_mixed_rev_wc(s
# Create and add a new file.
svntest.main.file_write(rho_path, "new rho\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', rho_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', rho_path)
# Commit revsion 3
expected_status.add({
@@ -3229,7 +3214,7 @@ def merge_file_replace_to_mixed_rev_wc(s
# update only "." using --depth empty. This preserves the intent of the
# original mixed-rev test for this issue, but allows the merge tracking
# logic to consider r3 as valid for reverse merging.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', '--depth', 'empty', wc_dir)
expected_status.tweak('', wc_rev=3)
expected_output = svntest.wc.State(wc_dir, {
@@ -3307,7 +3292,7 @@ def merge_ignore_whitespace(sbox):
wc_dir)
# Backdate iota to revision 2, so we can merge in the rev 3 changes.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', '-r', '2', file_path)
# Make some local whitespace changes, these should not conflict
# with the remote whitespace changes as both will be ignored.
@@ -3386,7 +3371,7 @@ def merge_ignore_eolstyle(sbox):
wc_dir)
# Backdate iota to revision 2, so we can merge in the rev 3 changes.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', '-r', '2', file_path)
# Make some local eol changes, these should not conflict
# with the remote eol changes as both will be ignored.
@@ -3453,7 +3438,7 @@ def merge_conflict_markers_matching_eol(
# Checkout a second working copy
wc_backup = sbox.add_wc_path('backup')
- svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+ svntest.actions.run_and_verify_svn(None, [], 'checkout',
sbox.repo_url, wc_backup)
# set starting revision
@@ -3595,7 +3580,7 @@ def merge_eolstyle_handling(sbox):
# Checkout a second working copy
wc_backup = sbox.add_wc_path('backup')
- svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+ svntest.actions.run_and_verify_svn(None, [], 'checkout',
sbox.repo_url, wc_backup)
path_backup = os.path.join(wc_backup, 'A', 'mu')
@@ -3738,7 +3723,7 @@ def create_deep_trees(wc_dir):
wc_dir)
# Bring the entire WC up to date with rev 3.
- svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
expected_status.tweak(wc_rev=3)
# Copy B and commit, creating revision 4.
@@ -3784,7 +3769,7 @@ def create_deep_trees(wc_dir):
svntest.actions.verify_disk(wc_dir, expected_disk, True)
# Bring the entire WC up to date with rev 4.
- svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
svntest.actions.verify_disk(wc_dir, expected_disk, True)
@@ -3822,7 +3807,7 @@ def avoid_repeated_merge_using_inherited
wc_dir)
# Bring the entire WC up to date with rev 5.
- svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
# Merge changes from rev 5 of B (to alpha) into copy_of_B.
expected_output = wc.State(copy_of_B_path, {
@@ -3884,7 +3869,7 @@ def avoid_repeated_merge_using_inherited
# info for /A/copy_of_B/F -- nor its parent dir in the repos -- at
# rev 4. Mergeinfo wasn't introduced until rev 6.
copy_of_B_F_E_path = os.path.join(copy_of_B_path, 'F', 'E')
- svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
# Attempt to re-merge changes to alpha from rev 4. Use the merge
# info inherited from the grandparent (copy-of-B) of our merge
@@ -3895,7 +3880,6 @@ def avoid_repeated_merge_using_inherited
'beta' : Item(status=' ', wc_rev=6),
})
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
[' U ' + copy_of_B_F_E_path + '\n',
' G ' + copy_of_B_F_E_path + '\n'],
@@ -4008,7 +3992,7 @@ def avoid_repeated_merge_on_subtree_with
# Update the WC to bring /A/copy_of_B to rev 8.
# Without this update expected_status tree would be cumbersome to
# understand.
- svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
# Merge changes from rev 4:8 of A/B into A/copy_of_B. A/copy_of_B/F/E1
# has explicit mergeinfo and exists at r4 in the merge source, so it
@@ -4068,7 +4052,7 @@ def avoid_repeated_merge_on_subtree_with
# http://subversion.tigris.org/issues/show_bug.cgi?id=2821#desc22
#
# Revert all local changes.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# Make a text mod to A/copy-of-B/F/E/alpha
newer_content_for_alpha = "Conflicting content"
@@ -4144,7 +4128,7 @@ def tweak_src_then_merge_to_dest(sbox, s
# Update the WC to new_rev so that it would be easier to expect everyone
# to be at new_rev.
- svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
# Merge new_rev of src_path to dst_path.
@@ -4156,7 +4140,6 @@ def tweak_src_then_merge_to_dest(sbox, s
merge_url = merge_url.replace('\\', '/')
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[new_rev]],
['U ' + dst_path + '\n',
' U ' + dst_path + '\n']),
@@ -4227,8 +4210,7 @@ def obey_reporter_api_semantics_while_do
file_contents, cur_rev)
copy_of_A_D_wc_rev = cur_rev
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision ' + str(cur_rev+1) +
'.\n'],
[],
@@ -4468,7 +4450,7 @@ def mergeinfo_inheritance(sbox):
# run_and_verify_merge doesn't support merging to a file WCPATH
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
- svntest.actions.run_and_verify_svn(None, [], [], 'merge', '-c5',
+ svntest.actions.run_and_verify_svn([], [], 'merge', '-c5',
sbox.repo_url + '/A/B/E/beta',
beta_COPY_path)
@@ -4554,7 +4536,6 @@ def mergeinfo_inheritance(sbox):
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[6]],
['U ' + omega_COPY_path + '\n',
' G ' + omega_COPY_path + '\n']),
@@ -4563,8 +4544,7 @@ def mergeinfo_inheritance(sbox):
omega_COPY_path)
# Check that mergeinfo was properly set on A_COPY/D/H/omega
- svntest.actions.run_and_verify_svn(None,
- ["/A/D/H/omega:3-4,6\n"],
+ svntest.actions.run_and_verify_svn(["/A/D/H/omega:3-4,6\n"],
[],
'propget', SVN_PROP_MERGEINFO,
omega_COPY_path)
@@ -4607,7 +4587,7 @@ def mergeinfo_inheritance(sbox):
#
## Update the disconnected WC it so it will get the most recent mergeinfo
## from the repos when merging.
- #svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [], 'up',
+ #svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [], 'up',
# other_wc)
#
## Merge r5:4 into the root of the disconnected WC.
@@ -4677,7 +4657,6 @@ def mergeinfo_elision(sbox):
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
['U ' + beta_COPY_path + '\n',
' U ' + beta_COPY_path + '\n']),
@@ -4691,7 +4670,7 @@ def mergeinfo_elision(sbox):
})
svntest.actions.run_and_verify_status(beta_COPY_path, expected_status)
- svntest.actions.run_and_verify_svn(None, ["/A/B/E/beta:5\n"], [],
+ svntest.actions.run_and_verify_svn(["/A/B/E/beta:5\n"], [],
'propget', SVN_PROP_MERGEINFO,
beta_COPY_path)
@@ -4707,7 +4686,7 @@ def mergeinfo_elision(sbox):
wc_dir)
# Update A_COPY to get all paths to the same working revision.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [],
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [],
'up', wc_dir)
wc_status.tweak(wc_rev=7)
@@ -4855,7 +4834,6 @@ def mergeinfo_elision(sbox):
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[-5]],
['U ' + beta_COPY_path + '\n',
' G ' + beta_COPY_path + '\n']),
@@ -4869,7 +4847,7 @@ def mergeinfo_elision(sbox):
})
svntest.actions.run_and_verify_status(beta_COPY_path, expected_status)
- svntest.actions.run_and_verify_svn(None, ["/A/B/E/beta:4,6\n"], [],
+ svntest.actions.run_and_verify_svn(["/A/B/E/beta:4,6\n"], [],
'propget', SVN_PROP_MERGEINFO,
beta_COPY_path)
@@ -4879,7 +4857,6 @@ def mergeinfo_elision(sbox):
# run_and_verify_merge doesn't support merging to a file WCPATH
# so use run_and_verify_svn.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
['G ' + beta_COPY_path + '\n',
' G ' + beta_COPY_path + '\n', # Update mergeinfo
@@ -4896,7 +4873,7 @@ def mergeinfo_elision(sbox):
svntest.actions.run_and_verify_status(beta_COPY_path, expected_status)
# Once again A_COPY/B/E/beta has no mergeinfo.
- svntest.actions.run_and_verify_svn(None, [], '.*W200017: Property.*not found',
+ svntest.actions.run_and_verify_svn([], '.*W200017: Property.*not found',
'propget', SVN_PROP_MERGEINFO,
beta_COPY_path)
@@ -4929,7 +4906,6 @@ def mergeinfo_inheritance_and_discontinu
os.chdir(A_COPY_path)
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[4]],
['U ' + os.path.join("D", "G", "rho") + '\n',
' U .\n']),
@@ -4940,7 +4916,7 @@ def mergeinfo_inheritance_and_discontinu
expected_status.tweak("A_COPY", status=' M')
expected_status.tweak("A_COPY/D/G/rho", status='M ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
- svntest.actions.run_and_verify_svn(None, ["/A:4\n"], [],
+ svntest.actions.run_and_verify_svn(["/A:4\n"], [],
'propget', SVN_PROP_MERGEINFO,
A_COPY_path)
@@ -4999,8 +4975,7 @@ def mergeinfo_inheritance_and_discontinu
### It'd be nice to use 'merge --record-only' here, but we can't (yet)
### wipe all ranges for a file due to the bug pointed out in r864719.
mu_copy_path = os.path.join(A_COPY_path, 'mu')
- svntest.actions.run_and_verify_svn(None,
- ["property '" + SVN_PROP_MERGEINFO
+ svntest.actions.run_and_verify_svn(["property '" + SVN_PROP_MERGEINFO
+ "' set on '" +
mu_copy_path + "'\n"], [], 'propset',
SVN_PROP_MERGEINFO, '', mu_copy_path)
@@ -5015,7 +4990,7 @@ def mergeinfo_inheritance_and_discontinu
mu_copy_path)
# ...and that the presence of the property is retained, even when
# the value has been wiped.
- svntest.actions.run_and_verify_svn(None, ['\n'], [], 'propget',
+ svntest.actions.run_and_verify_svn(['\n'], [], 'propget',
SVN_PROP_MERGEINFO, mu_copy_path)
#----------------------------------------------------------------------
@@ -5036,7 +5011,7 @@ def merge_to_target_with_copied_children
rho_COPY_COPY_path = sbox.ospath('A_COPY/D/G/rho_copy')
# URL to URL copy A_COPY/D/G/rho to A_COPY/D/G/rho_copy
- svntest.actions.run_and_verify_svn(None, None, [], 'copy',
+ svntest.actions.run_and_verify_svn(None, [], 'copy',
sbox.repo_url + '/A_COPY/D/G/rho',
sbox.repo_url + '/A_COPY/D/G/rho_copy',
'-m', 'copy')
@@ -5058,7 +5033,6 @@ def merge_to_target_with_copied_children
# Merge r4 into A_COPY/D/G/rho_copy.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[4]],
['U ' + rho_COPY_COPY_path + '\n',
' U ' + rho_COPY_COPY_path + '\n']),
@@ -5131,7 +5105,7 @@ def merge_to_switched_path(sbox):
"A " + G_COPY_path + "\n"])
# r7 - Copy A/D/G to A/D/G_COPY and commit.
- svntest.actions.run_and_verify_svn(None, expected, [], 'copy',
+ svntest.actions.run_and_verify_svn(expected, [], 'copy',
sbox.repo_url + "/A/D/G",
G_COPY_path)
@@ -5176,14 +5150,13 @@ def merge_to_switched_path(sbox):
None, None, None, None, None, 1)
# Update working copy to allow elision (if any).
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(8), [],
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [],
'up', wc_dir)
# Set some mergeinfo on a working copy parent of our switched subtree
# A_COPY/D/G. Because the subtree is switched it should *not* inherit
# this mergeinfo.
- svntest.actions.run_and_verify_svn(None,
- ["property '" + SVN_PROP_MERGEINFO +
+ svntest.actions.run_and_verify_svn(["property '" + SVN_PROP_MERGEINFO +
"' set on '" + A_COPY_path + "'" +
"\n"], [], 'ps', SVN_PROP_MERGEINFO,
'/A:4', A_COPY_path)
@@ -5239,19 +5212,16 @@ def merge_to_switched_path(sbox):
# but as it is switched this empty mergeinfo just elides to the
# repository (empty mergeinfo on a path can elide if that path doesn't
# inherit *any* mergeinfo).
- svntest.actions.run_and_verify_svn(None,
- ["Reverted '" + A_COPY_path+ "'\n",
+ svntest.actions.run_and_verify_svn(["Reverted '" + A_COPY_path+ "'\n",
"Reverted '" + A_COPY_D_G_path+ "'\n",
"Reverted '" + A_COPY_D_G_rho_path +
"'\n"],
[], 'revert', '-R', wc_dir)
- svntest.actions.run_and_verify_svn(None,
- ["property '" + SVN_PROP_MERGEINFO +
+ svntest.actions.run_and_verify_svn(["property '" + SVN_PROP_MERGEINFO +
"' set on '" + A_COPY_D_path+ "'" +
"\n"], [], 'ps', SVN_PROP_MERGEINFO,
'/A/D:4', A_COPY_D_path)
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[-4]],
['U ' + A_COPY_D_G_rho_path + '\n',
' U ' + A_COPY_D_G_path + '\n'],
@@ -5323,7 +5293,7 @@ def merge_to_path_with_switched_children
A_COPY_gamma_path = sbox.ospath('A_COPY/D/gamma')
H_COPY_2_path = sbox.ospath('A_COPY_2/D/H')
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(8), [], 'up',
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [], 'up',
wc_dir)
wc_status.tweak(wc_rev=8)
@@ -5640,8 +5610,7 @@ def merge_to_path_with_switched_children
# A_COPY/D has a switched child it gets r10 added as a non-inheritable
# range. Repeat the same merge checking that no repeat merge is
# attempted on A_COPY/D.
- svntest.actions.run_and_verify_svn(None,
- ["property 'prop:name' set on '" +
+ svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
D_path + "'\n"], [], 'ps',
'prop:name', 'propval', D_path)
expected_output = svntest.wc.State(wc_dir, {
@@ -5713,11 +5682,11 @@ def merge_to_path_with_switched_children
# Revert all local changes. This leaves just the mergeinfo for r5-8
# on A_COPY and its various subtrees.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# Update merge target so working revisions are uniform and all
# possible elision occurs.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(10), [],
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(10), [],
'up', A_COPY_path)
# Do the reverse merge.
@@ -5819,13 +5788,13 @@ def merge_with_implicit_target_file(sbox
expected_status, None, wc_dir)
# Update to revision 2.
- svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
# Revert the change committed in r2
os.chdir(wc_dir)
# run_and_verify_merge doesn't accept file paths.
- svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-r', '2:1',
+ svntest.actions.run_and_verify_svn(None, [], 'merge', '-r', '2:1',
'A/mu')
#----------------------------------------------------------------------
@@ -5973,13 +5942,13 @@ def empty_mergeinfo(sbox):
' U ' + H_COPY_path + '\n',
' U ' + A_COPY_path + '\n',],
elides=True)
- svntest.actions.run_and_verify_svn(None, expected_output,
+ svntest.actions.run_and_verify_svn(expected_output,
[], 'merge', '-r4:2',
sbox.repo_url + '/A',
A_COPY_path)
svntest.actions.run_and_verify_status(wc_dir, wc_status)
# Check that A_COPY's mergeinfo is gone.
- svntest.actions.run_and_verify_svn(None, [], '.*W200017: Property.*not found',
+ svntest.actions.run_and_verify_svn([], '.*W200017: Property.*not found',
'pg', 'svn:mergeinfo',
A_COPY_path)
@@ -6002,8 +5971,7 @@ def prop_add_to_child_with_mergeinfo(sbo
B_COPY_path = sbox.ospath('A_COPY/B')
# Set a non-mergeinfo prop on a file.
- svntest.actions.run_and_verify_svn(None,
- ["property 'prop:name' set on '" +
+ svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
beta_path + "'\n"], [], 'ps',
'prop:name', 'propval', beta_path)
expected_disk.tweak('A/B/E/beta', props={'prop:name' : 'propval'})
@@ -6018,7 +5986,6 @@ def prop_add_to_child_with_mergeinfo(sbo
# Merge r4:5 from A/B/E/beta into A_COPY/B/E/beta.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
['U ' + beta_COPY_path +'\n',
' U ' + beta_COPY_path +'\n',]),
@@ -6089,8 +6056,7 @@ def foreign_repos_does_not_update_mergei
# Merge r3:4 (using implied peg revisions) from 'other' repos into
# A_COPY/D/G. Merge should succeed, but no mergeinfo should be set.
G_COPY_path = sbox.ospath('A_COPY/D/G')
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[4]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[4]],
'U ' +
os.path.join(G_COPY_path,
"rho") + '\n', True),
@@ -6101,8 +6067,7 @@ def foreign_repos_does_not_update_mergei
# Merge r4:5 (using explicit peg revisions) from 'other' repos into
# A_COPY/B/E. Merge should succeed, but no mergeinfo should be set.
E_COPY_path = sbox.ospath('A_COPY/B/E')
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output([[5]],
+ svntest.actions.run_and_verify_svn(expected_merge_output([[5]],
'U ' +
os.path.join(E_COPY_path,
"beta") +'\n', True),
@@ -6115,10 +6080,10 @@ def foreign_repos_does_not_update_mergei
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Set up for test of issue #3383.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# Get a working copy for the foreign repos.
- svntest.actions.run_and_verify_svn(None, None, [], 'co', other_repo_url,
+ svntest.actions.run_and_verify_svn(None, [], 'co', other_repo_url,
other_wc_dir)
# Create mergeinfo on the foreign repos on an existing directory and
@@ -6127,13 +6092,13 @@ def foreign_repos_does_not_update_mergei
# simple merges to *death* elsewhere.
# Create mergeinfo on an existing directory.
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
other_repo_url + '/A',
os.path.join(other_wc_dir, 'A_COPY'),
'-c5')
# Create mergeinfo on an existing file.
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
other_repo_url + '/A/D/H/psi',
os.path.join(other_wc_dir, 'A_COPY',
'D', 'H', 'psi'),
@@ -6141,15 +6106,15 @@ def foreign_repos_does_not_update_mergei
# Add a new directory with mergeinfo in the foreign repos.
new_dir = os.path.join(other_wc_dir, 'A_COPY', 'N')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', new_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', new_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'ps',
SVN_PROP_MERGEINFO, '', new_dir)
# Add a new file with mergeinfo in the foreign repos.
new_file = os.path.join(other_wc_dir, 'A_COPY', 'nu')
svntest.main.file_write(new_file, "This is the file 'nu'.\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', new_file)
- svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+ svntest.actions.run_and_verify_svn(None, [], 'add', new_file)
+ svntest.actions.run_and_verify_svn(None, [], 'ps',
SVN_PROP_MERGEINFO, '', new_file)
expected_output = wc.State(other_wc_dir,{
@@ -6166,13 +6131,13 @@ def foreign_repos_does_not_update_mergei
# Now merge a diff from the foreign repos that contains the mergeinfo
# addition in r7 to A_COPY. The mergeinfo diff should *not* be applied
# to A_COPY since it refers to a foreign repository...
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
other_repo_url + '/A@1',
other_repo_url + '/A_COPY@7',
sbox.ospath('A_COPY'))
#...which means there should be no mergeinfo anywhere in WC_DIR, since
# this test never created any.
- svntest.actions.run_and_verify_svn(None, [], [], 'pg',
+ svntest.actions.run_and_verify_svn([], [], 'pg',
SVN_PROP_MERGEINFO, '-vR',
wc_dir)
@@ -6218,7 +6183,7 @@ def avoid_reflected_revs(sbox):
# We'll consider A as the trunk and A_COPY as the feature branch
# r3 - Create a tfile1 in A
svntest.main.file_write(tfile1_path, tfile1_content)
- svntest.actions.run_and_verify_svn(None, None, [], 'add', tfile1_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', tfile1_path)
expected_output = wc.State(wc_dir, {'A/tfile1' : Item(verb='Adding')})
wc_status.add({'A/tfile1' : Item(status=' ', wc_rev=3)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -6226,7 +6191,7 @@ def avoid_reflected_revs(sbox):
# r4 - Create a bfile1 in A_COPY
svntest.main.file_write(bfile1_path, bfile1_content)
- svntest.actions.run_and_verify_svn(None, None, [], 'add', bfile1_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', bfile1_path)
expected_output = wc.State(wc_dir, {'A_COPY/bfile1' : Item(verb='Adding')})
wc_status.add({'A_COPY/bfile1' : Item(status=' ', wc_rev=4)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -6234,7 +6199,7 @@ def avoid_reflected_revs(sbox):
# r5 - Create one more file in A
svntest.main.file_write(tfile2_path, tfile2_content)
- svntest.actions.run_and_verify_svn(None, None, [], 'add', tfile2_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', tfile2_path)
expected_output = wc.State(wc_dir, {'A/tfile2' : Item(verb='Adding')})
wc_status.add({'A/tfile2' : Item(status=' ', wc_rev=5)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -6309,7 +6274,7 @@ def avoid_reflected_revs(sbox):
None, A_COPY_path,
'--allow-mixed-revisions')
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_output = wc.State(wc_dir, {
'A_COPY' : Item(verb='Sending'),
'A_COPY/tfile2' : Item(verb='Adding'),
@@ -6349,7 +6314,7 @@ def avoid_reflected_revs(sbox):
None, A_COPY_path,
'--allow-mixed-revisions')
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_output = wc.State(wc_dir, {
'A_COPY' : Item(verb='Sending'),
'A_COPY/tfile1' : Item(verb='Adding'),
@@ -6359,7 +6324,7 @@ def avoid_reflected_revs(sbox):
# r8 - Add bfile2 to A_COPY
svntest.main.file_write(bfile2_path, bfile2_content)
- svntest.actions.run_and_verify_svn(None, None, [], 'add', bfile2_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', bfile2_path)
expected_output = wc.State(wc_dir, {'A_COPY/bfile2' : Item(verb='Adding')})
wc_status.tweak(wc_rev=6)
wc_status.add({
@@ -6461,11 +6426,11 @@ def update_loses_mergeinfo(sbox):
A_B_url = sbox.repo_url + '/A/B'
A_B_J_url = sbox.repo_url + '/A/B/J'
A_B_K_url = sbox.repo_url + '/A/B/K'
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'],
[],
'mkdir', '-m', 'rev 2', A_B_J_url)
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 3.\n'],
[],
'mkdir', '-m', 'rev 3', A_B_K_url)
@@ -6583,11 +6548,11 @@ def merge_loses_mergeinfo(sbox):
A_B_url = sbox.repo_url + '/A/B'
A_B_J_url = sbox.repo_url + '/A/B/J'
A_B_K_url = sbox.repo_url + '/A/B/K'
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'],
[],
'mkdir', '-m', 'rev 2', A_B_J_url)
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 3.\n'],
[],
'mkdir', '-m', 'rev 3', A_B_K_url)
@@ -6709,8 +6674,7 @@ def single_file_replace_style_merge_capa
None, wc_dir)
# Merge the file mu alone to rev1
- svntest.actions.run_and_verify_svn(None,
- expected_merge_output(None,
+ svntest.actions.run_and_verify_svn(expected_merge_output(None,
['R ' + mu_path + '\n']),
[],
'merge',
@@ -6852,7 +6816,7 @@ def merge_with_depth_files(sbox):
Acopy_url = sbox.repo_url + '/A_copy'
# Copy A_url to A_copy_url
- svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+ svntest.actions.run_and_verify_svn(None, [], 'cp',
A_url, Acopy_url,
'-m', 'create a new copy of A')
@@ -6880,7 +6844,7 @@ def merge_with_depth_files(sbox):
wc_dir)
# Update working copy
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', Acopy_path)
# Merge r1:3 into A_copy with --depth files. The merge only affects
@@ -6985,11 +6949,11 @@ def merge_away_subtrees_noninheritable_r
nu_COPY_path = sbox.ospath('A_COPY/nu')
# Make a change to directory A/D/H and commit as r8.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [],
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [],
'update', wc_dir)
svntest.actions.run_and_verify_svn(
- None, ["property 'prop:name' set on '" + H_path + "'\n"], [],
+ ["property 'prop:name' set on '" + H_path + "'\n"], [],
'ps', 'prop:name', 'propval', H_path)
expected_output = svntest.wc.State(wc_dir, {
'A/D/H' : Item(verb='Sending'),})
@@ -7083,13 +7047,13 @@ def merge_away_subtrees_noninheritable_r
# http://svn.haxx.se/dev/archive-2008-12/0133.shtml.
#
# First revert all local mods.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# r9: Merge all available revisions from A to A_COPY at a depth of empty
# this will create non-inheritable mergeinfo on A_COPY.
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
wc_status.tweak(wc_rev=8)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'merge', '--depth', 'empty',
sbox.repo_url + '/A', A_COPY_path)
wc_status.tweak('A_COPY', wc_rev=9)
@@ -7099,14 +7063,14 @@ def merge_away_subtrees_noninheritable_r
# r10: Add the file A/nu.
svntest.main.file_write(nu_path, "This is the file 'nu'.\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', nu_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', nu_path)
expected_output = wc.State(wc_dir, {'A/nu' : Item(verb='Adding')})
wc_status.add({'A/nu' : Item(status=' ', wc_rev=10)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
wc_status, None, wc_dir)
# Now merge -c10 from A to A_COPY.
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_output = wc.State('', {
'nu': Item(status='A '),
})
@@ -7185,21 +7149,20 @@ def merge_away_subtrees_noninheritable_r
# *and* the mergeinfo inherited from it's parent.
#
# First revert all local changes and remove A_COPY/C/nu from disk.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# Make a text change to A_COPY_2/mu in r11 and then merge that
# change to A/mu in r12. This will create mergeinfo of '/A_COPY_2/mu:11'
# on A/mu.
svntest.main.file_write(mu_2_path, 'new content')
- svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m', 'log msg',
+ svntest.actions.run_and_verify_svn(None, [], 'ci', '-m', 'log msg',
wc_dir)
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[11]],
['U ' + mu_path + '\n',
' U ' + mu_path + '\n']),
[], 'merge', '-c11', sbox.repo_url + '/A_COPY_2/mu', mu_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m', 'log msg',
+ svntest.actions.run_and_verify_svn(None, [], 'ci', '-m', 'log msg',
wc_dir)
# Now merge r12 from A to A_COPY. A_COPY/mu should get the mergeinfo from
@@ -7280,8 +7243,8 @@ def merge_away_subtrees_noninheritable_r
# Test for issue #3392
#
# Revert local changes and update.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Merge r8 from A/D/H to A_COPY_D/H at depth empty. Since r8 affects only
# A_COPY/D/H itself, the resulting mergeinfo is inheritable. Commit this
@@ -7317,9 +7280,9 @@ def merge_away_subtrees_noninheritable_r
expected_status, expected_skip,
None, None, None, None, None, 1, 1,
'--depth', 'empty', H_COPY_2_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'commit', '-m',
+ svntest.actions.run_and_verify_svn(None, [], 'commit', '-m',
'log msg', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Now reverse the prior merge. Issue #3392 manifests itself here with
# a mergeinfo parsing error:
# >svn merge %url%/A/D/H merge_tests-62\A_COPY_2\D\H -c-8
@@ -7349,24 +7312,22 @@ def merge_away_subtrees_noninheritable_r
# Test issue #3407 'Shallow merges incorrectly set mergeinfo on children'.
#
# Revert all local mods.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# Merge all available changes from A to A_COPY at --depth empty. Only the
# mergeinfo on A_COPY should be affected.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[9,13]],
[' U ' + A_COPY_path + '\n']),
[], 'merge', '--depth', 'empty',
sbox.repo_url + '/A', A_COPY_path)
- svntest.actions.run_and_verify_svn(None,
- [A_COPY_path + ' - /A:2-13*\n'],
+ svntest.actions.run_and_verify_svn([A_COPY_path + ' - /A:2-13*\n'],
[], 'pg', SVN_PROP_MERGEINFO,
'-R', A_COPY_path)
# Merge all available changes from A to A_COPY at --depth files. Only the
# mergeinfo on A_COPY and its file children should be affected.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# Revisions 2-13 are already merged to A_COPY and now they will be merged
# to A_COPY's file children. Due to the way we drive the merge editor
# r2-3, which are inoperative on A_COPY's file children, do not show up
@@ -7380,15 +7341,14 @@ def merge_away_subtrees_noninheritable_r
' U %s\n' % (A_COPY_path),
' G %s\n' % (mu_COPY_path),
' U %s\n' % (nu_COPY_path),])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'merge', '--depth', 'files',
sbox.repo_url + '/A', A_COPY_path)
expected_output = svntest.verify.UnorderedOutput(
[A_COPY_path + ' - /A:2-13*\n',
mu_COPY_path + ' - /A/mu:2-13\n',
nu_COPY_path + ' - /A/nu:10-13\n',])
- svntest.actions.run_and_verify_svn(None,
- expected_output,
+ svntest.actions.run_and_verify_svn(expected_output,
[], 'pg', SVN_PROP_MERGEINFO,
'-R', A_COPY_path)
@@ -7426,10 +7386,9 @@ def merge_to_sparse_directories(sbox):
wc_disk.tweak('A/mu', contents="New content")
# r8 - Add a prop to A/D and commit.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [],
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [],
'up', wc_dir)
- svntest.actions.run_and_verify_svn(None,
- ["property 'prop:name' set on '" +
+ svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
D_path + "'\n"], [], 'ps',
'prop:name', 'propval', D_path)
expected_output = svntest.wc.State(wc_dir, {
@@ -7441,10 +7400,9 @@ def merge_to_sparse_directories(sbox):
None, wc_dir)
# r9 - Add a prop to A and commit.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(8), [],
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [],
'up', wc_dir)
- svntest.actions.run_and_verify_svn(None,
- ["property 'prop:name' set on '" +
+ svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
A_path + "'\n"], [], 'ps',
'prop:name', 'propval', A_path)
expected_output = svntest.wc.State(wc_dir, {
@@ -7640,9 +7598,9 @@ def merge_to_sparse_directories(sbox):
#
# Revert the previous changes to the immediates WC and update one
# child in that WC to depth infinity.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R',
+ svntest.actions.run_and_verify_svn(None, [], 'revert', '-R',
immediates_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', '--set-depth',
+ svntest.actions.run_and_verify_svn(None, [], 'up', '--set-depth',
'infinity',
os.path.join(immediates_dir, 'D'))
# Now merge r6 into the immediates WC, even though the root of the
@@ -7729,13 +7687,13 @@ def merge_old_and_new_revs_from_renamed_
wc_status, None, wc_dir)
# Move A to A_MOVED
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 4.\n'],
[], 'mv', '-m', 'mv A to A_MOVED',
A_url, A_MOVED_url)
# Update the working copy to get A_MOVED
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Make a modification to A_MOVED/mu
svntest.main.file_write(A_MOVED_mu_path, "This is 'mu' in A_MOVED.\n")
@@ -7900,10 +7858,10 @@ def merge_with_child_having_different_re
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', A_url, A_COPY_url, '-m', 'rev 3')
# Update the working copy to get A_COPY
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_status.add({'A_COPY' : Item(status=' '),
'A_COPY/mu' : Item(status=' '),
'A_COPY/C' : Item(status=' '),
@@ -7929,7 +7887,7 @@ def merge_with_child_having_different_re
expected_status.tweak('A/mu', wc_rev=4)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_status.tweak(wc_rev=4)
tweaked_17th_line = tweaked_7th_line.replace('line17', 'LINE 17')
svntest.main.file_write(mu_path, tweaked_17th_line)
@@ -7952,7 +7910,6 @@ def merge_with_child_having_different_re
expected_status, None, wc_dir)
# Merge r5 to A_COPY/mu
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
['U ' + A_COPY_mu_path + '\n',
' U ' + A_COPY_mu_path + '\n']),
@@ -8024,7 +7981,6 @@ def merge_with_child_having_different_re
None, None, None, None, None, 1)
# Revert r5 and r6 on A_COPY/mu
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[6,5]],
['G ' + A_COPY_mu_path + '\n',
' G ' + A_COPY_mu_path + '\n']),
@@ -8082,7 +8038,6 @@ def merge_with_child_having_different_re
None, None, None, None, None, 1)
#Revert r5 on A_COPY/mu
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[-5]],
['G ' + A_COPY_mu_path + '\n',
' G ' + A_COPY_mu_path + '\n']),
@@ -8138,7 +8093,7 @@ def merge_old_and_new_revs_from_renamed_
mu_MOVED_path = sbox.ospath('A/mu_MOVED')
# Copy mu to mu_COPY
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'],
[], 'cp', '-m', 'cp mu to mu_COPY',
mu_url, mu_COPY_url)
@@ -8152,13 +8107,13 @@ def merge_old_and_new_revs_from_renamed_
expected_status, None, wc_dir)
# Move mu to mu_MOVED
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 4.\n'],
[], 'mv', '-m', 'mv mu to mu_MOVED',
mu_url, mu_MOVED_url)
# Update the working copy to get mu_MOVED
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Make a modification to mu_MOVED
svntest.main.file_write(mu_MOVED_path, "This is 'mu' in mu_MOVED.\n")
@@ -8180,11 +8135,11 @@ def merge_old_and_new_revs_from_renamed_
' U %s\n' % (mu_COPY_path),
'G %s\n' % (mu_COPY_path),
' G %s\n' % (mu_COPY_path),])
- svntest.actions.run_and_verify_svn(None, expected_output,
+ svntest.actions.run_and_verify_svn(expected_output,
[], 'merge', '-r', '1:5',
mu_MOVED_url,
mu_COPY_path)
- svntest.actions.run_and_verify_svn(None, ['/A/mu:2-3\n',
+ svntest.actions.run_and_verify_svn(['/A/mu:2-3\n',
'/A/mu_MOVED:4-5\n'],
[], 'propget', SVN_PROP_MERGEINFO,
mu_COPY_path)
@@ -8208,13 +8163,13 @@ def merge_with_auto_rev_range_detection(
A_COPY_path = sbox.ospath('A_COPY')
# Create B1 inside A
- svntest.actions.run_and_verify_svn(None, ["A " + B1_path + "\n"],
+ svntest.actions.run_and_verify_svn(["A " + B1_path + "\n"],
[], 'mkdir',
B1_path)
# Add a file mu inside B1
svntest.main.file_write(B1_mu_path, "This is the file 'mu'.\n")
- svntest.actions.run_and_verify_svn(None, ["A " + B1_mu_path + "\n"],
+ svntest.actions.run_and_verify_svn(["A " + B1_mu_path + "\n"],
[], 'add', B1_mu_path)
# Commit B1 and B1/mu
@@ -8231,7 +8186,7 @@ def merge_with_auto_rev_range_detection(
expected_status, None, wc_dir)
# Copy A to A_COPY
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 3.\n'],
[], 'cp', '-m', 'cp A to A_COPY',
A_url, A_COPY_url)
@@ -8248,7 +8203,7 @@ def merge_with_auto_rev_range_detection(
expected_status, None, wc_dir)
# Update the working copy to get A_COPY
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Merge /A to /A_COPY
expected_output = wc.State(A_COPY_path, {
@@ -8348,8 +8303,7 @@ def cherry_picking(sbox):
None, None, None, None, None, True)
# Make some prop changes to some dirs.
- svntest.actions.run_and_verify_svn(None,
- ["property 'prop:name' set on '" +
+ svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
G_path + "'\n"], [], 'ps',
'prop:name', 'propval', G_path)
expected_output = svntest.wc.State(wc_dir, {'A/D/G': Item(verb='Sending'),})
@@ -8358,8 +8312,7 @@ def cherry_picking(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
None, wc_dir)
- svntest.actions.run_and_verify_svn(None,
- ["property 'prop:name' set on '" +
+ svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
H_path + "'\n"], [], 'ps',
'prop:name', 'propval', H_path)
expected_output = svntest.wc.State(wc_dir, {'A/D/H': Item(verb='Sending'),})
@@ -8375,7 +8328,6 @@ def cherry_picking(sbox):
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[3,4],[6]],
['U ' + rho_COPY_path + '\n',
' U ' + rho_COPY_path + '\n',
@@ -8387,7 +8339,7 @@ def cherry_picking(sbox):
expected_status = wc.State(rho_COPY_path,
{'' : Item(status='MM', wc_rev=6)})
svntest.actions.run_and_verify_status(rho_COPY_path, expected_status)
- svntest.actions.run_and_verify_svn(None, ["/A/D/G/rho:3-4,6\n"], [],
+ svntest.actions.run_and_verify_svn(["/A/D/G/rho:3-4,6\n"], [],
'propget', SVN_PROP_MERGEINFO,
rho_COPY_path)
@@ -8398,7 +8350,7 @@ def cherry_picking(sbox):
['U ' + omega_COPY_path + '\n',
' U ' + H_COPY_path + '\n',
' G ' + H_COPY_path + '\n',])
[... 2369 lines stripped ...]