import shutil, re, os
import svntest
from svntest import verify, actions, main
Skip = svntest.testcase.Skip_deco
SkipUnless = svntest.testcase.SkipUnless_deco
XFail = svntest.testcase.XFail_deco
Issues = svntest.testcase.Issues_deco
Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
Item = svntest.wc.StateItem
from svntest.main import SVN_PROP_MERGEINFO, server_has_mergeinfo
from externals_tests import change_external
def get_routine_status_state(wc_dir):
"""get the routine status list for WC_DIR at the completion of an
initial call to do_routine_switching()"""
ADH_path = os.path.join(wc_dir, 'A', 'D', 'H')
chi_path = os.path.join(ADH_path, 'chi')
omega_path = os.path.join(ADH_path, 'omega')
psi_path = os.path.join(ADH_path, 'psi')
pi_path = os.path.join(ADH_path, 'pi')
tau_path = os.path.join(ADH_path, 'tau')
rho_path = os.path.join(ADH_path, 'rho')
state = svntest.actions.get_virginal_state(wc_dir, 1)
state.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/F', 'A/B/lambda')
state.add({
'A/B/pi' : Item(status=' ', wc_rev=1),
'A/B/tau' : Item(status=' ', wc_rev=1),
'A/B/rho' : Item(status=' ', wc_rev=1),
})
return state
def get_routine_disk_state(wc_dir):
"""get the routine disk list for WC_DIR at the completion of an
initial call to do_routine_switching()"""
disk = svntest.main.greek_state.copy()
disk.tweak('iota', contents=disk.desc['A/D/gamma'].contents)
disk.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/F', 'A/B/lambda')
disk.add({
'A/B/pi' : Item("This is the file 'pi'.\n"),
'A/B/rho' : Item("This is the file 'rho'.\n"),
'A/B/tau' : Item("This is the file 'tau'.\n"),
})
return disk
def do_routine_switching(wc_dir, repo_url, verify):
"""perform some routine switching of the working copy WC_DIR for
other tests to use. If VERIFY, then do a full verification of the
switching, else don't bother."""
iota_path = os.path.join(wc_dir, 'iota')
gamma_url = repo_url + '/A/D/gamma'
if verify:
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(status='U '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('iota',
contents=expected_disk.desc['A/D/gamma'].contents)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', switched='S')
svntest.actions.run_and_verify_switch(wc_dir, iota_path, gamma_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
else:
svntest.main.run_svn(None, 'switch', '--ignore-ancestry',
gamma_url, iota_path)
AB_path = os.path.join(wc_dir, 'A', 'B')
ADG_url = repo_url + '/A/D/G'
if verify:
expected_output = svntest.wc.State(wc_dir, {
'A/B/E' : Item(status='D '),
'A/B/F' : Item(status='D '),
'A/B/lambda' : Item(status='D '),
'A/B/pi' : Item(status='A '),
'A/B/tau' : Item(status='A '),
'A/B/rho' : Item(status='A '),
})
expected_disk = get_routine_disk_state(wc_dir)
expected_status = get_routine_status_state(wc_dir)
expected_status.tweak('iota', 'A/B', switched='S')
svntest.actions.run_and_verify_switch(wc_dir, AB_path, ADG_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
else:
svntest.main.run_svn(None, 'switch', '--ignore-ancestry',
ADG_url, AB_path)
def commit_routine_switching(wc_dir, verify):
"Commit some stuff in a routinely-switched working copy."
iota_path = os.path.join(wc_dir, 'iota')
Bpi_path = os.path.join(wc_dir, 'A', 'B', 'pi')
Gpi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
Z_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z')
zeta_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z', 'zeta')
svntest.main.file_append(iota_path, "apple")
svntest.main.file_append(Bpi_path, "melon")
svntest.main.file_append(Gpi_path, "banana")
os.mkdir(Z_path)
svntest.main.file_append(zeta_path, "This is the file 'zeta'.\n")
svntest.main.run_svn(None, 'add', Z_path)
svntest.actions.run_and_verify_commit(
wc_dir, None, None,
"svn: E195003: Cannot commit both .* as they refer to the same URL$",
wc_dir)
svntest.main.run_svn(None, 'revert', Gpi_path)
expected_output = svntest.wc.State(wc_dir, {
'A/D/G/Z' : Item(verb='Adding'),
'A/D/G/Z/zeta' : Item(verb='Adding'),
'iota' : Item(verb='Sending'),
'A/B/pi' : Item(verb='Sending'),
})
expected_status = get_routine_status_state(wc_dir)
expected_status.tweak('iota', 'A/B', switched='S')
expected_status.tweak('iota', 'A/B/pi', wc_rev=2, status=' ')
expected_status.add({
'A/D/G/Z' : Item(status=' ', wc_rev=2),
'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2),
})
if verify:
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
None, wc_dir)
else:
svntest.main.run_svn(None,
'ci', '-m', 'log msg', wc_dir)
def routine_switching(sbox):
"test some basic switching operations"
sbox.build(read_only = True)
do_routine_switching(sbox.wc_dir, sbox.repo_url, 1)
def commit_switched_things(sbox):
"commits after some basic switching operations"
sbox.build()
wc_dir = sbox.wc_dir
do_routine_switching(wc_dir, sbox.repo_url, 0)
commit_routine_switching(wc_dir, 1)
def full_update(sbox):
"update wc that contains switched things"
sbox.build()
wc_dir = sbox.wc_dir
do_routine_switching(wc_dir, sbox.repo_url, 0)
wc_backup = sbox.add_wc_path('backup')
svntest.actions.duplicate_dir(wc_dir, wc_backup)
commit_routine_switching(wc_backup, 0)
iota_path = os.path.join(wc_dir, 'iota')
gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
Bpi_path = os.path.join(wc_dir, 'A', 'B', 'pi')
BZ_path = os.path.join(wc_dir, 'A', 'B', 'Z')
Bzeta_path = os.path.join(wc_dir, 'A', 'B', 'Z', 'zeta')
Gpi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
GZ_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z')
Gzeta_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z', 'zeta')
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(status='U '),
'A/D/gamma' : Item(status='U '),
'A/B/pi' : Item(status='U '),
'A/B/Z' : Item(status='A '),
'A/B/Z/zeta' : Item(status='A '),
'A/D/G/pi' : Item(status='U '),
'A/D/G/Z' : Item(status='A '),
'A/D/G/Z/zeta' : Item(status='A '),
})
expected_disk = get_routine_disk_state(wc_dir)
expected_disk.tweak('iota', contents="This is the file 'gamma'.\napple")
expected_disk.tweak('A/D/gamma', contents="This is the file 'gamma'.\napple")
expected_disk.tweak('A/B/pi', contents="This is the file 'pi'.\nmelon")
expected_disk.tweak('A/D/G/pi', contents="This is the file 'pi'.\nmelon")
expected_disk.add({
'A/B/Z' : Item(),
'A/B/Z/zeta' : Item(contents="This is the file 'zeta'.\n"),
'A/D/G/Z' : Item(),
'A/D/G/Z/zeta' : Item(contents="This is the file 'zeta'.\n"),
})
expected_status = get_routine_status_state(wc_dir)
expected_status.tweak(wc_rev=2)
expected_status.add({
'A/D/G/Z' : Item(status=' ', wc_rev=2),
'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2),
'A/B/Z' : Item(status=' ', wc_rev=2),
'A/B/Z/zeta' : Item(status=' ', wc_rev=2),
})
expected_status.tweak('iota', 'A/B', switched='S')
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status)
def full_rev_update(sbox):
"reverse update wc that contains switched things"
sbox.build()
wc_dir = sbox.wc_dir
do_routine_switching(wc_dir, sbox.repo_url, 0)
commit_routine_switching(wc_dir, 0)
svntest.main.run_svn(None, 'up', wc_dir)
iota_path = os.path.join(wc_dir, 'iota')
gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
Bpi_path = os.path.join(wc_dir, 'A', 'B', 'pi')
BZ_path = os.path.join(wc_dir, 'A', 'B', 'Z')
Gpi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
GZ_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z')
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(status='U '),
'A/D/gamma' : Item(status='U '),
'A/B/pi' : Item(status='U '),
'A/B/Z' : Item(status='D '),
'A/D/G/pi' : Item(status='U '),
'A/D/G/Z' : Item(status='D '),
})
expected_disk = get_routine_disk_state(wc_dir)
expected_status = get_routine_status_state(wc_dir)
expected_status.tweak('iota', 'A/B', switched='S')
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
None, None, None,
None, None, 1,
'-r', '1', wc_dir)
def update_switched_things(sbox):
"update switched wc things to HEAD"
sbox.build()
wc_dir = sbox.wc_dir
do_routine_switching(wc_dir, sbox.repo_url, 0)
wc_backup = sbox.add_wc_path('backup')
svntest.actions.duplicate_dir(wc_dir, wc_backup)
commit_routine_switching(wc_backup, 0)
iota_path = os.path.join(wc_dir, 'iota')
B_path = os.path.join(wc_dir, 'A', 'B')
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(status='U '),
'A/B/pi' : Item(status='U '),
'A/B/Z' : Item(status='A '),
'A/B/Z/zeta' : Item(status='A '),
})
expected_disk = get_routine_disk_state(wc_dir)
expected_disk.tweak('iota', contents="This is the file 'gamma'.\napple")
expected_disk.tweak('A/B/pi', contents="This is the file 'pi'.\nmelon")
expected_disk.add({
'A/B/Z' : Item(),
'A/B/Z/zeta' : Item("This is the file 'zeta'.\n"),
})
expected_status = get_routine_status_state(wc_dir)
expected_status.tweak('iota', 'A/B', switched='S')
expected_status.tweak('A/B', 'A/B/pi', 'A/B/rho', 'A/B/tau', 'iota',
wc_rev=2)
expected_status.add({
'A/B/Z' : Item(status=' ', wc_rev=2),
'A/B/Z/zeta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
None, None, None,
None, None, 0,
B_path,
iota_path)
def rev_update_switched_things(sbox):
"reverse update switched wc things to an older rev"
sbox.build()
wc_dir = sbox.wc_dir
do_routine_switching(wc_dir, sbox.repo_url, 0)
commit_routine_switching(wc_dir, 0)
iota_path = os.path.join(wc_dir, 'iota')
B_path = os.path.join(wc_dir, 'A', 'B')
svntest.main.run_svn(None, 'up', wc_dir)
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(status='U '),
'A/B/pi' : Item(status='U '),
'A/B/Z' : Item(status='D '),
})
expected_disk = get_routine_disk_state(wc_dir)
expected_disk.tweak('A/D/gamma', contents="This is the file 'gamma'.\napple")
expected_disk.tweak('A/D/G/pi', contents="This is the file 'pi'.\nmelon")
expected_disk.add({
'A/D/G/Z' : Item(),
'A/D/G/Z/zeta' : Item("This is the file 'zeta'.\n"),
})
expected_status = get_routine_status_state(wc_dir)
expected_status.tweak(wc_rev=2)
expected_status.tweak('iota', 'A/B', switched='S')
expected_status.tweak('A/B', 'A/B/pi', 'A/B/rho', 'A/B/tau', 'iota',
wc_rev=1)
expected_status.add({
'A/D/G/Z' : Item(status=' ', wc_rev=2),
'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
None, None, None,
None, None, 1,
'-r', '1',
B_path,
iota_path)
def log_switched_file(sbox):
"show logs for a switched file"
sbox.build()
wc_dir = sbox.wc_dir
do_routine_switching(wc_dir, sbox.repo_url, 0)
iota_path = os.path.join(wc_dir, 'iota')
svntest.main.run_svn(None, 'ps', 'x', 'x', iota_path)
svntest.main.run_svn(None,
'ci', '-m',
'set prop on switched iota',
iota_path)
exit_code, output, error = svntest.main.run_svn(None, 'log', iota_path)
for line in output:
if line.find("set prop on switched iota") != -1:
break
else:
raise svntest.Failure
def delete_subdir(sbox):
"switch that deletes a sub-directory"
sbox.build()
wc_dir = sbox.wc_dir
A_path = os.path.join(wc_dir, 'A')
A_url = sbox.repo_url + '/A'
A2_url = sbox.repo_url + '/A2'
A2_B_F_url = sbox.repo_url + '/A2/B/F'
svntest.actions.run_and_verify_svn(None,
['\n', 'Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
svntest.actions.run_and_verify_svn(None,
['\n', 'Committed revision 3.\n'], [],
'rm', '-m', 'delete subdir', A2_B_F_url)
expected_output = svntest.wc.State(wc_dir, {
'A/B/F' : Item(status='D '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/B/F')
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak('A', switched='S')
expected_status.remove('A/B/F')
expected_status.tweak('', 'iota', wc_rev=1)
svntest.actions.run_and_verify_switch(wc_dir, A_path, A2_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
@XFail()
@Issue(1532)
def file_dir_file(sbox):
"switch a file to a dir and back to the file"
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
file_path = os.path.join(wc_dir, 'iota')
file_url = sbox.repo_url + '/iota'
dir_url = sbox.repo_url + '/A/C'
svntest.actions.run_and_verify_svn(None, None, [], 'switch',
'--ignore-ancestry', dir_url, file_path)
if not os.path.isdir(file_path):
raise svntest.Failure
svntest.actions.run_and_verify_svn(None, None, [], 'switch',
'--ignore-ancestry', file_url, file_path)
if not os.path.isfile(file_path):
raise svntest.Failure
def nonrecursive_switching(sbox):
"non-recursive switch"
sbox.build()
wc1_dir = sbox.wc_dir
wc2_dir = os.path.join(wc1_dir, 'wc2')
trunk_url = sbox.repo_url + '/A'
branch_url = sbox.repo_url + '/branch'
version1_url = branch_url + '/version1'
wc1_new_file = os.path.join(wc1_dir, 'branch', 'version1', 'newfile')
wc2_new_file = os.path.join(wc2_dir, 'newfile')
wc2_mu_file = os.path.join(wc2_dir, 'mu')
wc2_B_dir = os.path.join(wc2_dir, 'B')
wc2_C_dir = os.path.join(wc2_dir, 'C')
wc2_D_dir = os.path.join(wc2_dir, 'D')
svntest.main.run_svn(None, 'co', trunk_url, wc2_dir)
svntest.main.run_svn(None,
'mkdir', '-m', '', branch_url)
svntest.main.run_svn(None,
'cp', '-m', '', trunk_url, version1_url)
svntest.main.run_svn(None,
'up', wc1_dir)
svntest.main.file_append(wc1_new_file, "This is the file 'newfile'.\n")
svntest.main.run_svn(None, 'add', wc1_new_file)
svntest.main.run_svn(None, 'ci', '-m', '', wc1_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'switch', '-N',
'--ignore-ancestry', version1_url, wc2_dir)
expected_infos = [
{ 'URL' : '.*/A/B$' },
{ 'URL' : '.*/A/C$' },
{ 'URL' : '.*/A/D$' },
]
svntest.actions.run_and_verify_info(expected_infos,
wc2_B_dir, wc2_C_dir, wc2_D_dir)
expected_infos = [
{ 'URL' : '.*/branch/version1/mu$' },
{ 'URL' : '.*/branch/version1/newfile$' }, ]
svntest.actions.run_and_verify_info(expected_infos,
wc2_mu_file, wc2_new_file)
def failed_anchor_is_target(sbox):
"anchor=target, try to replace a local-mod file"
sbox.build()
wc_dir = sbox.wc_dir
G_url = sbox.repo_url + '/A/D/G'
G_psi_url = G_url + '/psi'
svntest.actions.run_and_verify_svn(None,
['\n', 'Committed revision 2.\n'], [],
'mkdir', '-m', 'log msg', G_psi_url)
H_path = os.path.join(wc_dir, 'A', 'D', 'H')
psi_path = os.path.join(H_path, 'psi')
svntest.main.file_append(psi_path, "more text")
svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
'switch', '--ignore-ancestry',
G_url, H_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/H', switched='S', wc_rev=2)
expected_status.tweak('A/D/H/psi', status='R ', copied='+',
wc_rev='-', treeconflict='C')
expected_status.remove('A/D/H/chi', 'A/D/H/omega')
expected_status.add({
'A/D/H/pi' : Item(status=' ', wc_rev=2),
'A/D/H/tau' : Item(status=' ', wc_rev=2),
'A/D/H/rho' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
expected_infos = [
{ 'URL' : '.*' + G_url + '$' },
]
svntest.actions.run_and_verify_info(expected_infos, H_path)
svntest.actions.run_and_verify_resolved([psi_path])
expected_status.tweak('A/D/H/psi', treeconflict=None)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
def bad_intermediate_urls(sbox):
"bad intermediate urls in use"
sbox.build()
wc_dir = sbox.wc_dir
url = sbox.repo_url
A = os.path.join(wc_dir, 'A')
A_Z = os.path.join(wc_dir, 'A', 'Z')
url_A_C = url + '/A/C'
url_A_C_A = url + '/A/C/A'
url_A_C_A_Z = url + '/A/C/A/Z'
svntest.actions.run_and_verify_svn(None,
['\n', 'Committed revision 2.\n'], [],
'mkdir', '-m', 'log msg',
url_A_C_A, url_A_C_A_Z)
svntest.main.file_append(A_Z, 'Look, Mom, a ... tree conflict.')
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(status='D '),
'A/Z' : Item(status=' ', treeconflict='C'),
'A/C' : Item(status='D '),
'A/B' : Item(status='D '),
'A/D' : Item(status='D '),
'iota' : Item(status='D '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('iota', 'A/B', 'A/B/E', 'A/B/E/beta', 'A/B/E/alpha',
'A/B/F', 'A/B/lambda', 'A/D', 'A/D/G', 'A/D/G/rho', 'A/D/G/pi',
'A/D/G/tau', 'A/D/H', 'A/D/H/psi', 'A/D/H/omega', 'A/D/H/chi',
'A/D/gamma', 'A/mu', 'A/C')
expected_disk.add({
'A/Z' : Item(contents="Look, Mom, a ... tree conflict."),
})
expected_status = actions.get_virginal_state(wc_dir, 2)
expected_status.remove('iota', 'A/B', 'A/B/E', 'A/B/E/beta', 'A/B/E/alpha',
'A/B/F', 'A/B/lambda', 'A/D', 'A/D/G', 'A/D/G/rho', 'A/D/G/pi',
'A/D/G/tau', 'A/D/H', 'A/D/H/psi', 'A/D/H/omega', 'A/D/H/chi',
'A/D/gamma', 'A/mu', 'A/C')
expected_status.add({
'A/Z' : Item(status='D ', treeconflict='C', wc_rev=2),
})
actions.run_and_verify_switch(wc_dir, wc_dir, url_A_C, expected_output,
expected_disk, expected_status, None, None,
None, None, None, False, '--ignore-ancestry')
expected_infos = [
{ 'URL' : '.*/A/C/A$' },
]
svntest.actions.run_and_verify_info(expected_infos, A)
os.remove(A_Z)
svntest.main.run_svn(None, 'revert', A_Z)
expected_output = svntest.wc.State(wc_dir, {
})
expected_disk.tweak('A/Z', contents=None)
expected_status.tweak(status=' ', wc_rev='2')
expected_status.tweak('A/Z', treeconflict=None)
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status, None, None, None, None, None, False, wc_dir)
@Issue(1825)
def obstructed_switch(sbox):
"obstructed switch"
sbox.build()
wc_dir = sbox.wc_dir
url = sbox.repo_url
A_B_E = os.path.join(wc_dir, 'A', 'B', 'E')
A_B_E_alpha = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
url_A_B_E = url + '/A/B/E'
url_A_B_Esave = url + '/A/B/Esave'
expected_stdout = verify.UnorderedOutput([
'\n',
'Committed revision 2.\n',
])
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', '-m',
'msgcopy', url_A_B_E, url_A_B_Esave)
expected_stdout = ['D ' + A_B_E_alpha + '\n']
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'rm',
A_B_E_alpha)
expected_output = svntest.wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Deleting'),
})
expected_status = actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E/alpha')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
None, wc_dir)
main.file_append(A_B_E_alpha, 'hello')
expected_output = svntest.wc.State(wc_dir, {
'A/B/E/alpha' : Item(status=' ', treeconflict='C'),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('A/B/E/alpha', contents='hello')
expected_status.add({
'A/B/E/alpha' : Item(status='D ', treeconflict='C', wc_rev=3),
})
expected_status.tweak('A/B/E', wc_rev='3', switched='S')
expected_status.tweak('A/B/E/beta', wc_rev='3')
actions.run_and_verify_switch(wc_dir, A_B_E, url_A_B_Esave,
expected_output, expected_disk,
expected_status, None, None, None, None,
None, False, '--ignore-ancestry')
expected_status.add({
'A/B/Esave' : Item(status=' '),
'A/B/Esave/beta' : Item(status=' '),
'A/B/Esave/alpha' : Item(status=' '),
})
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
expected_stdout = verify.RegexOutput(
".*local unversioned, incoming add upon switch",
match_all=False)
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'info',
A_B_E_alpha)
def commit_mods_below_switch(sbox):
"commit with mods below switch"
sbox.build()
wc_dir = sbox.wc_dir
C_path = os.path.join(wc_dir, 'A', 'C')
B_url = sbox.repo_url + '/A/B'
expected_output = svntest.wc.State(wc_dir, {
'A/C/E' : Item(status='A '),
'A/C/E/alpha' : Item(status='A '),
'A/C/E/beta' : Item(status='A '),
'A/C/F' : Item(status='A '),
'A/C/lambda' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/C/E' : Item(),
'A/C/E/alpha' : Item(contents="This is the file 'alpha'.\n"),
'A/C/E/beta' : Item(contents="This is the file 'beta'.\n"),
'A/C/F' : Item(),
'A/C/lambda' : Item(contents="This is the file 'lambda'.\n"),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/C', switched='S')
expected_status.add({
'A/C/E' : Item(status=' ', wc_rev=1),
'A/C/E/alpha' : Item(status=' ', wc_rev=1),
'A/C/E/beta' : Item(status=' ', wc_rev=1),
'A/C/F' : Item(status=' ', wc_rev=1),
'A/C/lambda' : Item(status=' ', wc_rev=1),
})
svntest.actions.run_and_verify_switch(wc_dir, C_path, B_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
D_path = os.path.join(wc_dir, 'A', 'D')
svntest.actions.run_and_verify_svn(None, None, [],
'propset', 'x', 'x', C_path, D_path)
expected_status.tweak('A/C', 'A/D', status=' M')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
expected_output = svntest.wc.State(wc_dir, {
'A/C' : Item(verb='Sending'),
'A/D' : Item(verb='Sending'),
})
expected_status.tweak('A/C', 'A/D', status=' ', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, C_path, D_path)
def refresh_read_only_attribute(sbox):
"refresh the WC file system read-only attribute "
if os.name == 'posix':
if os.geteuid() == 0:
raise svntest.Skip
sbox.build()
wc_dir = sbox.wc_dir
url = sbox.repo_url + '/A'
branch_url = sbox.repo_url + '/A-branch'
svntest.actions.run_and_verify_svn(None,
['\n', 'Committed revision 2.\n'], [],
'cp', '-m', 'svn:needs-lock not set',
url, branch_url)
A_path = os.path.join(wc_dir, 'A')
mu_path = os.path.join(A_path, 'mu')
svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'svn:needs-lock', '1', mu_path)
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
None, mu_path)
if os.access(mu_path, os.W_OK):
raise svntest.Failure("'%s' expected to be read-only after having had "
"its svn:needs-lock property set" % mu_path)
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(status=' U'),
})
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak('', wc_rev=1)
expected_status.tweak('iota', wc_rev=1)
expected_status.tweak('A', switched='S')
svntest.actions.run_and_verify_switch(wc_dir, A_path, branch_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
if not os.access(mu_path, os.W_OK):
raise svntest.Failure("'%s' expected to be writable after being switched "
"to a branch on which its svn:needs-lock property "
"is not set" % mu_path)
def switch_change_repos_root(sbox):
"switch shouldn't allow changing repos root"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
other_repo_url = repo_url
while other_repo_url[-1] == '/':
other_repos_url = other_repo_url[:-1]
other_repo_url = other_repo_url + "_bogus"
other_A_url = other_repo_url + "/A"
A_wc_dir = os.path.join(wc_dir, "A")
expected_err = ".*Unable to open repository.*|.*Could not open.*|"\
".*No repository found.*"
svntest.actions.run_and_verify_svn(None, None,
expected_err,
'switch', '--ignore-ancestry',
other_A_url, A_wc_dir)
other_repo_dir, other_repo_url = sbox.add_repo_path('other')
other_A_url = other_repo_url + "/A"
svntest.main.create_repos(other_repo_dir)
svntest.actions.run_and_verify_svn(None, None,
".*UUID.*",
'switch', '--ignore-ancestry',
other_A_url, A_wc_dir)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
def forced_switch(sbox):
"forced switch tolerates obstructions to adds"
sbox.build(read_only = True)
G_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'G')
os.mkdir(G_path)
shutil.copyfile(os.path.join(sbox.wc_dir, 'A', 'D', 'gamma'),
os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'gamma'))
shutil.copyfile(os.path.join(sbox.wc_dir, 'A', 'D', 'G', 'tau'),
os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'G', 'tau'))
pi_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'G', 'pi')
svntest.main.file_write(pi_path,
"This is the OBSTRUCTING file 'pi'.\n")
I_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'I')
os.mkdir(I_path)
upsilon_path = os.path.join(G_path, 'upsilon')
svntest.main.file_write(upsilon_path,
"This is the unversioned file 'upsilon'.\n")
expected_output = svntest.wc.State(sbox.wc_dir, {
"A/B/F/gamma" : Item(status='E '),
"A/B/F/G" : Item(status='E '),
"A/B/F/G/pi" : Item(status='E '),
"A/B/F/G/rho" : Item(status='A '),
"A/B/F/G/tau" : Item(status='E '),
"A/B/F/H" : Item(status='A '),
"A/B/F/H/chi" : Item(status='A '),
"A/B/F/H/omega" : Item(status='A '),
"A/B/F/H/psi" : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
"A/B/F/gamma" : Item("This is the file 'gamma'.\n"),
"A/B/F/G" : Item(),
"A/B/F/G/pi" : Item("This is the OBSTRUCTING file 'pi'.\n"),
"A/B/F/G/rho" : Item("This is the file 'rho'.\n"),
"A/B/F/G/tau" : Item("This is the file 'tau'.\n"),
"A/B/F/G/upsilon" : Item("This is the unversioned file 'upsilon'.\n"),
"A/B/F/H" : Item(),
"A/B/F/H/chi" : Item("This is the file 'chi'.\n"),
"A/B/F/H/omega" : Item("This is the file 'omega'.\n"),
"A/B/F/H/psi" : Item("This is the file 'psi'.\n"),
"A/B/F/I" : Item(),
})
expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
expected_status.tweak('A/B/F', switched='S')
expected_status.add({
"A/B/F/gamma" : Item(status=' ', wc_rev=1),
"A/B/F/G" : Item(status=' ', wc_rev=1),
"A/B/F/G/pi" : Item(status='M ', wc_rev=1),
"A/B/F/G/rho" : Item(status=' ', wc_rev=1),
"A/B/F/G/tau" : Item(status=' ', wc_rev=1),
"A/B/F/H" : Item(status=' ', wc_rev=1),
"A/B/F/H/chi" : Item(status=' ', wc_rev=1),
"A/B/F/H/omega" : Item(status=' ', wc_rev=1),
"A/B/F/H/psi" : Item(status=' ', wc_rev=1),
})
F_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F')
AD_url = sbox.repo_url + '/A/D'
svntest.actions.run_and_verify_switch(sbox.wc_dir, F_path, AD_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--force', '--ignore-ancestry')
def forced_switch_failures(sbox):
"forced switch detects tree conflicts"
sbox.build()
wc_dir = sbox.wc_dir
url = sbox.repo_url
A_B_F = os.path.join(wc_dir, 'A', 'B', 'F')
A_B_F_pi = os.path.join(wc_dir, 'A', 'B', 'F', 'pi')
A_C = os.path.join(wc_dir, 'A', 'C')
A_C_H = os.path.join(wc_dir, 'A', 'C', 'H')
A_D_G = os.path.join(wc_dir, 'A', 'D', 'G')
A_D_G_I = os.path.join(wc_dir, 'A', 'D', 'G', 'I')
url_A_D = url + '/A/D'
url_A_D_G = url + '/A/D/G'
url_A_D_H = url + '/A/D/H'
url_A_D_H_I = url + '/A/D/H/I'
os.makedirs(A_B_F_pi)
main.file_write(A_C_H, "The file 'H'\n")
expected_output = svntest.wc.State(wc_dir, {
'A/C/G' : Item(status='A '),
'A/C/G/pi' : Item(status='A '),
'A/C/G/rho' : Item(status='A '),
'A/C/G/tau' : Item(status='A '),
'A/C/gamma' : Item(status='A '),
'A/C/H' : Item(status=' ', treeconflict='C'),
'A/C/H/psi' : Item(status=' ', treeconflict='A'),
'A/C/H/omega' : Item(status=' ', treeconflict='A'),
'A/C/H/chi' : Item(status=' ', treeconflict='A'),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/C/gamma' : Item(contents="This is the file 'gamma'.\n"),
'A/C/G' : Item(),
'A/C/G/pi' : Item(contents="This is the file 'pi'.\n"),
'A/C/G/rho' : Item(contents="This is the file 'rho'.\n"),
'A/C/G/tau' : Item(contents="This is the file 'tau'.\n"),
'A/C/H' : Item(contents="The file 'H'\n"),
'A/B/F/pi' : Item(),
})
expected_status = actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/C/G' : Item(status=' ', wc_rev='1'),
'A/C/G/rho' : Item(status=' ', wc_rev='1'),
'A/C/G/tau' : Item(status=' ', wc_rev='1'),
'A/C/G/pi' : Item(status=' ', wc_rev='1'),
'A/C/H' : Item(status='D ', treeconflict='C', wc_rev='1'),
'A/C/H/psi' : Item(status='D ', wc_rev='1'),
'A/C/H/omega' : Item(status='D ', wc_rev='1'),
'A/C/H/chi' : Item(status='D ', wc_rev='1'),
'A/C/gamma' : Item(status=' ', wc_rev='1'),
})
expected_status.tweak('A/C', switched='S')
actions.run_and_verify_switch(wc_dir, A_C, url_A_D, expected_output,
expected_disk, expected_status, None, None,
None, None, None, False, '--force',
'--ignore-ancestry')
expected_output = svntest.wc.State(wc_dir, {
'A/B/F/rho' : Item(status='A '),
'A/B/F/pi' : Item(status=' ', treeconflict='C'),
'A/B/F/tau' : Item(status='A '),
})
expected_disk.add({
'A/B/F/rho' : Item(contents="This is the file 'rho'.\n"),
'A/B/F/tau' : Item(contents="This is the file 'tau'.\n"),
})
expected_status.add({
'A/B/F/tau' : Item(status=' ', wc_rev='1'),
'A/B/F/pi' : Item(status='D ', treeconflict='C', wc_rev='1'),
'A/B/F/rho' : Item(status=' ', wc_rev='1'),
})
expected_status.tweak('A/B/F', switched='S')
actions.run_and_verify_switch(wc_dir, A_B_F, url_A_D_G, expected_output,
expected_disk, expected_status, None, None,
None, None, None, False, '--force',
'--ignore-ancestry')
expected_stdout = verify.ExpectedOutput(
'Tree conflict: local unversioned, incoming add upon switch\n',
match_all=False)
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'info',
A_B_F_pi)
expected_stdout = verify.UnorderedOutput([
'\n',
'Committed revision 2.\n',
])
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
'-m', 'Log message', url_A_D_H_I)
os.makedirs(A_D_G_I)
expected_output = svntest.wc.State(wc_dir, {})
expected_disk.add({
'A/D/G/I' : Item(),
})
exit_code, so, se = svntest.actions.run_and_verify_svn(
"Unexpected error during co",
['Checked out revision 2.\n'], [],
"co", url_A_D_H_I, A_D_G_I)
expected_output = svntest.wc.State(wc_dir, {
'A/D/G/chi' : Item(status='A '),
'A/D/G/tau' : Item(status='D '),
'A/D/G/omega' : Item(status='A '),
'A/D/G/psi' : Item(status='A '),
'A/D/G/I' : Item(verb='Skipped'),
'A/D/G/rho' : Item(status='D '),
'A/D/G/pi' : Item(status='D '),
})
actions.run_and_verify_switch(wc_dir, A_D_G, url_A_D_H, expected_output,
None, None, None,
None, None, None, None,
False, '--force', '--ignore-ancestry')
main.safe_rmtree(A_D_G_I)
main.safe_rmtree(A_B_F_pi)
os.remove(A_C_H)
svntest.main.run_svn(None, 'resolved', A_C_H)
svntest.main.run_svn(None, 'revert', A_B_F_pi)
expected_output = svntest.wc.State(wc_dir, {
'A/C/H/I' : Item(status='A '),
'A/D/G/I' : Item(status='A '),
'A/D/H/I' : Item(status='A '),
})
expected_disk.remove('A/D/G/tau', 'A/D/G/rho', 'A/D/G/pi')
expected_disk.add({
'A/D/H/I' : Item(),
'A/D/G/omega' : Item(contents="This is the file 'omega'.\n"),
'A/D/G/psi' : Item(contents="This is the file 'psi'.\n"),
'A/D/G/chi' : Item(contents="This is the file 'chi'.\n"),
'A/C/H/I' : Item(),
'A/C/H/omega' : Item(contents="This is the file 'omega'.\n"),
'A/C/H/psi' : Item(contents="This is the file 'psi'.\n"),
'A/C/H/chi' : Item(contents="This is the file 'chi'.\n"),
})
expected_disk.tweak('A/C/H', contents=None)
expected_disk.tweak('A/B/F/pi', contents="This is the file 'pi'.\n")
expected_status.remove('A/D/G/tau', 'A/D/G/rho', 'A/D/G/pi')
expected_status.add({
'A/D/G/omega' : Item(status=' ', wc_rev='2'),
'A/D/G/I' : Item(status=' ', wc_rev='2'),
'A/D/G/psi' : Item(status=' ', wc_rev='2'),
'A/D/G/chi' : Item(status=' ', wc_rev='2'),
'A/D/H/I' : Item(status=' ', wc_rev='2'),
'A/C/H/psi' : Item(status=' ', wc_rev='2'),
'A/C/H/omega' : Item(status=' ', wc_rev='2'),
'A/C/H/chi' : Item(status=' ', wc_rev='2'),
'A/C/H/I' : Item(status=' ', wc_rev='2'),
})
expected_status.tweak(wc_rev='2', status=' ')
expected_status.tweak('A/B/F/pi', 'A/C/H', treeconflict=None)
expected_status.tweak('A/D/G', switched='S')
svntest.main.run_svn(None, 'revert', '-R', os.path.join(wc_dir, 'A/C/H'))
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status, None, None, None, None, None, False, wc_dir)
def switch_with_obstructing_local_adds(sbox):
"switch tolerates WC adds"
sbox.build(read_only = True)
G_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'G')
os.mkdir(G_path)
gamma_copy_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'gamma')
shutil.copyfile(os.path.join(sbox.wc_dir, 'A', 'D', 'gamma'),
gamma_copy_path)
shutil.copyfile(os.path.join(sbox.wc_dir, 'A', 'D', 'G', 'tau'),
os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'G', 'tau'))
pi_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'G', 'pi')
svntest.main.file_write(pi_path,
"This is the OBSTRUCTING file 'pi'.\n")
I_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F', 'I')
os.mkdir(I_path)
upsilon_path = os.path.join(G_path, 'upsilon')
svntest.main.file_write(upsilon_path,
"This is the unversioned file 'upsilon'.\n")
svntest.actions.run_and_verify_svn("Add error:", None, [],
'add', G_path, I_path,
gamma_copy_path)
expected_output = svntest.wc.State(sbox.wc_dir, {
"A/B/F/gamma" : Item(status=' ', treeconflict='C'),
"A/B/F/G" : Item(status=' ', treeconflict='C'),
'A/B/F/G/tau' : Item(status=' ', treeconflict='A'),
'A/B/F/G/rho' : Item(status=' ', treeconflict='A'),
'A/B/F/G/pi' : Item(status=' ', treeconflict='A'),
"A/B/F/H" : Item(status='A '),
"A/B/F/H/chi" : Item(status='A '),
"A/B/F/H/omega" : Item(status='A '),
"A/B/F/H/psi" : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
"A/B/F/gamma" : Item("This is the file 'gamma'.\n"),
"A/B/F/G" : Item(),
"A/B/F/G/pi" : Item("This is the OBSTRUCTING file 'pi'.\n"),
"A/B/F/G/tau" : Item("This is the file 'tau'.\n"),
"A/B/F/G/upsilon" : Item("This is the unversioned file 'upsilon'.\n"),
"A/B/F/H" : Item(),
"A/B/F/H/chi" : Item("This is the file 'chi'.\n"),
"A/B/F/H/omega" : Item("This is the file 'omega'.\n"),
"A/B/F/H/psi" : Item("This is the file 'psi'.\n"),
"A/B/F/I" : Item(),
})
expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
expected_status.tweak('A/B/F', switched='S')
expected_status.add({
'A/B/F/gamma' : Item(status='R ', treeconflict='C', wc_rev='1'),
'A/B/F/G' : Item(status='R ', treeconflict='C', wc_rev='1'),
'A/B/F/G/pi' : Item(status='A ', wc_rev='-'),
'A/B/F/G/tau' : Item(status='A ', wc_rev='-'),
'A/B/F/G/upsilon' : Item(status='A ', wc_rev='-'),
'A/B/F/G/rho' : Item(status='D ', wc_rev='1'),
'A/B/F/H' : Item(status=' ', wc_rev='1'),
'A/B/F/H/chi' : Item(status=' ', wc_rev='1'),
'A/B/F/H/omega' : Item(status=' ', wc_rev='1'),
'A/B/F/H/psi' : Item(status=' ', wc_rev='1'),
'A/B/F/I' : Item(status='A ', wc_rev='-'),
})
extra_files = ['pi\.r0', 'pi\.r1', 'pi\.mine']
F_path = os.path.join(sbox.wc_dir, 'A', 'B', 'F')
D_url = sbox.repo_url + '/A/D'
svntest.actions.run_and_verify_switch(sbox.wc_dir, F_path, D_url,
expected_output,
expected_disk,
expected_status,
None,
svntest.tree.detect_conflict_files,
extra_files, None, None, False,
'--ignore-ancestry')
def switch_scheduled_add(sbox):
"switch a scheduled-add file"
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
file_path = os.path.join(wc_dir, 'stub_file')
switch_url = sbox.repo_url + '/iota'
nodo_path = os.path.join(wc_dir, 'nodo')
svntest.main.file_append(file_path, "")
svntest.actions.run_and_verify_svn(None, None, [],
'add', file_path)
svntest.actions.run_and_verify_svn(None, None,
"svn: E200007: Cannot switch '.*file' " +
"because it is not in the repository yet",
'switch', '--ignore-ancestry',
switch_url, file_path)
svntest.actions.run_and_verify_svn(None, None,
"svn: E155010: The node '.*nodo' was not",
'switch', '--ignore-ancestry',
switch_url, nodo_path)
@SkipUnless(server_has_mergeinfo)
def mergeinfo_switch_elision(sbox):
"mergeinfo does not elide post switch"
sbox.build()
wc_dir = sbox.wc_dir
lambda_path = os.path.join(wc_dir, "A", "B_COPY_1", "lambda")
B_COPY_1_path = os.path.join(wc_dir, "A", "B_COPY_1")
B_COPY_2_path = os.path.join(wc_dir, "A", "B_COPY_2")
E_COPY_2_path = os.path.join(wc_dir, "A", "B_COPY_2", "E")
alpha_path = os.path.join(wc_dir, "A", "B", "E", "alpha")
beta_path = os.path.join(wc_dir, "A", "B", "E", "beta")
expected_stdout = verify.UnorderedOutput([
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "lambda") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "E") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "E", "alpha") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "E", "beta") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "F") + "\n",
"Checked out revision 1.\n",
"A " + B_COPY_1_path + "\n",
])
svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
sbox.repo_url + "/A/B", B_COPY_1_path)
expected_stdout = verify.UnorderedOutput([
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "lambda") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "E") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "E", "alpha") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "E", "beta") + "\n",
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "F") + "\n",
"Checked out revision 1.\n",
"A " + B_COPY_2_path + "\n",
])
svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
sbox.repo_url + "/A/B", B_COPY_2_path)
expected_output = svntest.wc.State(wc_dir, {
'A/B_COPY_1' : Item(verb='Adding'),
'A/B_COPY_2' : Item(verb='Adding')
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
"A/B_COPY_1" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/lambda" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/E" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/E/alpha" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/E/beta" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/F" : Item(status=' ', wc_rev=2),
"A/B_COPY_2" : Item(status=' ', wc_rev=2),
"A/B_COPY_2/lambda" : Item(status=' ', wc_rev=2),
"A/B_COPY_2/E" : Item(status=' ', wc_rev=2),
"A/B_COPY_2/E/alpha" : Item(status=' ', wc_rev=2),
"A/B_COPY_2/E/beta" : Item(status=' ', wc_rev=2),
"A/B_COPY_2/F" : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
None,
wc_dir)
svntest.main.file_write(beta_path, "New content")
expected_output = svntest.wc.State(wc_dir,
{'A/B/E/beta' : Item(verb='Sending')})
expected_status.tweak('A/B/E/beta', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
svntest.main.file_write(alpha_path, "New content")
expected_output = svntest.wc.State(wc_dir,
{'A/B/E/alpha' : Item(verb='Sending')})
expected_status.tweak('A/B/E/alpha', wc_rev=4)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
expected_output = svntest.wc.State(B_COPY_1_path, {
'E/alpha' : Item(status='U '),
'E/beta' : Item(status='U '),
})
expected_mergeinfo_output = svntest.wc.State(B_COPY_1_path, {
'' : Item(status=' U'),
})
expected_elision_output = svntest.wc.State(B_COPY_1_path, {
})
expected_merge_status = svntest.wc.State(B_COPY_1_path, {
'' : Item(status=' M', wc_rev=2),
'lambda' : Item(status=' ', wc_rev=2),
'E' : Item(status=' ', wc_rev=2),
'E/alpha' : Item(status='M ', wc_rev=2),
'E/beta' : Item(status='M ', wc_rev=2),
'F' : Item(status=' ', wc_rev=2),
})
expected_merge_disk = svntest.wc.State('', {
'' : Item(props={SVN_PROP_MERGEINFO : '/A/B:3-4'}),
'lambda' : Item("This is the file 'lambda'.\n"),
'E' : Item(),
'E/alpha' : Item("New content"),
'E/beta' : Item("New content"),
'F' : Item(),
})
expected_skip = svntest.wc.State(B_COPY_1_path, { })
svntest.actions.run_and_verify_merge(B_COPY_1_path, '2', '4',
sbox.repo_url + '/A/B', None,
expected_output,
expected_mergeinfo_output,
expected_elision_output,
expected_merge_disk,
expected_merge_status,
expected_skip,
None, None, None, None,
None, 1)
expected_output = svntest.wc.State(
wc_dir,
{'A/B_COPY_1' : Item(verb='Sending'),
'A/B_COPY_1/E/alpha' : Item(verb='Sending'),
'A/B_COPY_1/E/beta' : Item(verb='Sending'),
})
expected_status.tweak('A/B_COPY_1', wc_rev=5)
expected_status.tweak('A/B_COPY_1/E/alpha', wc_rev=5)
expected_status.tweak('A/B_COPY_1/E/beta', wc_rev=5)
expected_status.tweak('A/B_COPY_1/lambda', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
expected_output = svntest.wc.State(E_COPY_2_path, {
'alpha' : Item(status='U '),
'beta' : Item(status='U '),
})
expected_mergeinfo_output = svntest.wc.State(E_COPY_2_path, {
'' : Item(status=' U'),
})
expected_elision_output = svntest.wc.State(E_COPY_2_path, {
})
expected_merge_status = svntest.wc.State(E_COPY_2_path, {
'' : Item(status=' M', wc_rev=2),
'alpha' : Item(status='M ', wc_rev=2),
'beta' : Item(status='M ', wc_rev=2),
})
expected_merge_disk = svntest.wc.State('', {
'' : Item(props={SVN_PROP_MERGEINFO : '/A/B/E:3-4'}),
'alpha' : Item("New content"),
'beta' : Item("New content"),
})
expected_skip = svntest.wc.State(E_COPY_2_path, { })
svntest.actions.run_and_verify_merge(E_COPY_2_path, '2', '4',
sbox.repo_url + '/A/B/E', None,
expected_output,
expected_mergeinfo_output,
expected_elision_output,
expected_merge_disk,
expected_merge_status,
expected_skip,
None, None, None, None,
None, 1)
expected_output = svntest.wc.State(sbox.wc_dir, {
"A/B_COPY_2" : Item(status=' U'),
"A/B_COPY_2/E/alpha" : Item(status='G '),
"A/B_COPY_2/E/beta" : Item(status='G '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak("A/B/E/alpha", contents="New content")
expected_disk.tweak("A/B/E/beta", contents="New content")
expected_disk.add({
"A/B_COPY_1" : Item(props={SVN_PROP_MERGEINFO : '/A/B:3-4'}),
"A/B_COPY_1/E" : Item(),
"A/B_COPY_1/F" : Item(),
"A/B_COPY_1/lambda" : Item("This is the file 'lambda'.\n"),
"A/B_COPY_1/E/alpha" : Item("New content"),
"A/B_COPY_1/E/beta" : Item("New content"),
"A/B_COPY_2" : Item(props={SVN_PROP_MERGEINFO : '/A/B:3-4'}),
"A/B_COPY_2/E" : Item(props={SVN_PROP_MERGEINFO : '/A/B/E:3-4'}),
"A/B_COPY_2/F" : Item(),
"A/B_COPY_2/lambda" : Item("This is the file 'lambda'.\n"),
"A/B_COPY_2/E/alpha" : Item("New content"),
"A/B_COPY_2/E/beta" : Item("New content"),
})
expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
expected_status.tweak("A/B/E/beta", wc_rev=3)
expected_status.tweak("A/B/E/alpha", wc_rev=4)
expected_status.add({
"A/B_COPY_1" : Item(status=' ', wc_rev=5),
"A/B_COPY_1/E" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/F" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/lambda" : Item(status=' ', wc_rev=2),
"A/B_COPY_1/E/alpha" : Item(status=' ', wc_rev=5),
"A/B_COPY_1/E/beta" : Item(status=' ', wc_rev=5),
"A/B_COPY_2" : Item(status=' ', wc_rev=5, switched='S'),
"A/B_COPY_2/E" : Item(status=' M', wc_rev=5),
"A/B_COPY_2/F" : Item(status=' ', wc_rev=5),
"A/B_COPY_2/lambda" : Item(status=' ', wc_rev=5),
"A/B_COPY_2/E/alpha" : Item(status=' ', wc_rev=5),
"A/B_COPY_2/E/beta" : Item(status=' ', wc_rev=5),
})
svntest.actions.run_and_verify_switch(sbox.wc_dir,
B_COPY_2_path,
sbox.repo_url + "/A/B_COPY_1",
expected_output,
expected_disk,
expected_status,
None, None, None, None, None, True,
'--ignore-ancestry')
expected_output = svntest.wc.State(sbox.wc_dir, {
"A/B_COPY_1/lambda" : Item(status='U '),
})
expected_disk.tweak("A/B_COPY_1/lambda",
contents="This is the file 'iota'.\n")
expected_status.tweak("A/B_COPY_1/lambda", wc_rev=5, switched='S')
svntest.actions.run_and_verify_switch(sbox.wc_dir,
lambda_path,
sbox.repo_url + "/iota",
expected_output,
expected_disk,
expected_status,
None, None, None, None, None, True,
'--ignore-ancestry')
svntest.actions.run_and_verify_svn(None,
["property '" + SVN_PROP_MERGEINFO +
"' set on '" + lambda_path + "'" +
"\n"], [], 'ps', SVN_PROP_MERGEINFO,
'/A/B/lambda:3-4', lambda_path)
expected_output = svntest.wc.State(sbox.wc_dir, {
"A/B_COPY_1/lambda" : Item(status='U '),
})
expected_disk.tweak("A/B_COPY_1/lambda",
contents="This is the file 'lambda'.\n",
props={SVN_PROP_MERGEINFO : '/A/B/lambda:3-4'})
expected_status.tweak("A/B_COPY_1/lambda", switched=None, status=' M')
svntest.actions.run_and_verify_switch(sbox.wc_dir,
lambda_path,
sbox.repo_url + "/A/B_COPY_1/lambda",
expected_output,
expected_disk,
expected_status,
None, None, None, None, None, True,
'--ignore-ancestry')
def switch_with_depth(sbox):
"basic tests to verify switch along with depth"
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
AD_url = repo_url + '/A/D'
AB_url = repo_url + '/A/B'
AB_path = os.path.join(wc_dir, 'A', 'B')
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B', switched='S')
expected_status.tweak('A/B/lambda', switched='S')
expected_status.tweak('A/B/E', switched='S')
expected_status.tweak('A/B/F', switched='S')
svntest.actions.run_and_verify_switch(wc_dir, AB_path, AD_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--depth', 'empty', '--ignore-ancestry')
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--depth', 'empty', '--ignore-ancestry')
expected_output = svntest.wc.State(wc_dir, {
'A/B/lambda' : Item(status='D '),
'A/B/gamma' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/B/lambda')
expected_disk.add({
'A/B/gamma' : Item("This is the file 'gamma'.\n")
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/lambda')
expected_status.add({
'A/B/gamma' : Item(status=' ', wc_rev=1)
})
expected_status.tweak('A/B', switched='S')
expected_status.tweak('A/B/E', switched='S')
expected_status.tweak('A/B/F', switched='S')
svntest.actions.run_and_verify_switch(wc_dir, AB_path, AD_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--depth', 'files', '--ignore-ancestry')
expected_output = svntest.wc.State(wc_dir, {
'A/B/gamma' : Item(status='D '),
'A/B/lambda' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--depth', 'files', '--ignore-ancestry')
def sw_depth_imm():
expected_output = svntest.wc.State(wc_dir, {
'A/B/lambda' : Item(status='D '),
'A/B/E' : Item(status='D '),
'A/B/F' : Item(status='D '),
'A/B/gamma' : Item(status='A '),
'A/B/G' : Item(status='A '),
'A/B/H' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/B/lambda', 'A/B/E/beta', 'A/B/E/alpha',
'A/B/E', 'A/B/F')
expected_disk.add({
'A/B/gamma' : Item("This is the file 'gamma'.\n"),
'A/B/G' : Item(),
'A/B/H' : Item(),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/lambda', 'A/B/E/beta', 'A/B/E/alpha',
'A/B/E', 'A/B/F')
expected_status.add({
'A/B/gamma' : Item(status=' ', wc_rev=1),
'A/B/G' : Item(status=' ', wc_rev=1),
'A/B/H' : Item(status=' ', wc_rev=1)
})
expected_status.tweak('A/B', switched='S')
svntest.actions.run_and_verify_switch(wc_dir, AB_path, AD_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--depth', 'immediates',
'--ignore-ancestry')
sw_depth_imm()
expected_output = svntest.wc.State(wc_dir, {
'A/B/gamma' : Item(status='D '),
'A/B/G' : Item(status='D '),
'A/B/H' : Item(status='D '),
'A/B/lambda' : Item(status='A '),
'A/B/E' : Item(status='A '),
'A/B/E/alpha' : Item(status='A '),
'A/B/E/beta' : Item(status='A '),
'A/B/F' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--ignore-ancestry')
sw_depth_imm()
expected_output = svntest.wc.State(wc_dir, {
'A/B/gamma' : Item(status='D '),
'A/B/G' : Item(status='D '),
'A/B/H' : Item(status='D '),
'A/B/lambda' : Item(status='A '),
'A/B/E' : Item(status='A '),
'A/B/E/alpha' : Item(status='A '),
'A/B/E/beta' : Item(status='A '),
'A/B/F' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url,
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'--depth', 'infinity',
'--ignore-ancestry')
def switch_to_dir_with_peg_rev(sbox):
"switch to dir@peg where dir doesn't exist in HEAD"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
X_path = os.path.join(wc_dir, 'X')
Y_path = os.path.join(wc_dir, 'Y')
svntest.main.run_svn(None, 'mkdir', X_path, Y_path)
svntest.main.run_svn(None, 'ci',
'-m', 'log message',
wc_dir)
ADG_path = os.path.join(wc_dir, 'A', 'D', 'G')
tau_path = os.path.join(ADG_path, 'tau')
svntest.main.file_append(tau_path, "new line\n")
svntest.main.run_svn(None, 'ci',
'-m', 'log message',
wc_dir)
svntest.main.run_svn(None, 'up', wc_dir)
svntest.main.run_svn(None, 'rm', ADG_path)
svntest.main.run_svn(None, 'ci',
'-m', 'log message',
wc_dir)
ADG_url = repo_url + '/A/D/G'
expected_output = svntest.wc.State(wc_dir, {
'X/pi' : Item(status='A '),
'X/rho' : Item(status='A '),
'X/tau' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'X' : Item(),
'X/pi' : Item("This is the file 'pi'.\n"),
'X/rho' : Item("This is the file 'rho'.\n"),
'X/tau' : Item("This is the file 'tau'.\n"),
'Y' : Item(),
})
expected_disk.remove('A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.remove('A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
expected_status.add({
'X' : Item(status=' ', wc_rev=2, switched='S'),
'X/pi' : Item(status=' ', wc_rev=2),
'X/rho' : Item(status=' ', wc_rev=2),
'X/tau' : Item(status=' ', wc_rev=2),
'Y' : Item(status=' ', wc_rev=3)
})
svntest.actions.run_and_verify_switch(wc_dir, X_path, ADG_url + '@3',
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'-r', '2', '--ignore-ancestry')
def switch_urls_with_spaces(sbox):
"switch file and dir to url containing spaces"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
XYZ_path = os.path.join(wc_dir, 'X Y Z')
ABC_path = os.path.join(wc_dir, 'A B C')
svntest.main.run_svn(None, 'mkdir', XYZ_path, ABC_path)
tpm_path = os.path.join(wc_dir, 'tau pau mau')
bbb_path = os.path.join(wc_dir, 'bar baz bal')
svntest.main.file_write(tpm_path, "This is the file 'tau pau mau'.\n")
svntest.main.file_write(bbb_path, "This is the file 'bar baz bal'.\n")
svntest.main.run_svn(None, 'add', tpm_path, bbb_path)
svntest.main.run_svn(None, 'ci', '-m', 'log message', wc_dir)
XYZ_url = repo_url + '/X Y Z'
expected_output = svntest.wc.State(wc_dir, {
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'X Y Z' : Item(),
'A B C' : Item(),
'tau pau mau' : Item("This is the file 'tau pau mau'.\n"),
'bar baz bal' : Item("This is the file 'bar baz bal'.\n"),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'X Y Z' : Item(status=' ', wc_rev=2),
'A B C' : Item(status=' ', wc_rev=2, switched='S'),
'tau pau mau' : Item(status=' ', wc_rev=2),
'bar baz bal' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_switch(wc_dir, ABC_path, XYZ_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
tpm_url = repo_url + '/tau pau mau'
expected_output = svntest.wc.State(wc_dir, {
'bar baz bal' : Item(status='U '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'X Y Z' : Item(),
'A B C' : Item(),
'tau pau mau' : Item("This is the file 'tau pau mau'.\n"),
'bar baz bal' : Item("This is the file 'tau pau mau'.\n"),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'X Y Z' : Item(status=' ', wc_rev=2),
'A B C' : Item(status=' ', wc_rev=2, switched='S'),
'tau pau mau' : Item(status=' ', wc_rev=2),
'bar baz bal' : Item(status=' ', wc_rev=2, switched='S'),
})
svntest.actions.run_and_verify_switch(wc_dir, bbb_path, tpm_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
def switch_to_dir_with_peg_rev2(sbox):
"switch to old rev of now renamed branch"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
X_path = os.path.join(wc_dir, 'X')
svntest.main.run_svn(None, 'mkdir', X_path)
svntest.main.run_svn(None, 'ci',
'-m', 'log message',
wc_dir)
tau_path = os.path.join(wc_dir, 'A', 'D', 'G', 'tau')
svntest.main.file_append(tau_path, "extra line\n")
svntest.main.run_svn(None, 'ci', '-m', 'log message', wc_dir)
svntest.main.run_svn(None, 'up', wc_dir)
ADG_path = os.path.join(wc_dir, 'A', 'D', 'G')
ADY_path = os.path.join(wc_dir, 'A', 'D', 'Y')
svntest.main.run_svn(None, 'mv', ADG_path, ADY_path)
svntest.main.run_svn(None, 'ci',
'-m', 'log message',
wc_dir)
ADY_url = sbox.repo_url + '/A/D/Y'
expected_output = svntest.wc.State(wc_dir, {
'X/pi' : Item(status='A '),
'X/rho' : Item(status='A '),
'X/tau' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'X' : Item(),
'X/pi' : Item("This is the file 'pi'.\n"),
'X/rho' : Item("This is the file 'rho'.\n"),
'X/tau' : Item("This is the file 'tau'.\n"),
'A/D/Y' : Item(),
'A/D/Y/pi' : Item("This is the file 'pi'.\n"),
'A/D/Y/rho' : Item("This is the file 'rho'.\n"),
'A/D/Y/tau' : Item("This is the file 'tau'.\nextra line\n"),
})
expected_disk.remove('A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.remove('A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
expected_status.add({
'X' : Item(status=' ', wc_rev=2, switched='S'),
'X/pi' : Item(status=' ', wc_rev=2),
'X/rho' : Item(status=' ', wc_rev=2),
'X/tau' : Item(status=' ', wc_rev=2),
'A/D/Y' : Item(status=' ', wc_rev=4),
'A/D/Y/pi' : Item(status=' ', wc_rev=4),
'A/D/Y/rho' : Item(status=' ', wc_rev=4),
'A/D/Y/tau' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_switch(wc_dir, X_path, ADY_url + '@HEAD',
expected_output,
expected_disk,
expected_status, None,
None, None, None, None, False,
'-r', '2', '--ignore-ancestry')
def switch_to_root(sbox):
"switch a folder to the root of its repository"
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
ADG_path = os.path.join(wc_dir, 'A', 'D', 'G')
AD_url = sbox.repo_url + '/A/D'
expected_output = svntest.wc.State(wc_dir, {
'A/D/G/pi' : Item(status='D '),
'A/D/G/rho' : Item(status='D '),
'A/D/G/tau' : Item(status='D '),
'A/D/G/A' : Item(status='A '),
'A/D/G/A/B' : Item(status='A '),
'A/D/G/A/B/lambda' : Item(status='A '),
'A/D/G/A/B/E' : Item(status='A '),
'A/D/G/A/B/E/alpha' : Item(status='A '),
'A/D/G/A/B/E/beta' : Item(status='A '),
'A/D/G/A/B/F' : Item(status='A '),
'A/D/G/A/mu' : Item(status='A '),
'A/D/G/A/C' : Item(status='A '),
'A/D/G/A/D' : Item(status='A '),
'A/D/G/A/D/gamma' : Item(status='A '),
'A/D/G/A/D/G' : Item(status='A '),
'A/D/G/A/D/G/pi' : Item(status='A '),
'A/D/G/A/D/G/rho' : Item(status='A '),
'A/D/G/A/D/G/tau' : Item(status='A '),
'A/D/G/A/D/H' : Item(status='A '),
'A/D/G/A/D/H/chi' : Item(status='A '),
'A/D/G/A/D/H/omega' : Item(status='A '),
'A/D/G/A/D/H/psi' : Item(status='A '),
'A/D/G/iota' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
expected_disk.add_state('A/D/G', svntest.main.greek_state.copy())
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
expected_status.add_state('A/D/G',
svntest.actions.get_virginal_state(wc_dir, 1))
expected_status.tweak('A/D/G', switched = 'S')
svntest.actions.run_and_verify_switch(wc_dir, ADG_path, sbox.repo_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
def tolerate_local_mods(sbox):
"tolerate deletion of a directory with local mods"
sbox.build()
wc_dir = sbox.wc_dir
A_path = os.path.join(wc_dir, 'A')
L_path = os.path.join(A_path, 'L')
LM_path = os.path.join(L_path, 'local_mod')
A_url = sbox.repo_url + '/A'
A2_url = sbox.repo_url + '/A2'
svntest.actions.run_and_verify_svn(None,
['\n', 'Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
os.mkdir(L_path)
svntest.main.run_svn(None, 'add', L_path)
svntest.main.run_svn(None, 'ci', '-m', 'Commit added folder', wc_dir)
svntest.main.file_write(LM_path, 'Locally modified file.\n', 'w+')
expected_output = svntest.wc.State(wc_dir, {
'A/L' : Item(status='D '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/L' : Item(),
'A/L/local_mod' : Item(contents='Locally modified file.\n'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak('', 'iota', wc_rev=1)
expected_status.tweak('A', switched='S')
svntest.actions.run_and_verify_switch(wc_dir, A_path, A2_url,
expected_output,
expected_disk,
expected_status,
None, None, None, None, None,
False, '--ignore-ancestry')
leaf_edit = svntest.actions.deep_trees_leaf_edit
tree_del = svntest.actions.deep_trees_tree_del
leaf_del = svntest.actions.deep_trees_leaf_del
disk_after_leaf_edit = svntest.actions.deep_trees_after_leaf_edit
disk_after_leaf_del = svntest.actions.deep_trees_after_leaf_del
disk_after_tree_del = svntest.actions.deep_trees_after_tree_del
disk_empty_dirs = svntest.actions.deep_trees_empty_dirs
deep_trees_conflict_output = svntest.actions.deep_trees_conflict_output
deep_trees_conflict_output_skipped = \
svntest.actions.deep_trees_conflict_output_skipped
deep_trees_status_local_tree_del = \
svntest.actions.deep_trees_status_local_tree_del
deep_trees_status_local_leaf_edit = \
svntest.actions.deep_trees_status_local_leaf_edit
DeepTreesTestCase = svntest.actions.DeepTreesTestCase
j = os.path.join
def tree_conflicts_on_switch_1_1(sbox):
"tree conflicts 1.1: tree del, leaf edit on switch"
sbox.build()
expected_output = deep_trees_conflict_output.copy()
expected_output.add({
'DDD/D1/D2' : Item(status=' ', treeconflict='U'),
'DDD/D1/D2/D3' : Item(status=' ', treeconflict='U'),
'DDD/D1/D2/D3/zeta' : Item(status=' ', treeconflict='A'),
'DD/D1/D2' : Item(status=' ', treeconflict='U'),
'DD/D1/D2/epsilon' : Item(status=' ', treeconflict='A'),
'DF/D1/beta' : Item(status=' ', treeconflict='U'),
'D/D1/delta' : Item(status=' ', treeconflict='A'),
'DDF/D1/D2' : Item(status=' ', treeconflict='U'),
'DDF/D1/D2/gamma' : Item(status=' ', treeconflict='U')
})
expected_disk = disk_empty_dirs.copy()
if svntest.main.wc_is_singledb(sbox.wc_dir):
expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
'DDF/D1', 'DDF/D1/D2',
'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
expected_status = deep_trees_status_local_tree_del.copy()
expected_status.add({
'D/D1/delta' : Item(status='D '),
'DD/D1/D2/epsilon' : Item(status='D '),
'DDD/D1/D2/D3/zeta' : Item(status='D '),
})
expected_status.tweak('', switched='S')
expected_status.tweak(wc_rev=3)
expected_info = {
'F/alpha' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .file.*/F/alpha@3$',
},
'DF/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .dir.*/DF/D1@3$',
},
'DDF/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .dir.*/DDF/D1@3$',
},
'D/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .dir.*/D/D1@3$',
},
'DD/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .dir.*/DD/D1@3$',
},
'DDD/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .dir.*/DDD/D1@3$',
},
}
svntest.actions.deep_trees_run_tests_scheme_for_switch(sbox,
[ DeepTreesTestCase("local_tree_del_incoming_leaf_edit",
tree_del,
leaf_edit,
expected_output,
expected_disk,
expected_status,
expected_info = expected_info) ] )
@Issue(3334)
def tree_conflicts_on_switch_1_2(sbox):
"tree conflicts 1.2: tree del, leaf del on switch"
sbox.build()
expected_output = deep_trees_conflict_output.copy()
expected_output.add({
'DD/D1/D2' : Item(status=' ', treeconflict='D'),
'DDF/D1/D2' : Item(status=' ', treeconflict='U'),
'DDF/D1/D2/gamma' : Item(status=' ', treeconflict='D'),
'DDD/D1/D2' : Item(status=' ', treeconflict='U'),
'DDD/D1/D2/D3' : Item(status=' ', treeconflict='D'),
'DF/D1/beta' : Item(status=' ', treeconflict='D'),
})
expected_disk = disk_empty_dirs.copy()
expected_status = deep_trees_status_local_tree_del.copy()
expected_status.tweak(wc_rev=3)
expected_status.tweak('F/alpha',
'D/D1',
status='! ', wc_rev=None)
expected_status.tweak('', switched='S')
expected_status.remove('DD/D1/D2',
'DDD/D1/D2/D3',
'DDF/D1/D2/gamma',
'DF/D1/beta')
expected_disk.remove('D/D1',
'DD/D1/D2',
'DDD/D1/D2/D3')
if svntest.main.wc_is_singledb(sbox.wc_dir):
expected_disk.remove('DF/D1', 'DD/D1',
'DDF/D1', 'DDF/D1/D2',
'DDD/D1', 'DDD/D1/D2')
expected_info = {
'F/alpha' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .dir.*/DF/D1@3$',
},
'DDF/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .dir.*/DDF/D1@3$',
},
'D/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .dir.*/DD/D1@3$',
},
'DDD/D1' : {
'Tree conflict' :
'^local delete, incoming edit upon switch'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .dir.*/DDD/D1@3$',
},
}
svntest.actions.deep_trees_run_tests_scheme_for_switch(sbox,
[ DeepTreesTestCase("local_tree_del_incoming_leaf_del",
tree_del,
leaf_del,
expected_output,
expected_disk,
expected_status,
expected_info = expected_info) ] )
@Issue(3334)
def tree_conflicts_on_switch_2_1(sbox):
"tree conflicts 2.1: leaf edit, tree del on switch"
expected_output = deep_trees_conflict_output
expected_disk = disk_after_leaf_edit.copy()
expected_status = deep_trees_status_local_leaf_edit.copy()
expected_status.tweak('D/D1',
'F/alpha',
'DD/D1',
'DF/D1',
'DDD/D1',
'DDF/D1',
status='A ', copied='+', wc_rev='-')
expected_status.tweak(
'DD/D1/D2',
'DDD/D1/D2',
'DDD/D1/D2/D3',
'DF/D1/beta',
'DDF/D1/D2',
'DDF/D1/D2/gamma',
copied='+', wc_rev='-')
expected_status.tweak('', switched='S')
expected_info = {
'F/alpha' : {
'Tree conflict' :
'^local edit, incoming delete upon switch'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
'Tree conflict' :
'^local edit, incoming delete upon switch'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .none.*/DF/D1@3$',
},
'DDF/D1' : {
'Tree conflict' :
'^local edit, incoming delete upon switch'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .none.*/DDF/D1@3$',
},
'D/D1' : {
'Tree conflict' :
'^local edit, incoming delete upon switch'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
'Tree conflict' :
'^local edit, incoming delete upon switch'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .none.*/DD/D1@3$',
},
'DDD/D1' : {
'Tree conflict' :
'^local edit, incoming delete upon switch'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .none.*/DDD/D1@3$',
},
}
svntest.actions.deep_trees_run_tests_scheme_for_switch(sbox,
[ DeepTreesTestCase("local_leaf_edit_incoming_tree_del",
leaf_edit,
tree_del,
expected_output,
expected_disk,
expected_status,
expected_info = expected_info) ] )
def tree_conflicts_on_switch_2_2(sbox):
"tree conflicts 2.2: leaf del, tree del on switch"
expected_output = deep_trees_conflict_output
expected_disk = disk_empty_dirs.copy()
expected_status = svntest.actions.deep_trees_virginal_state.copy()
expected_status.add({'' : Item(),
'F/alpha' : Item()})
expected_status.tweak(contents=None, status=' ', wc_rev=3)
expected_status.tweak('', switched='S')
expected_status.tweak('F/alpha',
'D/D1',
'DD/D1',
'DF/D1',
'DDD/D1',
'DDF/D1',
status='! ', treeconflict='C', wc_rev=None)
expected_status.remove('DD/D1/D2',
'DF/D1/beta',
'DDD/D1/D2',
'DDD/D1/D2/D3',
'DDF/D1/D2',
'DDF/D1/D2/gamma',)
expected_disk.remove('D/D1',
'DD/D1',
'DD/D1/D2',
'DF/D1',
'DDD/D1',
'DDD/D1/D2',
'DDD/D1/D2/D3',
'DDF/D1',
'DDF/D1/D2',)
expected_info = {
'F/alpha' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .none.*/DF/D1@3$',
},
'DDF/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .none.*/DDF/D1@3$',
},
'D/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .none.*/DD/D1@3$',
},
'DDD/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .none.*/DDD/D1@3$',
},
}
svntest.actions.deep_trees_run_tests_scheme_for_switch(sbox,
[ DeepTreesTestCase("local_leaf_del_incoming_tree_del",
leaf_del,
tree_del,
expected_output,
expected_disk,
expected_status,
expected_info = expected_info) ] )
def tree_conflicts_on_switch_3(sbox):
"tree conflicts 3: tree del, tree del on switch"
expected_output = deep_trees_conflict_output
expected_disk = disk_empty_dirs.copy()
expected_status = deep_trees_status_local_tree_del.copy()
expected_status.tweak('', switched='S')
expected_status.tweak('F/alpha',
'D/D1',
'DD/D1',
'DF/D1',
'DDD/D1',
'DDF/D1',
status='! ', wc_rev=None)
expected_status.remove('DD/D1/D2',
'DF/D1/beta',
'DDD/D1/D2',
'DDD/D1/D2/D3',
'DDF/D1/D2',
'DDF/D1/D2/gamma',)
expected_disk.remove('D/D1',
'DD/D1',
'DD/D1/D2',
'DF/D1',
'DDD/D1',
'DDD/D1/D2',
'DDD/D1/D2/D3',
'DDF/D1',
'DDF/D1/D2',)
expected_info = {
'F/alpha' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .none.*/DF/D1@3$',
},
'DDF/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .none.*/DDF/D1@3$',
},
'D/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .none.*/DD/D1@3$',
},
'DDD/D1' : {
'Tree conflict' :
'^local delete, incoming delete upon switch'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .none.*/DDD/D1@3$',
},
}
svntest.actions.deep_trees_run_tests_scheme_for_switch(sbox,
[ DeepTreesTestCase("local_tree_del_incoming_tree_del",
tree_del,
tree_del,
expected_output,
expected_disk,
expected_status,
expected_info = expected_info) ] )
def copy_with_switched_subdir(sbox):
"copy directory with switched subdir"
sbox.build()
wc_dir = sbox.wc_dir
D = os.path.join(wc_dir, 'A/D')
G = os.path.join(D, 'G')
E_url = sbox.repo_url + '/A/B/E'
R = os.path.join(wc_dir, 'R')
state = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_status(wc_dir, state)
svntest.actions.run_and_verify_svn(None, None, [], 'switch',
'--ignore-ancestry', E_url, G)
state.tweak('A/D/G', switched='S')
state.remove('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau');
state.add({
'A/D/G/alpha' : Item(status=' ', wc_rev=1),
'A/D/G/beta' : Item(status=' ', wc_rev=1),
})
svntest.actions.run_and_verify_status(wc_dir, state)
svntest.actions.run_and_verify_svn(None, None, [], 'cp', D, R)
state.add({
'R' : Item(status='A ', copied='+', wc_rev='-'),
'R/gamma' : Item(status=' ', copied='+', wc_rev='-'),
'R/G/alpha' : Item(status=' ', copied='+', wc_rev='-'),
'R/G/beta' : Item(status=' ', copied='+', wc_rev='-'),
'R/H' : Item(status=' ', copied='+', wc_rev='-'),
'R/H/chi' : Item(status=' ', copied='+', wc_rev='-'),
'R/H/omega' : Item(status=' ', copied='+', wc_rev='-'),
'R/H/psi' : Item(status=' ', copied='+', wc_rev='-'),
'R/G' : Item(status='A ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status(wc_dir, state)
svntest.main.run_svn(None, 'ci', '-m', 'Commit added folder', wc_dir)
svntest.main.run_svn(None, 'up', wc_dir)
svntest.main.file_append(os.path.join(wc_dir, 'R/G/alpha'), "apple")
svntest.main.run_svn(None, 'ci', '-m', 'Commit changed file', wc_dir)
svntest.main.safe_rmtree(wc_dir, 1)
svntest.actions.run_and_verify_svn(None,
None, [],
'checkout',
sbox.repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'switch',
'--ignore-ancestry', E_url, G)
state.tweak(status=' ', copied=None, wc_rev='3', entry_status=None)
state.tweak('A/D/G', switched='S')
svntest.actions.run_and_verify_status(wc_dir, state)
@Issue(3871)
def up_to_old_rev_with_subtree_switched_to_root(sbox):
"up to old rev with subtree switched to root"
sbox.build()
wc_dir = sbox.wc_dir
A_path = os.path.join(wc_dir, 'A')
branch_path = os.path.join(wc_dir, 'branch')
svntest.actions.run_and_verify_svn(None, None, [], 'copy', A_path,
branch_path)
svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
'-m', 'Create a branch')
svntest.actions.run_and_verify_svn(None, None, [], 'sw', sbox.repo_url,
branch_path, '--ignore-ancestry')
svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r1', wc_dir)
def different_node_kind(sbox):
"switch to a different node kind"
sbox.build(read_only = True)
os.chdir(sbox.wc_dir)
sbox.wc_dir = ''
pristine_disk = svntest.main.greek_state
pristine_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
expected_disk = pristine_disk.copy()
expected_status = pristine_status.copy()
def switch_to_dir(sbox, rel_url, rel_path):
full_url = sbox.repo_url + '/' + rel_url
full_path = sbox.ospath(rel_path)
expected_disk.remove(rel_path)
expected_disk.add({ rel_path : pristine_disk.desc[rel_url] })
expected_disk.add_state(rel_path, pristine_disk.subtree(rel_url))
expected_status.tweak(rel_path, switched='S')
expected_status.add_state(rel_path, pristine_status.subtree(rel_url))
svntest.actions.run_and_verify_switch(sbox.wc_dir, full_path, full_url,
None, expected_disk, expected_status,
None, None, None, None, None, False,
'--ignore-ancestry')
svntest.actions.run_and_verify_svn(None, None, [], 'info', full_path)
if not os.path.isdir(full_path):
raise svntest.Failure
def switch_to_file(sbox, rel_url, rel_path):
full_url = sbox.repo_url + '/' + rel_url
full_path = sbox.ospath(rel_path)
expected_disk.remove_subtree(rel_path)
expected_disk.add({ rel_path : pristine_disk.desc[rel_url] })
expected_status.remove_subtree(rel_path)
expected_status.add({ rel_path : pristine_status.desc[rel_url] })
expected_status.tweak(rel_path, switched='S')
svntest.actions.run_and_verify_switch(sbox.wc_dir, full_path, full_url,
None, expected_disk, expected_status,
None, None, None, None, None, False,
'--ignore-ancestry')
svntest.actions.run_and_verify_svn(None, None, [], 'info', full_path)
if not os.path.isfile(full_path):
raise svntest.Failure
switch_to_dir(sbox, 'A/C', 'iota')
switch_to_dir(sbox, 'A/D/G', 'A/D/gamma')
switch_to_file(sbox, 'iota', 'A/C')
switch_to_file(sbox, 'A/D/gamma', 'A/D/G')
test_list = [ None,
routine_switching,
commit_switched_things,
full_update,
full_rev_update,
update_switched_things,
rev_update_switched_things,
log_switched_file,
delete_subdir,
file_dir_file,
nonrecursive_switching,
failed_anchor_is_target,
bad_intermediate_urls,
obstructed_switch,
commit_mods_below_switch,
refresh_read_only_attribute,
switch_change_repos_root,
forced_switch,
forced_switch_failures,
switch_scheduled_add,
mergeinfo_switch_elision,
switch_with_obstructing_local_adds,
switch_with_depth,
switch_to_dir_with_peg_rev,
switch_urls_with_spaces,
switch_to_dir_with_peg_rev2,
switch_to_root,
tolerate_local_mods,
tree_conflicts_on_switch_1_1,
tree_conflicts_on_switch_1_2,
tree_conflicts_on_switch_2_1,
tree_conflicts_on_switch_2_2,
tree_conflicts_on_switch_3,
copy_with_switched_subdir,
up_to_old_rev_with_subtree_switched_to_root,
different_node_kind,
]
if __name__ == '__main__':
svntest.main.run_tests(test_list)