[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-cvs
Subject: svn commit: r13814 - in trunk/subversion/tests/clients/cmdline: . svntest
From: kfogel () tigris ! org
Date: 2005-03-31 23:08:04
Message-ID: 200503312308.j2VN84w07901 () morbius ! ch ! collab ! net
[Download RAW message or body]
Author: kfogel
Date: Thu Mar 31 17:08:03 2005
New Revision: 13814
Modified:
trunk/subversion/tests/clients/cmdline/basic_tests.py
trunk/subversion/tests/clients/cmdline/commit_tests.py
trunk/subversion/tests/clients/cmdline/copy_tests.py
trunk/subversion/tests/clients/cmdline/diff_tests.py
trunk/subversion/tests/clients/cmdline/externals_tests.py
trunk/subversion/tests/clients/cmdline/history_tests.py
trunk/subversion/tests/clients/cmdline/log_tests.py
trunk/subversion/tests/clients/cmdline/merge_tests.py
trunk/subversion/tests/clients/cmdline/prop_tests.py
trunk/subversion/tests/clients/cmdline/revert_tests.py
trunk/subversion/tests/clients/cmdline/schedule_tests.py
trunk/subversion/tests/clients/cmdline/special_tests.py
trunk/subversion/tests/clients/cmdline/stat_tests.py
trunk/subversion/tests/clients/cmdline/svnlook_tests.py
trunk/subversion/tests/clients/cmdline/svntest/actions.py
trunk/subversion/tests/clients/cmdline/svntest/tree.py
trunk/subversion/tests/clients/cmdline/svntest/wc.py
trunk/subversion/tests/clients/cmdline/switch_tests.py
trunk/subversion/tests/clients/cmdline/trans_tests.py
trunk/subversion/tests/clients/cmdline/update_tests.py
Log:
With Ben Collins-Sussman, start on issue #2257:
Banish the concept of 'repos_rev' from the Python test framework. It
was a holdover from the days when 'svn st -u' printed the same head
revision for every file, where we now (more usefully) print the
last-committed revision. The 'repos_rev' was doing us no good at all
in the test suite; it was just another hoop to jump through.
* subversion/tests/clients/cmdline/svntest/wc.py
(StateItem.__init__): Don't take repos_rev.
(State.old_tree): Don't store repos_rev.
(StateItem.tweak): Don't handle repos_rev specially.
* subversion/tests/clients/cmdline/svntest/actions.py
(get_virginal_state): Don't set repos_rev.
* subversion/tests/clients/cmdline/svntest/tree.py: Update comments to
reflect the absence of repos_rev.
(build_tree_from_status): Stop parsing repos_rev.
* subversion/tests/clients/cmdline/*.py: Remove all references to
repos_rev throughout the test suite. Only one place required any
special treatment, it is listed below.
* subversion/tests/clients/cmdline/update_tests.py
(nested_in_read_only): Include 'F' when constructing the expected
status. I have no idea how this test was passing before. It's not
clear why the setting of repos_rev right afterwards would have
covered up the problem, but it obviously must have been doing so.
Modified: trunk/subversion/tests/clients/cmdline/basic_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/basic_te \
sts.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/basic_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/basic_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/basic_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/basic_tests.py Thu Mar 31 17:08:03 2005
@@ -250,8 +250,8 @@
})
expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 2)
expected_status.add({
- 'Y' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'Y/Z' : Item(status=' ', wc_rev=2, repos_rev=2)
+ 'Y' : Item(status=' ', wc_rev=2),
+ 'Y/Z' : Item(status=' ', wc_rev=2)
})
svntest.actions.run_and_verify_update(sbox.wc_dir,
@@ -660,7 +660,7 @@
expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
expected_output.tweak('A/B/E/beta', 'iota', 'A/D/G/rho', status='M ')
expected_output.add({
- 'A/D/H/zeta' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'A/D/H/zeta' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status (wc_dir, expected_output)
@@ -719,7 +719,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'X' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'X' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status (wc_dir, expected_status)
svntest.main.safe_rmtree(X_path)
@@ -832,9 +832,9 @@
'A/D/H/omega',
'A/D/H/psi')
expected_status.add({
- 'A/D/H/pi' : Item(status=' ', wc_rev=1, repos_rev=1),
- 'A/D/H/rho' : Item(status=' ', wc_rev=1, repos_rev=1),
- 'A/D/H/tau' : Item(status=' ', wc_rev=1, repos_rev=1),
+ 'A/D/H/pi' : Item(status=' ', wc_rev=1),
+ 'A/D/H/rho' : Item(status=' ', wc_rev=1),
+ 'A/D/H/tau' : Item(status=' ', wc_rev=1),
})
expected_status.tweak('iota', 'A/D/H', switched='S')
@@ -913,9 +913,9 @@
expected_output.tweak('A/D/G/rho', 'A/B/F', status=' M')
# expected_output.tweak('A/C/sigma', status='? ')
expected_output.add({
- 'A/B/X' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/B/X/xi' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/Y' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'A/B/X' : Item(status='A ', wc_rev=0),
+ 'A/B/X/xi' : Item(status='A ', wc_rev=0),
+ 'A/D/Y' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_output)
@@ -1005,7 +1005,7 @@
'iota',
'A/D/gamma', status='D ')
expected_status.add({
- 'A/D/Y' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'A/D/Y' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1157,7 +1157,7 @@
expected_status.tweak(wc_rev=2)
expected_status.add({
- 'A/D/gamma' : Item(status='A ', wc_rev=0, repos_rev=2),
+ 'A/D/gamma' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1202,9 +1202,9 @@
# Newly imported file should be at revision 2.
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
- 'dirA' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'dirA/dirB' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'dirA/dirB/new_file' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'dirA' : Item(status=' ', wc_rev=2),
+ 'dirA/dirB' : Item(status=' ', wc_rev=2),
+ 'dirA/dirB/new_file' : Item(status=' ', wc_rev=2),
})
# Create expected output tree for the update.
@@ -1282,11 +1282,11 @@
# Newly imported file should be at revision 2.
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
- 'all_exe' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'none_exe' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'user_exe' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'group_exe' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'other_exe' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'all_exe' : Item(status=' ', wc_rev=2),
+ 'none_exe' : Item(status=' ', wc_rev=2),
+ 'user_exe' : Item(status=' ', wc_rev=2),
+ 'group_exe' : Item(status=' ', wc_rev=2),
+ 'other_exe' : Item(status=' ', wc_rev=2),
})
# Create expected output tree for the update.
@@ -1550,8 +1550,8 @@
# Newly imported file should be at revision 2.
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
- 'dir' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'dir/foo.c' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'dir' : Item(status=' ', wc_rev=2),
+ 'dir/foo.c' : Item(status=' ', wc_rev=2),
})
# Create expected output tree for the update.
Modified: trunk/subversion/tests/clients/cmdline/commit_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/commit_t \
ests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/commit_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/commit_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/commit_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/commit_tests.py Thu Mar 31 17:08:03 2005
@@ -49,10 +49,10 @@
# New things
state.add({
- 'Q' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'Q/floo' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/H/gloo' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/B/E/bloo' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'Q' : Item(status='A ', wc_rev=0),
+ 'Q/floo' : Item(status='A ', wc_rev=0),
+ 'A/D/H/gloo' : Item(status='A ', wc_rev=0),
+ 'A/B/E/bloo' : Item(status='A ', wc_rev=0),
})
return state
@@ -147,7 +147,6 @@
# Created expected status tree.
expected_status = get_standard_state(wc_dir) # pre-commit status
- expected_status.tweak(repos_rev=2) # post-commit status
expected_status.tweak('A/D/H/omega', wc_rev=2, status=' ')
# Commit the one file.
@@ -180,7 +179,6 @@
# Created expected status tree.
expected_status = get_standard_state(wc_dir) # pre-commit status
- expected_status.tweak(repos_rev=2) # post-commit status
expected_status.tweak('A/D/H/gloo', wc_rev=2, status=' ')
# Commit the one file.
@@ -215,7 +213,6 @@
# Created expected status tree.
expected_status = get_standard_state(wc_dir) # pre-commit status
- expected_status.tweak(repos_rev=2) # post-commit status
expected_status.tweak('A/D/H/gloo', wc_rev=2, status=' ')
# Commit the one file.
@@ -376,7 +373,6 @@
# Created expected status tree.
expected_status = get_standard_state(wc_dir) # pre-commit status
- expected_status.tweak(repos_rev=2) # post-commit status
expected_status.remove('A/D/G/rho', 'A/D/gamma')
expected_status.tweak('A/D', 'A/D/G/pi', 'A/D/H/omega',
@@ -440,7 +436,6 @@
expected_status = get_standard_state(wc_dir) # pre-commit status
expected_status.remove('A/D/G/rho', 'A/D/gamma', 'A/C',
'A/B/E/alpha', 'A/B/E/beta')
- expected_status.tweak(repos_rev=2) # post-commit status
expected_status.tweak('A/D', 'A/D/G/pi', 'A/D/H/omega', 'Q/floo', '',
wc_rev=2, status=' ')
expected_status.tweak('A/D/H/chi', 'Q', 'A/B/E', 'A/B/E/bloo', 'A/B/lambda',
@@ -521,7 +516,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D', 'A/D/H', status='R ', wc_rev=1)
expected_status.add({
- 'A/D/bloo' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'A/D/bloo' : Item(status='A ', wc_rev=0),
})
expected_status.tweak('A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau',
'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi', 'A/D/gamma',
@@ -543,7 +538,7 @@
expected_status.tweak(wc_rev=1)
expected_status.tweak('A/D', 'A/D/H', wc_rev=2)
expected_status.add({
- 'A/D/bloo' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/D/bloo' : Item(status=' ', wc_rev=2),
})
expected_status.remove('A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau',
'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi', 'A/D/gamma')
@@ -819,11 +814,11 @@
expected_status.remove('A/D/H/omega')
expected_status.remove('A/D/H/psi')
expected_status.add({ 'A/D/G/chi' :
- Item(wc_rev=2, repos_rev=2, status=' ') })
+ Item(wc_rev=2, status=' ') })
expected_status.add({ 'A/D/G/omega' :
- Item(wc_rev=2, repos_rev=2, status=' ') })
+ Item(wc_rev=2, status=' ') })
expected_status.add({ 'A/D/G/psi' :
- Item(wc_rev=2, repos_rev=2, status=' ') })
+ Item(wc_rev=2, status=' ') })
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -945,10 +940,10 @@
# 2. svn up A/D/H
expected_status = svntest.wc.State(wc_dir, {
- 'A/D/H' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/H/chi' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/H/omega' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/H/psi' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/D/H' : Item(status=' ', wc_rev=2),
+ 'A/D/H/chi' : Item(status=' ', wc_rev=2),
+ 'A/D/H/omega' : Item(status=' ', wc_rev=2),
+ 'A/D/H/psi' : Item(status=' ', wc_rev=2),
})
expected_disk = svntest.wc.State('', {
'omega' : Item("This is the file 'omega'."),
@@ -1130,7 +1125,7 @@
# Items in our add list will be at rev 2
for item in expected_output.desc.keys():
- expected_status.add({ item : Item(wc_rev=2, repos_rev=2, status=' ') })
+ expected_status.add({ item : Item(wc_rev=2, status=' ') })
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
@@ -1260,7 +1255,6 @@
expected_status.add({
'A/D/H/gloo' : Item(status='A ', wc_rev=0),
})
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/D/H/gloo', wc_rev=2, status=' ')
# Commit should succeed
@@ -1365,7 +1359,6 @@
'A/D/gamma' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2) # post-commit status
expected_status.tweak('A/D/gamma', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -1407,7 +1400,6 @@
# I can't get the status check to work as part of run_and_verify_commit.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('', wc_rev=2, status=' ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1565,14 +1557,13 @@
)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2) # post-commit revision
expected_status.add({
- file1_path : Item(status=' ', repos_rev=2, wc_rev=2),
- dir1_path : Item(status=' ', repos_rev=2, wc_rev=2),
- file2_path : Item(status=' ', repos_rev=2, wc_rev=2),
- file3_path : Item(status=' ', repos_rev=2, wc_rev=2),
- dir2_path : Item(status=' ', repos_rev=2, wc_rev=2),
- file4_path : Item(status=' ', repos_rev=2, wc_rev=2),
+ file1_path : Item(status=' ', wc_rev=2),
+ dir1_path : Item(status=' ', wc_rev=2),
+ file2_path : Item(status=' ', wc_rev=2),
+ file3_path : Item(status=' ', wc_rev=2),
+ dir2_path : Item(status=' ', wc_rev=2),
+ file4_path : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1665,26 +1656,25 @@
)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
# Expect the leftovers from the first part of the test.
expected_status.add({
- file1_path : Item(status=' ', repos_rev=3, wc_rev=2),
- dir1_path : Item(status=' ', repos_rev=3, wc_rev=2),
- file2_path : Item(status=' ', repos_rev=3, wc_rev=2),
- file3_path : Item(status=' ', repos_rev=3, wc_rev=2),
- dir2_path : Item(status=' ', repos_rev=3, wc_rev=2),
- file4_path : Item(status=' ', repos_rev=3, wc_rev=2),
+ file1_path : Item(status=' ', wc_rev=2),
+ dir1_path : Item(status=' ', wc_rev=2),
+ file2_path : Item(status=' ', wc_rev=2),
+ file3_path : Item(status=' ', wc_rev=2),
+ dir2_path : Item(status=' ', wc_rev=2),
+ file4_path : Item(status=' ', wc_rev=2),
})
# Expect the commits (and one noncommit) from this part of the test.
expected_status.add({
- dirA_path : Item(status=' ', repos_rev=3, wc_rev=3),
- fileA_path : Item(status=' ', repos_rev=3, wc_rev=3),
- fileB_path : Item(status=' ', repos_rev=3, wc_rev=3),
- dirB_path : Item(status=' ', repos_rev=3, wc_rev=3),
- fileC_path : Item(status=' ', repos_rev=3, wc_rev=3),
- nocommit_path : Item(status='A ', repos_rev=3, wc_rev=0)
+ dirA_path : Item(status=' ', wc_rev=3),
+ fileA_path : Item(status=' ', wc_rev=3),
+ fileB_path : Item(status=' ', wc_rev=3),
+ dirB_path : Item(status=' ', wc_rev=3),
+ fileC_path : Item(status=' ', wc_rev=3),
+ nocommit_path : Item(status='A ', wc_rev=0)
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1849,7 +1839,6 @@
# Commit should succeed
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.remove('A/C')
expected_output = svntest.wc.State(wc_dir, {
'A/C' : Item(verb='Deleting'),
Modified: trunk/subversion/tests/clients/cmdline/copy_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/copy_tes \
ts.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/copy_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/copy_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/copy_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/copy_tests.py Thu Mar 31 17:08:03 2005
@@ -177,10 +177,10 @@
expected_status.tweak('A/D/G/rho', 'A/mu', wc_rev=2)
expected_status.add({
- 'A/D/rho' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/C/alpha2' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/H/mu' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/iota' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/D/rho' : Item(status=' ', wc_rev=2),
+ 'A/C/alpha2' : Item(status=' ', wc_rev=2),
+ 'A/D/H/mu' : Item(status=' ', wc_rev=2),
+ 'A/B/F/iota' : Item(status=' ', wc_rev=2),
})
expected_status.remove('A/mu', 'iota')
@@ -200,7 +200,6 @@
'A/C/alpha2' : Item(verb='Sending'),
})
expected_status.tweak('A/C/alpha2', wc_rev=3)
- expected_status.tweak(repos_rev=3)
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
expected_status,
@@ -319,10 +318,10 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/B/newG' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/newG/pi' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/newG/rho' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/newG/tau' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/newG' : Item(status=' ', wc_rev=2),
+ 'A/B/newG/pi' : Item(status=' ', wc_rev=2),
+ 'A/B/newG/rho' : Item(status=' ', wc_rev=2),
+ 'A/B/newG/tau' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit (wc_dir,
@@ -356,10 +355,10 @@
# Create expected status tree for the update.
expected_status = svntest.actions.get_virginal_state(wc_backup, 2)
expected_status.add({
- 'A/B/newG' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/newG/pi' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/newG/rho' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/newG/tau' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/newG' : Item(status=' ', wc_rev=2),
+ 'A/B/newG/pi' : Item(status=' ', wc_rev=2),
+ 'A/B/newG/rho' : Item(status=' ', wc_rev=2),
+ 'A/B/newG/tau' : Item(status=' ', wc_rev=2),
})
# Do the update and check the results in three ways.
@@ -395,7 +394,6 @@
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.remove('A/D/G')
expected_status.remove('A/D/G/pi')
expected_status.remove('A/D/G/rho')
@@ -575,7 +573,6 @@
'A/D/G/rho' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/D/G/rho', status=' ', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
@@ -599,9 +596,9 @@
# Properties are not visible in WC status 'A'
expected_status.add({
- 'A/D/G/rho' : Item(status=' M', wc_rev='2', repos_rev='2'),
- 'A/D/G/rho_wc' : Item(status='A ', wc_rev='-', repos_rev='2', copied='+'),
- 'A/D/G/rho_url' : Item(status='A ', wc_rev='-', repos_rev='2', copied='+'),
+ 'A/D/G/rho' : Item(status=' M', wc_rev='2'),
+ 'A/D/G/rho_wc' : Item(status='A ', wc_rev='-', copied='+'),
+ 'A/D/G/rho_url' : Item(status='A ', wc_rev='-', copied='+'),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -619,12 +616,11 @@
'A/D/G/rho_wc' : Item(verb='Adding'),
'A/D/G/rho_url' : Item(verb='Adding'),
})
- expected_status.tweak(repos_rev=3)
expected_status.tweak('A/D/G/rho', status=' ', wc_rev=3)
expected_status.remove('A/D/G/rho_wc', 'A/D/G/rho_url')
expected_status.add({
- 'A/D/G/rho_wc' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'A/D/G/rho_url' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/D/G/rho_wc' : Item(status=' ', wc_rev=3),
+ 'A/D/G/rho_url' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
@@ -699,9 +695,9 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/E', 'A/B/E/alpha', 'A/B/E/beta', status='D ')
expected_status.add({
- 'A/B/F/E' : Item(status='A ', wc_rev='-', repos_rev='1', copied='+'),
- 'A/B/F/E/alpha' : Item(status=' ', wc_rev='-', repos_rev='1', copied='+'),
- 'A/B/F/E/beta' : Item(status=' ', wc_rev='-', repos_rev='1', copied='+'),
+ 'A/B/F/E' : Item(status='A ', wc_rev='-', copied='+'),
+ 'A/B/F/E/alpha' : Item(status=' ', wc_rev='-', copied='+'),
+ 'A/B/F/E/beta' : Item(status=' ', wc_rev='-', copied='+'),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -808,14 +804,14 @@
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 4)
expected_status.add({
- 'A/B/E/beta' : Item(status=' M', wc_rev=4, repos_rev=4),
- 'A/D/H/omega' : Item(status='M ', wc_rev=4, repos_rev=4),
- 'A/B/E/beta2' : Item(status=' ', wc_rev=4, repos_rev=4),
- 'A/D/H2' : Item(status=' ', wc_rev=4, repos_rev=4),
- 'A/D/H2/chi' : Item(status=' ', wc_rev=4, repos_rev=4),
- 'A/D/H2/omega' : Item(status=' ', wc_rev=4, repos_rev=4),
- 'A/D/H2/psi' : Item(status=' ', wc_rev=4, repos_rev=4),
- 'A/D/H2/beta' : Item(status=' ', wc_rev=4, repos_rev=4),
+ 'A/B/E/beta' : Item(status=' M', wc_rev=4),
+ 'A/D/H/omega' : Item(status='M ', wc_rev=4),
+ 'A/B/E/beta2' : Item(status=' ', wc_rev=4),
+ 'A/D/H2' : Item(status=' ', wc_rev=4),
+ 'A/D/H2/chi' : Item(status=' ', wc_rev=4),
+ 'A/D/H2/omega' : Item(status=' ', wc_rev=4),
+ 'A/D/H2/psi' : Item(status=' ', wc_rev=4),
+ 'A/D/H2/beta' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
@@ -858,10 +854,10 @@
expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
expected_output.add({
- 'pi' : Item(status='A ', copied='+', wc_rev='-', repos_rev=1),
- 'E' : Item(status='A ', copied='+', wc_rev='-', repos_rev=1),
- 'E/alpha' : Item(status=' ', copied='+', wc_rev='-', repos_rev=1),
- 'E/beta' : Item(status=' ', copied='+', wc_rev='-', repos_rev=1),
+ 'pi' : Item(status='A ', copied='+', wc_rev='-'),
+ 'E' : Item(status='A ', copied='+', wc_rev='-'),
+ 'E/alpha' : Item(status=' ', copied='+', wc_rev='-'),
+ 'E/beta' : Item(status=' ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_output)
@@ -894,7 +890,7 @@
expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
expected_output.add({
- 'C' : Item(status='A ', copied='+', wc_rev='-', repos_rev=1),
+ 'C' : Item(status='A ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_output)
@@ -921,7 +917,7 @@
expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
expected_output.add({
- 'pi' : Item(status='A ', wc_rev='0', repos_rev=1),
+ 'pi' : Item(status='A ', wc_rev='0'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_output)
@@ -982,12 +978,12 @@
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
- 'A/B/F/B' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/B/E' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/B/E/alpha' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/B/E/beta' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/B/F' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/B/lambda' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/F/B' : Item(status=' ', wc_rev=2),
+ 'A/B/F/B/E' : Item(status=' ', wc_rev=2),
+ 'A/B/F/B/E/alpha' : Item(status=' ', wc_rev=2),
+ 'A/B/F/B/E/beta' : Item(status=' ', wc_rev=2),
+ 'A/B/F/B/F' : Item(status=' ', wc_rev=2),
+ 'A/B/F/B/lambda' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
@@ -1051,18 +1047,18 @@
'F/B/lambda' : Item("This is the file 'lambda'."),
})
expected_status = svntest.wc.State(wc_dir, {
- '' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'E' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'E/alpha' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'E/beta' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'F' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'lambda' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'F/B' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'F/B/E' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'F/B/E/alpha' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'F/B/E/beta' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'F/B/F' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'F/B/lambda' : Item(status=' ', wc_rev=2, repos_rev=2),
+ '' : Item(status=' ', wc_rev=2),
+ 'E' : Item(status=' ', wc_rev=2),
+ 'E/alpha' : Item(status=' ', wc_rev=2),
+ 'E/beta' : Item(status=' ', wc_rev=2),
+ 'F' : Item(status=' ', wc_rev=2),
+ 'lambda' : Item(status=' ', wc_rev=2),
+ 'F/B' : Item(status=' ', wc_rev=2),
+ 'F/B/E' : Item(status=' ', wc_rev=2),
+ 'F/B/E/alpha' : Item(status=' ', wc_rev=2),
+ 'F/B/E/beta' : Item(status=' ', wc_rev=2),
+ 'F/B/F' : Item(status=' ', wc_rev=2),
+ 'F/B/lambda' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
@@ -1104,7 +1100,7 @@
# status should now show the file scheduled for addition-with-history
expected_status.add({
- 'rho' : Item(status='A ', copied='+', wc_rev='-', repos_rev=2),
+ 'rho' : Item(status='A ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_status)
@@ -1305,7 +1301,6 @@
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
- expected_status.tweak(repos_rev=2)
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
expected_status,
@@ -1317,18 +1312,18 @@
svntest.actions.run_and_verify_svn(None, None, [],
'copy', '-r1', E_url, E_path)
expected_status.add({
- 'A/B/E' : Item(status='A ', copied='+', wc_rev='-', repos_rev=2),
- 'A/B/E/alpha' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
- 'A/B/E/beta' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
+ 'A/B/E' : Item(status='A ', copied='+', wc_rev='-'),
+ 'A/B/E/alpha' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B/E/beta' : Item(status=' ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_status)
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
- 'A/B/E' : Item(status='A ', copied='+', wc_rev='-', repos_rev=2),
- 'A/B/E/alpha' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
- 'A/B/E/beta' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
+ 'A/B/E' : Item(status='A ', copied='+', wc_rev='-'),
+ 'A/B/E/alpha' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B/E/beta' : Item(status=' ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_status)
@@ -1399,7 +1394,6 @@
# Commit to get state deleted
expected_status.remove('A/B/E/alpha', 'A/B/lambda', 'A/B/F')
- expected_status.tweak(repos_rev=2)
expected_output = svntest.wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Deleting'),
'A/B/lambda' : Item(verb='Deleting'),
@@ -1421,7 +1415,6 @@
'A/B2/lambda' : Item(status='D ', wc_rev='-', copied='+'),
'A/B2/F' : Item(status='D ', wc_rev='-', copied='+'),
})
- expected_status.tweak(repos_rev=2)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Stuff copied from state deleted=true is now schedule=delete.
@@ -1462,7 +1455,6 @@
'A/B2/E' : Item(status=' ', wc_rev=3),
'A/B2/E/beta' : Item(status=' ', wc_rev=3),
})
- expected_status.tweak(repos_rev=3)
expected_output = svntest.wc.State(wc_dir, {
'A/B2' : Item(verb='Adding'),
'A/B2/E/alpha' : Item(verb='Deleting'),
Modified: trunk/subversion/tests/clients/cmdline/diff_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/diff_tes \
ts.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/diff_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/diff_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/diff_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/diff_tests.py Thu Mar 31 17:08:03 2005
@@ -692,7 +692,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/theta' : Item(status=' ', wc_rev=2),
})
# Commit the new binary file, creating revision 2.
@@ -711,7 +711,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/theta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_update(wc_dir,
@@ -757,7 +757,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=2)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/theta' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -926,7 +926,7 @@
expected_output = svntest.actions.get_virginal_state(wc_dir, 2)
expected_output.add({
- 'A/D/newfile' : Item(status='A ', wc_rev=0, repos_rev=2),
+ 'A/D/newfile' : Item(status='A ', wc_rev=0),
})
expected_output.tweak('A/mu', status='D ')
expected_output.tweak('iota', status='M ')
@@ -974,7 +974,7 @@
expected_status.tweak('iota', wc_rev=3)
expected_status.remove('A/mu')
expected_status.add({
- 'A/D/newfile' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/D/newfile' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -990,7 +990,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.remove('A/mu')
expected_status.add({
- 'A/D/newfile' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/D/newfile' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_update(wc_dir, expected_output,
expected_disk, expected_status)
@@ -1718,7 +1718,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'iota' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'iota' : Item(status=' ', wc_rev=2),
})
# Commit iota, creating revision 2.
@@ -1737,7 +1737,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'iota' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'iota' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
Modified: trunk/subversion/tests/clients/cmdline/externals_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/external \
s_tests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/externals_tes \
ts.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/externals_tests.py&r2=13814 \
==============================================================================
--- trunk/subversion/tests/clients/cmdline/externals_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/externals_tests.py Thu Mar 31 17:08:03 \
2005 @@ -164,7 +164,6 @@
})
expected_status = svntest.actions.get_virginal_state(wc_init_dir, 5)
- expected_status.tweak(repos_rev=6)
expected_status.tweak('A/C', 'A/D', wc_rev=6, status=' ')
svntest.actions.run_and_verify_commit(wc_init_dir,
@@ -538,7 +537,6 @@
'A/D/gamma' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(other_wc_dir, 5)
- expected_status.tweak(repos_rev=6)
expected_status.tweak('A/D/gamma', wc_rev=6)
svntest.actions.run_and_verify_commit(other_wc_dir,
expected_output,
@@ -574,7 +572,6 @@
'A/D/G/rho' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(other_wc_dir, 5)
- expected_status.tweak(repos_rev=7)
expected_status.tweak('A/D/gamma', wc_rev=6)
expected_status.tweak('A/D/G/rho', wc_rev=7)
svntest.actions.run_and_verify_commit(other_wc_dir,
Modified: trunk/subversion/tests/clients/cmdline/history_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/history_ \
tests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/history_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/history_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/history_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/history_tests.py Thu Mar 31 17:08:03 2005
@@ -55,7 +55,7 @@
expected_status.tweak(wc_rev=1)
expected_status.remove('A/D/G/rho');
expected_status.add({ 'A/D/G/bloo' :
- Item(wc_rev=2, repos_rev=2, status=' ') })
+ Item(wc_rev=2, status=' ') })
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
@@ -82,7 +82,7 @@
expected_status.remove('A/D/G/pi');
expected_status.tweak('A/D/G/rho', wc_rev=3)
expected_status.add({ 'A/D/G/bloo' :
- Item(wc_rev=2, repos_rev=3, status=' ') })
+ Item(wc_rev=2, status=' ') })
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
@@ -126,7 +126,6 @@
# svn up -r1
svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r', '1', wc_dir)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# svn cat -rHEAD rho --> should see 'unrelated object' error.
Modified: trunk/subversion/tests/clients/cmdline/log_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/log_test \
s.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/log_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/log_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/log_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/log_tests.py Thu Mar 31 17:08:03 2005
@@ -152,7 +152,7 @@
expected_status = svntest.actions.get_virginal_state(wc_path, 9)
expected_status.remove('A/B/E/alpha')
expected_status.add({
- 'A/C/epsilon' : Item(status=' ', wc_rev=9, repos_rev=9),
+ 'A/C/epsilon' : Item(status=' ', wc_rev=9),
})
# props exist on A/B and A/mu
Modified: trunk/subversion/tests/clients/cmdline/merge_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/merge_te \
sts.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/merge_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/merge_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/merge_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/merge_tests.py Thu Mar 31 17:08:03 2005
@@ -241,7 +241,6 @@
+ ">>>>>>> .merge-right.r3\n")
expected_status = svntest.actions.get_virginal_state(other_wc, 1)
- expected_status.tweak(repos_rev=3)
expected_status.tweak('A/mu', wc_rev=2)
expected_status.tweak('A/B/lambda', status='M ')
expected_status.tweak('A/D/G/pi', status='M ')
@@ -346,7 +345,6 @@
'pi' : Item(wc_rev=1, status='G '),
'tau' : Item(wc_rev=1, status='C '),
})
- expected_status.tweak(repos_rev=3)
expected_status.tweak('pi', status='M ')
expected_status.tweak('rho', status='M ')
expected_status.tweak('tau', status='C ')
@@ -394,9 +392,9 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/B/F/Q' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/Q/bar' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/foo' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/F/Q' : Item(status=' ', wc_rev=2),
+ 'A/B/F/Q/bar' : Item(status=' ', wc_rev=2),
+ 'A/B/F/foo' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -417,10 +415,10 @@
'foo' : Item("foo"),
})
expected_status = wc.State(C_path, {
- '' : Item(status=' ', wc_rev=1, repos_rev=2),
- 'Q' : Item(status='A ', wc_rev='-', copied='+', repos_rev=2),
- 'Q/bar' : Item(status='A ', wc_rev='-', copied='+', repos_rev=2),
- 'foo' : Item(status='A ', wc_rev='-', copied='+', repos_rev=2),
+ '' : Item(status=' ', wc_rev=1),
+ 'Q' : Item(status='A ', wc_rev='-', copied='+'),
+ 'Q/bar' : Item(status='A ', wc_rev='-', copied='+'),
+ 'foo' : Item(status='A ', wc_rev='-', copied='+'),
})
expected_skip = wc.State(C_path, { })
svntest.actions.run_and_verify_merge(C_path, '1', '2', F_url,
@@ -437,12 +435,12 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/B/F/Q' : Item(status=' ', wc_rev=2, repos_rev=3),
- 'A/B/F/Q/bar' : Item(status=' ', wc_rev=2, repos_rev=3),
- 'A/B/F/foo' : Item(status=' ', wc_rev=2, repos_rev=3),
- 'A/C/Q' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'A/C/Q/bar' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'A/C/foo' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/B/F/Q' : Item(status=' ', wc_rev=2),
+ 'A/B/F/Q/bar' : Item(status=' ', wc_rev=2),
+ 'A/B/F/foo' : Item(status=' ', wc_rev=2),
+ 'A/C/Q' : Item(status=' ', wc_rev=3),
+ 'A/C/Q/bar' : Item(status=' ', wc_rev=3),
+ 'A/C/foo' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -474,12 +472,12 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/B2' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B2/E' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B2/E/alpha' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B2/E/beta' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B2/F' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B2/lambda' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B2' : Item(status=' ', wc_rev=2),
+ 'A/B2/E' : Item(status=' ', wc_rev=2),
+ 'A/B2/E/alpha' : Item(status=' ', wc_rev=2),
+ 'A/B2/E/beta' : Item(status=' ', wc_rev=2),
+ 'A/B2/F' : Item(status=' ', wc_rev=2),
+ 'A/B2/lambda' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -499,7 +497,6 @@
'A/B/E' : Item(verb='Deleting'),
'A/B/lambda' : Item(verb='Deleting'),
})
- expected_status.tweak(repos_rev=3)
expected_status.remove('A/B/E',
'A/B/E/alpha',
'A/B/E/beta',
@@ -542,7 +539,7 @@
'F' : Item(status=' '),
'lambda' : Item(status=' M'),
})
- expected_status.tweak(wc_rev=2, repos_rev=3)
+ expected_status.tweak(wc_rev=2)
expected_skip = wc.State(B2_path, {
'lambda' : Item(),
'E' : Item(),
@@ -602,7 +599,6 @@
'A/B/E/alpha' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/B/E', 'A/B/E/alpha', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
@@ -633,15 +629,14 @@
# Commit change as rev 4
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
- expected_status.tweak(repos_rev=4)
expected_status.tweak('A/B/E', 'A/B/E/alpha', wc_rev=4, status=' ')
expected_status.add({
- 'A/B2' : Item(status=' ', wc_rev=3, repos_rev=4),
- 'A/B2/E' : Item(status=' ', wc_rev=3, repos_rev=4),
- 'A/B2/E/alpha' : Item(status=' ', wc_rev=3, repos_rev=4),
- 'A/B2/E/beta' : Item(status=' ', wc_rev=3, repos_rev=4),
- 'A/B2/F' : Item(status=' ', wc_rev=3, repos_rev=4),
- 'A/B2/lambda' : Item(status=' ', wc_rev=3, repos_rev=4),
+ 'A/B2' : Item(status=' ', wc_rev=3),
+ 'A/B2/E' : Item(status=' ', wc_rev=3),
+ 'A/B2/E/alpha' : Item(status=' ', wc_rev=3),
+ 'A/B2/E/beta' : Item(status=' ', wc_rev=3),
+ 'A/B2/F' : Item(status=' ', wc_rev=3),
+ 'A/B2/lambda' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
@@ -675,7 +670,7 @@
'F' : Item(status=' '),
'lambda' : Item(status=' '),
})
- expected_status.tweak(wc_rev=4, repos_rev=4)
+ expected_status.tweak(wc_rev=4)
expected_skip = wc.State('', { })
svntest.actions.run_and_verify_merge(B2_path, '3', '4', B_url,
expected_output,
@@ -789,11 +784,11 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/D/Q' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/Q/pi' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/Q/rho' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/Q/tau' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/Q/newfile' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/D/Q' : Item(status=' ', wc_rev=2),
+ 'A/D/Q/pi' : Item(status=' ', wc_rev=2),
+ 'A/D/Q/rho' : Item(status=' ', wc_rev=2),
+ 'A/D/Q/tau' : Item(status=' ', wc_rev=2),
+ 'A/D/Q/newfile' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -806,7 +801,6 @@
'A/D/Q/newfile' : Item(verb='Sending'),
})
expected_status.tweak('A/D/Q/newfile', wc_rev=3)
- expected_status.tweak(repos_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
@@ -823,7 +817,7 @@
'rho' : Item(),
'tau' : Item(),
})
- expected_status.tweak(status=' ', wc_rev=1, repos_rev=3)
+ expected_status.tweak(status=' ', wc_rev=1)
expected_disk = wc.State('', {
'pi' : Item("This is the file 'pi'."),
'rho' : Item("This is the file 'rho'."),
@@ -886,7 +880,7 @@
'F' : Item(status=' '),
'lambda' : Item(status='M '),
})
- expected_status.tweak(wc_rev=4, repos_rev=4)
+ expected_status.tweak(wc_rev=4)
expected_skip = wc.State(I_path, {
'E' : Item(),
'E/alpha' : Item(),
@@ -971,7 +965,7 @@
'A/B/beta' : Item(status='D '),
'iota' : Item(status=' '),
})
- expected_status.tweak(wc_rev=2, repos_rev=2)
+ expected_status.tweak(wc_rev=2)
expected_status.tweak('A/B/zeta', wc_rev='-')
svntest.actions.run_and_verify_status(apply_path, expected_status)
@@ -1150,9 +1144,8 @@
# but mu should be at revision 2.
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
- expected_status.tweak('A', repos_rev=2)
expected_status.tweak('A/mu', wc_rev=2)
- expected_status.add({'A/zot' : Item(status=' ', wc_rev=2, repos_rev=2)})
+ expected_status.add({'A/zot' : Item(status=' ', wc_rev=2)})
# Initial commit.
svntest.actions.run_and_verify_commit (wc_dir,
@@ -1246,7 +1239,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/theta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -1264,7 +1257,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/theta' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -1284,7 +1277,7 @@
expected_status = svntest.actions.get_virginal_state(other_wc, 3)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status='M ', wc_rev=2, repos_rev=3),
+ 'A/theta' : Item(status='M ', wc_rev=2),
})
expected_skip = wc.State('', { })
svntest.actions.run_and_verify_merge(other_wc, '2', '3',
@@ -1344,7 +1337,6 @@
'beta' : Item(status=' ', wc_rev=2),
'newfile' : Item(status='A ', wc_rev='-', copied='+')
})
- expected_status.tweak(repos_rev=3)
expected_skip = wc.State('', { })
svntest.actions.run_and_verify_merge(branch_path, '1', 'HEAD', trunk_url,
expected_output,
@@ -1387,9 +1379,9 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/B/F/Q' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/Q/bar' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/foo' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/F/Q' : Item(status=' ', wc_rev=2),
+ 'A/B/F/Q/bar' : Item(status=' ', wc_rev=2),
+ 'A/B/F/foo' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -1416,9 +1408,9 @@
'foo' : Item("foo"),
})
expected_status = wc.State(C_path, {
- '' : Item(status=' ', wc_rev=1, repos_rev=2),
- 'Q' : Item(status='A ', wc_rev='-', copied='+', repos_rev=2),
- 'Q/bar' : Item(status='A ', wc_rev='-', copied='+', repos_rev=2),
+ '' : Item(status=' ', wc_rev=1),
+ 'Q' : Item(status='A ', wc_rev='-', copied='+'),
+ 'Q/bar' : Item(status='A ', wc_rev='-', copied='+'),
})
expected_skip = wc.State(C_path, {
'foo' : Item(),
@@ -1452,8 +1444,8 @@
'foo' : Item("foo"),
})
expected_status = wc.State(C_path, {
- '' : Item(status=' ', wc_rev=1, repos_rev=2),
- 'foo' : Item(status='A ', wc_rev='-', copied='+', repos_rev=2),
+ '' : Item(status=' ', wc_rev=1),
+ 'foo' : Item(status='A ', wc_rev='-', copied='+'),
})
expected_skip = wc.State(C_path, {
'Q' : Item(),
@@ -1481,7 +1473,6 @@
'iota' : Item(verb='Deleting'),
})
expected_status = pre_merge_status
- expected_status.tweak(repos_rev=3)
expected_status.remove('iota', 'A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -1529,7 +1520,6 @@
expected_output = wc.State(wc_dir, {
'A/B/lambda' : Item(verb='Sending'),
})
- expected_status.tweak(repos_rev=4)
expected_status.tweak('A/B/lambda', wc_rev=4)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -1542,7 +1532,6 @@
expected_output = wc.State(wc_dir, {
'A/B/lambda' : Item(verb='Deleting'),
})
- expected_status.tweak(repos_rev=5)
expected_status.remove('A/B/lambda')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -1583,7 +1572,6 @@
expected_status.add({
'A/B/lambda' : Item(wc_rev=6, status=' '),
})
- expected_status.tweak(repos_rev=6)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
@@ -1630,8 +1618,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/B/F/Q' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/F/foo' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/F/Q' : Item(status=' ', wc_rev=2),
+ 'A/B/F/foo' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -1654,11 +1642,10 @@
'A/B/F/Q/baz' : Item(verb='Adding'),
})
expected_status.add({
- 'A/B/F/Q/R' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'A/B/F/Q/R/bar' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'A/B/F/Q/baz' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/B/F/Q/R' : Item(status=' ', wc_rev=3),
+ 'A/B/F/Q/R/bar' : Item(status=' ', wc_rev=3),
+ 'A/B/F/Q/baz' : Item(status=' ', wc_rev=3),
})
- expected_status.tweak(repos_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
@@ -1677,7 +1664,6 @@
'foo' : Item(status='! ', wc_rev=2),
### Why no 'Q'?
})
- expected_status.tweak(repos_rev=3)
expected_skip = wc.State(F_path, {
'Q' : Item(),
'foo' : Item(),
@@ -1717,7 +1703,6 @@
'A/B/F/foo' : Item(status='! ', wc_rev=2),
### Why no 'A/B/F/Q'?
})
- expected_status.tweak(repos_rev=3)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
#----------------------------------------------------------------------
@@ -1741,9 +1726,8 @@
'A/B/E/zig' : Item(verb='Adding'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.add({
- 'A/B/E/zig' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/E/zig' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
@@ -1807,10 +1791,9 @@
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.add({
- 'I' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'I/theta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'I' : Item(status=' ', wc_rev=2),
+ 'I/theta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1829,10 +1812,9 @@
'J' : Item(verb='Adding'),
})
- expected_status.tweak(repos_rev=3)
expected_status.add({
- 'J' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'J/theta' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'J' : Item(status=' ', wc_rev=3),
+ 'J/theta' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1851,9 +1833,8 @@
'K' : Item(verb='Adding'),
})
- expected_status.tweak(repos_rev=4)
expected_status.add({
- 'K' : Item(status=' ', wc_rev=4, repos_rev=4),
+ 'K' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1872,9 +1853,8 @@
'K/theta' : Item(verb='Adding (bin)'),
})
- expected_status.tweak(repos_rev=5)
expected_status.add({
- 'K/theta' : Item(status=' ', wc_rev=5, repos_rev=5),
+ 'K/theta' : Item(status=' ', wc_rev=5),
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1892,7 +1872,6 @@
'I/theta' : Item(verb='Sending'),
})
- expected_status.tweak(repos_rev=6)
expected_status.tweak('I/theta', wc_rev=6)
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1912,10 +1891,9 @@
'L/theta' : Item(verb='Adding (bin)'),
})
- expected_status.tweak(repos_rev=7)
expected_status.add({
- 'L' : Item(status=' ', wc_rev=7, repos_rev=7),
- 'L/theta' : Item(status=' ', wc_rev=7, repos_rev=7),
+ 'L' : Item(status=' ', wc_rev=7),
+ 'L/theta' : Item(status=' ', wc_rev=7),
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1997,18 +1975,17 @@
for target in targets:
key = 'A/B/E/%s' % target[1]
expected_output_dic[key] = Item(verb='Adding')
- expected_status_dic[key] = Item(status=' ', wc_rev=2, repos_rev=2)
+ expected_status_dic[key] = Item(status=' ', wc_rev=2)
if target[2]:
key = 'A/B/E/%s/%s' % (target[1], target[2])
expected_output_dic[key] = Item(verb='Adding')
- expected_status_dic[key] = Item(status=' ', wc_rev=2, repos_rev=2)
+ expected_status_dic[key] = Item(status=' ', wc_rev=2)
expected_output = wc.State(wc_dir, expected_output_dic)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.add(expected_status_dic)
svntest.actions.run_and_verify_commit(wc_dir,
@@ -2117,9 +2094,9 @@
expected_status = svntest.actions.get_virginal_state(wcpath, 4)
expected_status.add({
- 't' : Item(status=' ', wc_rev=4, repos_rev=4),
- 't/f' : Item(status=' ', wc_rev=4, repos_rev=4),
- 'b' : Item(status=' ', wc_rev=4, repos_rev=4),
+ 't' : Item(status=' ', wc_rev=4),
+ 't/f' : Item(status=' ', wc_rev=4),
+ 'b' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_status(wcpath, expected_status)
@@ -2131,8 +2108,8 @@
'f' : Item("$Revision: 4 $"),
})
expected_status = wc.State(bpath, {
- '' : Item(status=' ', wc_rev=4, repos_rev=4),
- 'f' : Item(status='A ', wc_rev='-', copied='+', repos_rev=4),
+ '' : Item(status=' ', wc_rev=4),
+ 'f' : Item(status='A ', wc_rev='-', copied='+'),
})
expected_skip = wc.State(bpath, { })
svntest.actions.run_and_verify_merge(bpath, '2', 'HEAD',
@@ -2160,7 +2137,6 @@
'A/B/E/alpha' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/B/E/alpha', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
@@ -2173,7 +2149,6 @@
expected_output = wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Deleting'),
})
- expected_status.tweak(repos_rev=3)
expected_status.tweak(wc_rev=2)
expected_status.remove('A/B/E/alpha')
svntest.actions.run_and_verify_commit(wc_dir,
@@ -2196,6 +2171,129 @@
#----------------------------------------------------------------------
+# A merge that replaces a directory
+# Tests for Issue #2144
+
+def merge_dir_replace(sbox):
+ "merge a replacement of a directory"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ C_path = os.path.join(wc_dir, 'A', 'C')
+ F_path = os.path.join(wc_dir, 'A', 'B', 'F')
+ F_url = svntest.main.current_repo_url + '/A/B/F'
+
+ foo_path = os.path.join(F_path, 'foo')
+
+ # Create foo in F
+ svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
+
+ expected_output = wc.State(wc_dir, {
+ 'A/B/F/foo' : Item(verb='Adding'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status.tweak(wc_rev=1)
+ expected_status.add({
+ 'A/B/F/foo' : Item(status=' ', wc_rev=2),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None, None, None, None, None,
+ wc_dir)
+
+ # Merge foo onto C
+ expected_output = wc.State(C_path, {
+ 'foo' : Item(status='A '),
+ })
+ expected_disk = wc.State('', {
+ 'foo' : Item(),
+ })
+ expected_status = wc.State(C_path, {
+ '' : Item(status=' ', wc_rev=1),
+ 'foo' : Item(status='A ', wc_rev='-', copied='+'),
+ })
+ expected_skip = wc.State(C_path, { })
+ svntest.actions.run_and_verify_merge(C_path, '1', '2', F_url,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip)
+
+ # Commit merge of foo onto C
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/C/foo' : Item(verb='Adding'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
+ expected_status.tweak(wc_rev=1)
+ expected_status.add({
+ 'A/B/F/foo' : Item(status=' ', wc_rev=2),
+ 'A/C/foo' : Item(status=' ', wc_rev=3),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None, None, None, None, None,
+ wc_dir)
+
+ # Delete foo on F
+ svntest.actions.run_and_verify_svn(None, None, [], 'rm', foo_path)
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/B/F/foo' : Item(verb='Deleting'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 4)
+ expected_status.tweak(wc_rev=1)
+ expected_status.add({
+ 'A/C/foo' : Item(status=' ', wc_rev=3),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None, None, None, None, None,
+ wc_dir)
+
+ # Recreate foo in F
+ svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
+
+ expected_output = wc.State(wc_dir, {
+ 'A/B/F/foo' : Item(verb='Adding'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 5)
+ expected_status.tweak(wc_rev=1)
+ expected_status.add({
+ 'A/B/F/foo' : Item(status=' ', wc_rev=5),
+ 'A/C/foo' : Item(status=' ', wc_rev=3),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None, None, None, None, None,
+ wc_dir)
+ # Merge replacement of foo onto C
+ expected_output = wc.State(C_path, {
+ 'foo' : Item(status='D '),
+ 'foo' : Item(status='A '),
+ })
+ expected_disk = wc.State('', {
+ 'foo' : Item(),
+ })
+ expected_status = wc.State(C_path, {
+ '' : Item(status=' ', wc_rev=1),
+ 'foo' : Item(status='R ', wc_rev='-', copied='+'),
+ })
+ expected_skip = wc.State(C_path, { })
+ svntest.actions.run_and_verify_merge(C_path, '2', '5', F_url,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, None, None, None, None,
+ 0, # skip props
+ 0) # don't do a dry-run the output differs
+
+
+#----------------------------------------------------------------------
def merge_file_with_space_in_its_name(sbox):
"merge a file whose name contains a space"
# For issue #2144
@@ -2253,7 +2351,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/B/F/foo' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/F/foo' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
Modified: trunk/subversion/tests/clients/cmdline/prop_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/prop_tes \
ts.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/prop_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/prop_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/prop_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/prop_tests.py Thu Mar 31 17:08:03 2005
@@ -112,7 +112,6 @@
# Created expected status tree.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/mu', 'A/D/H', wc_rev=2, status=' ')
# Commit the one file.
@@ -153,7 +152,6 @@
# Created expected status tree.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/mu', 'A/D/H', wc_rev=2, status=' ')
# Commit the one file.
@@ -211,7 +209,6 @@
# Created expected status tree.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('iota', wc_rev=2, status=' ')
# Commit the one file.
@@ -230,7 +227,6 @@
# Created expected status tree.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
expected_status.tweak('iota', wc_rev=2, status=' ')
expected_status.tweak('A/mu', wc_rev=3, status=' ')
@@ -251,7 +247,6 @@
# Create expected status tree for the update.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
# Do the update and check the results in three ways... INCLUDING PROPS
svntest.actions.run_and_verify_update(wc_dir,
@@ -287,7 +282,6 @@
# Created expected status tree.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
expected_status.tweak('iota', wc_rev=3, status=' ')
# Commit the one file.
@@ -411,7 +405,6 @@
# Sanity check: the two files should be scheduled for (R)eplacement.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('iota', wc_rev=2, status='R ')
expected_status.tweak('A/B/lambda', wc_rev=2, status='R ')
@@ -430,7 +423,6 @@
# Expected status tree: lambda has one prop, iota doesn't.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
expected_status.tweak('iota', wc_rev=3)
expected_status.tweak('A/B/lambda', wc_rev=3, status=' ')
@@ -469,7 +461,6 @@
# Sanity check: the two files should be scheduled for (R)eplacement.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('iota', wc_rev=2, status='R ')
expected_status.tweak('A/B/lambda', wc_rev=2, status='R ')
@@ -931,7 +922,6 @@
'A/mu' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A', 'A/B', 'iota', 'A/B/lambda', 'A/mu',
wc_rev=2, status=' ')
@@ -1035,11 +1025,10 @@
# Test recursive propset (issue 1794)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/mu', status='D ', wc_rev=2)
expected_status.tweak('iota', status=' M', wc_rev=2)
expected_status.add({
- 'A/added' : Item(status='A ', repos_rev=2, wc_rev=0),
+ 'A/added' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
Modified: trunk/subversion/tests/clients/cmdline/revert_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/revert_t \
ests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/revert_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/revert_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/revert_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/revert_tests.py Thu Mar 31 17:08:03 2005
@@ -169,7 +169,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'file1' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'file1' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit (wc_dir, expected_output,
@@ -196,7 +196,7 @@
None, 'revert', file1_path)
# test that file1 really was reverted
- expected_status.tweak('file1', status=' ', wc_rev=2, repos_rev=2)
+ expected_status.tweak('file1', status=' ', wc_rev=2)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
Modified: trunk/subversion/tests/clients/cmdline/schedule_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/schedule \
_tests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/schedule_tests \
.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/schedule_tests.py&r2=13814 \
==============================================================================
--- trunk/subversion/tests/clients/cmdline/schedule_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/schedule_tests.py Thu Mar 31 17:08:03 2005
@@ -69,9 +69,9 @@
# Make sure the adds show up as such in status
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'delta' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/B/zeta' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/G/epsilon' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'delta' : Item(status='A ', wc_rev=0),
+ 'A/B/zeta' : Item(status='A ', wc_rev=0),
+ 'A/D/G/epsilon' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -98,9 +98,9 @@
# Make sure the adds show up as such in status
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'X' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/C/Y' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/H/Z' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'X' : Item(status='A ', wc_rev=0),
+ 'A/C/Y' : Item(status='A ', wc_rev=0),
+ 'A/D/H/Z' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -148,16 +148,16 @@
# Make sure the adds show up as such in status
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'X' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/C/Y' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/H/Z' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'X/P' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/C/Y/Q' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/H/Z/R' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'X/delta' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/C/Y/epsilon' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/C/Y/upsilon' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/H/Z/zeta' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'X' : Item(status='A ', wc_rev=0),
+ 'A/C/Y' : Item(status='A ', wc_rev=0),
+ 'A/D/H/Z' : Item(status='A ', wc_rev=0),
+ 'X/P' : Item(status='A ', wc_rev=0),
+ 'A/C/Y/Q' : Item(status='A ', wc_rev=0),
+ 'A/D/H/Z/R' : Item(status='A ', wc_rev=0),
+ 'X/delta' : Item(status='A ', wc_rev=0),
+ 'A/C/Y/epsilon' : Item(status='A ', wc_rev=0),
+ 'A/C/Y/upsilon' : Item(status='A ', wc_rev=0),
+ 'A/D/H/Z/zeta' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -469,10 +469,10 @@
# Make sure the 4 adds show up as such in status
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'file1' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'file2' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'dir1' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'dir2' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'file1' : Item(status='A ', wc_rev=0),
+ 'file2' : Item(status='A ', wc_rev=0),
+ 'dir1' : Item(status='A ', wc_rev=0),
+ 'dir2' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -589,7 +589,6 @@
'A' : Item(status='A ', wc_rev=0),
'iota' : Item(status=' ', wc_rev=1),
})
- expected_status.tweak(repos_rev=2)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Update will *not* remove the entry for A despite it being marked
@@ -630,9 +629,9 @@
# Make sure the adds show up as such in status
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'delta' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/B/zeta' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'A/D/G/epsilon' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'delta' : Item(status='A ', wc_rev=0),
+ 'A/B/zeta' : Item(status='A ', wc_rev=0),
+ 'A/D/G/epsilon' : Item(status='A ', wc_rev=0),
})
return svntest.actions.run_and_verify_status(wc_dir, expected_status)
Modified: trunk/subversion/tests/clients/cmdline/special_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/special_ \
tests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/special_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/special_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/special_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/special_tests.py Thu Mar 31 17:08:03 2005
@@ -69,8 +69,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'newfile' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'linktarget' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'newfile' : Item(status=' ', wc_rev=2),
+ 'linktarget' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -113,8 +113,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=2)
expected_status.add({
- 'newfile' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'linktarget' : Item(status=' ', wc_rev=2, repos_rev=3),
+ 'newfile' : Item(status=' ', wc_rev=3),
+ 'linktarget' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -230,8 +230,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/D/H/newfile' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/H/linktarget' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/D/H/newfile' : Item(status=' ', wc_rev=2),
+ 'A/D/H/linktarget' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -244,12 +244,12 @@
# 'svn status' should show just "A/D/H2 A +". Nothing broken.
expected_status.add({
- 'A/D/H2' : Item(status='A ', copied='+', wc_rev='-', repos_rev=2),
- 'A/D/H2/chi' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
- 'A/D/H2/omega' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
- 'A/D/H2/psi' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
- 'A/D/H2/linktarget' : Item(status=' ', copied='+',wc_rev='-',repos_rev=2),
- 'A/D/H2/newfile' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
+ 'A/D/H2' : Item(status='A ', copied='+', wc_rev='-'),
+ 'A/D/H2/chi' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/D/H2/omega' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/D/H2/psi' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/D/H2/linktarget' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/D/H2/newfile' : Item(status=' ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_status)
@@ -275,8 +275,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'newfile' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'linktarget' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'newfile' : Item(status=' ', wc_rev=2),
+ 'linktarget' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -328,8 +328,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'newfile' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'linktarget' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'newfile' : Item(status=' ', wc_rev=2),
+ 'linktarget' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -347,7 +347,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'linktarget' : Item(status=' ', wc_rev=2, repos_rev=3),
+ 'linktarget' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
Modified: trunk/subversion/tests/clients/cmdline/stat_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/stat_tes \
ts.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/stat_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/stat_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/stat_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/stat_tests.py Thu Mar 31 17:08:03 2005
@@ -88,8 +88,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'newdir' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'newdir/newfile' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'newdir' : Item(status=' ', wc_rev=2),
+ 'newdir/newfile' : Item(status=' ', wc_rev=2),
})
# Commit.
@@ -807,7 +807,7 @@
svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'foo' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'foo' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
Modified: trunk/subversion/tests/clients/cmdline/svnlook_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/svnlook_ \
tests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/svnlook_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/svnlook_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/svnlook_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/svnlook_tests.py Thu Mar 31 17:08:03 2005
@@ -153,8 +153,8 @@
expected_status.tweak(wc_rev=1)
expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
expected_status.add({
- 'A/B/E2' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/E2/beta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/B/E2' : Item(status=' ', wc_rev=2),
+ 'A/B/E2/beta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit (wc_dir,
expected_output,
Modified: trunk/subversion/tests/clients/cmdline/svntest/actions.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/svntest/ \
actions.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/svntest/actio \
ns.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/svntest/actions.py&r2=13814 \
==============================================================================
--- trunk/subversion/tests/clients/cmdline/svntest/actions.py (original)
+++ trunk/subversion/tests/clients/cmdline/svntest/actions.py Thu Mar 31 17:08:03 \
2005 @@ -776,7 +776,7 @@
state = main.greek_state.copy()
state.wc_dir = wc_dir
state.desc[''] = wc.StateItem()
- state.tweak(contents=None, status=' ', wc_rev=rev, repos_rev=rev)
+ state.tweak(contents=None, status=' ', wc_rev=rev)
return state
Modified: trunk/subversion/tests/clients/cmdline/svntest/tree.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/svntest/ \
tree.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/svntest/tree.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/svntest/tree.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/svntest/tree.py (original)
+++ trunk/subversion/tests/clients/cmdline/svntest/tree.py Thu Mar 31 17:08:03 2005
@@ -116,9 +116,9 @@
# - in the 'svn status' use-case (which is always run with the -v
# (--verbose) flag), each line of output contains a working revision
# number and a two-letter status code similar to the 'svn co/up'
-# case. The repository revision is also printed. All of this
-# information is stored in attributes named 'wc_rev', 'status', and
-# 'repos_rev', respectively.
+# case. This information is stored in attributes named 'wc_rev'
+# and 'status'. The repository revision is also printed, but it
+# is ignored.
# - in the working-copy use-case, the att-hash is ignored.
@@ -614,22 +614,15 @@
#
# Tree nodes will contain no contents, and these atts:
#
-# 'status', 'wc_rev', 'repos_rev',
+# 'status', 'wc_rev',
# ... and possibly 'locked', 'copied', 'writelocked',
# IFF columns non-empty.
#
def build_tree_from_status(lines):
- "Return a tree derived by parsing the output LINES from 'st'."
+ "Return a tree derived by parsing the output LINES from 'st -vuq'."
root = SVNTreeNode(root_node_name)
- rm = re.compile ('^.+\:.+(\d+)')
- lastline = string.strip(lines.pop())
- match = rm.search(lastline)
- if match and match.groups():
- repos_rev = match.group(1)
- else:
- repos_rev = '?'
# Try http://www.wordsmith.org/anagram/anagram.cgi?anagram=ACDRMGU
rm = re.compile ('^([!MACDRUG_ ][MACDRUG_ ])(.)(.)(.)([KOBT ]) . \
[^0-9-]+(\d+|-)( +\S+ +\S+ +)(.+)') @@ -645,8 +638,7 @@
if match and match.groups():
if match.group(7) != '-': # ignore items that only exist on repos
atthash = {'status' : match.group(1),
- 'wc_rev' : match.group(6),
- 'repos_rev' : repos_rev}
+ 'wc_rev' : match.group(6)}
if match.group(2) != ' ':
atthash['locked'] = match.group(2)
if match.group(3) != ' ':
Modified: trunk/subversion/tests/clients/cmdline/svntest/wc.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/svntest/ \
wc.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/svntest/wc.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/svntest/wc.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/svntest/wc.py (original)
+++ trunk/subversion/tests/clients/cmdline/svntest/wc.py Thu Mar 31 17:08:03 2005
@@ -112,8 +112,6 @@
atts['verb'] = item.verb
if item.wc_rev is not None:
atts['wc_rev'] = item.wc_rev
- if item.repos_rev is not None:
- atts['repos_rev'] = item.repos_rev
if item.locked is not None:
atts['locked'] = item.locked
if item.copied is not None:
@@ -139,7 +137,7 @@
"""
def __init__(self, contents=None, props=None,
- status=None, verb=None, wc_rev=None, repos_rev=None,
+ status=None, verb=None, wc_rev=None,
locked=None, copied=None, switched=None, writelocked=None):
# provide an empty prop dict if it wasn't provided
if props is None:
@@ -148,15 +146,12 @@
### keep/make these ints one day?
if wc_rev is not None:
wc_rev = str(wc_rev)
- if repos_rev is not None:
- repos_rev = str(repos_rev)
self.contents = contents
self.props = props
self.status = status
self.verb = verb
self.wc_rev = wc_rev
- self.repos_rev = repos_rev
self.locked = locked
self.copied = copied
self.switched = switched
@@ -172,6 +167,6 @@
def tweak(self, **kw):
for name, value in kw.items():
### refine the revision args (for now) to ensure they are strings
- if name == 'wc_rev' or name == 'repos_rev':
+ if name == 'wc_rev':
value = str(value)
setattr(self, name, value)
Modified: trunk/subversion/tests/clients/cmdline/switch_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/switch_t \
ests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/switch_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/switch_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/switch_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/switch_tests.py Thu Mar 31 17:08:03 2005
@@ -55,9 +55,9 @@
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, repos_rev=1),
- 'A/B/tau' : Item(status=' ', wc_rev=1, repos_rev=1),
- 'A/B/rho' : Item(status=' ', wc_rev=1, repos_rev=1),
+ '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
@@ -199,12 +199,11 @@
# Created expected status tree.
expected_status = get_routine_status_state(wc_dir)
- expected_status.tweak(repos_rev=2)
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, repos_rev=2),
- 'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/D/G/Z' : Item(status=' ', wc_rev=2),
+ 'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2),
})
# Commit should succeed
@@ -303,12 +302,12 @@
# Create expected status tree for the update.
expected_status = get_routine_status_state(wc_dir)
- expected_status.tweak(repos_rev=2, wc_rev=2)
+ expected_status.tweak(wc_rev=2)
expected_status.add({
- 'A/D/G/Z' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/Z' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/Z/zeta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ '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')
@@ -357,7 +356,6 @@
# Create expected status
expected_status = get_routine_status_state(wc_dir)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('iota', 'A/B', switched='S')
svntest.actions.run_and_verify_update(wc_dir,
@@ -410,13 +408,12 @@
# Create expected status tree for the update.
expected_status = get_routine_status_state(wc_dir)
- expected_status.tweak(repos_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=2)
expected_status.add({
- 'A/B/Z' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/B/Z/zeta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ '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,
@@ -468,13 +465,13 @@
# Create expected status tree for the update.
expected_status = get_routine_status_state(wc_dir)
- expected_status.tweak(repos_rev=2, wc_rev=2)
+ 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, repos_rev=2),
- 'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ '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,
@@ -545,10 +542,10 @@
svntest.actions.run_and_verify_svn(None, None, [], 'copy',
H_path, H2_path)
expected_status.add({
- 'A/D/H2' : Item(status='A ', wc_rev='-', copied='+', repos_rev=2),
- 'A/D/H2/chi' : Item(status=' ', wc_rev='-', copied='+', repos_rev=2),
- 'A/D/H2/omega' : Item(status=' ', wc_rev='-', copied='+', repos_rev=2),
- 'A/D/H2/psi' : Item(status=' ', wc_rev='-', copied='+', repos_rev=2),
+ 'A/D/H2' : Item(status='A ', wc_rev='-', copied='+'),
+ 'A/D/H2/chi' : Item(status=' ', wc_rev='-', copied='+'),
+ 'A/D/H2/omega' : Item(status=' ', wc_rev='-', copied='+'),
+ 'A/D/H2/psi' : Item(status=' ', wc_rev='-', copied='+'),
})
expected_status.remove('A/B/F')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -576,7 +573,7 @@
'A/D/H2/psi' : Item("This is the file 'psi'."),
})
expected_status.add({
- 'A/B/F' : Item(status=' ', wc_rev='2', repos_rev=2),
+ 'A/B/F' : Item(status=' ', wc_rev='2'),
})
expected_status.tweak(wc_rev=2)
expected_status.tweak('A/D/H2', 'A/D/H2/chi', 'A/D/H2/omega', 'A/D/H2/psi',
@@ -595,7 +592,6 @@
})
expected_status.tweak('A/D/H2', 'A/D/H2/chi', 'A/D/H2/omega', 'A/D/H2/psi',
status=' ', wc_rev='3', copied=None)
- expected_status.tweak(repos_rev=3)
svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
None, None, None, None, None,
@@ -769,9 +765,9 @@
expected_status.tweak('A/D/H', status='! ', switched='S', wc_rev=2)
expected_status.remove('A/D/H/psi', 'A/D/H/chi', 'A/D/H/omega')
expected_status.add({
- 'A/D/H/pi' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/H/tau' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/D/H/rho' : Item(status=' ', wc_rev=2, repos_rev=2),
+ '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)
@@ -795,7 +791,6 @@
expected_status.tweak('A/D/H', status=' ') # remains switched
expected_status.add({ 'A/D/H/psi' : Item(status=' ',
switched=None,
- repos_rev=2,
wc_rev=2) })
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -880,7 +875,6 @@
os.remove(alpha_path)
svntest.actions.run_and_verify_svn(None, None, [], 'sw', E_url2, E_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
expected_status.tweak('A/B/E', 'A/B/E/alpha', 'A/B/E/beta', wc_rev=3)
expected_status.tweak('A/B/E', switched='S')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
Modified: trunk/subversion/tests/clients/cmdline/trans_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/trans_te \
sts.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/trans_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/trans_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/trans_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/trans_tests.py Thu Mar 31 17:08:03 2005
@@ -199,17 +199,17 @@
# Add all the files
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'author_rev_unexp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'author_rev_exp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'url_unexp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'url_exp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'id_unexp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'id_exp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'bogus_keywords' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'embd_author_rev_unexp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'embd_author_rev_exp' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'embd_bogus_keywords' : Item(status='A ', wc_rev=0, repos_rev=1),
- 'fixed_length_keywords' : Item(status='A ', wc_rev=0, repos_rev=1),
+ 'author_rev_unexp' : Item(status='A ', wc_rev=0),
+ 'author_rev_exp' : Item(status='A ', wc_rev=0),
+ 'url_unexp' : Item(status='A ', wc_rev=0),
+ 'url_exp' : Item(status='A ', wc_rev=0),
+ 'id_unexp' : Item(status='A ', wc_rev=0),
+ 'id_exp' : Item(status='A ', wc_rev=0),
+ 'bogus_keywords' : Item(status='A ', wc_rev=0),
+ 'embd_author_rev_unexp' : Item(status='A ', wc_rev=0),
+ 'embd_author_rev_exp' : Item(status='A ', wc_rev=0),
+ 'embd_bogus_keywords' : Item(status='A ', wc_rev=0),
+ 'fixed_length_keywords' : Item(status='A ', wc_rev=0),
})
svntest.main.run_svn (None, 'add', author_rev_unexp_path)
@@ -590,7 +590,6 @@
expected_output = wc.State(wc_dir, {
'A/B/lambda' : Item(verb='Sending'),
})
- expected_status.tweak(repos_rev=3)
expected_status.tweak('A/B/lambda', wc_rev=3)
svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
@@ -620,7 +619,7 @@
mu2_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
- 'A/mu2' : Item(status='A ', wc_rev='-', repos_rev=1, copied='+')
+ 'A/mu2' : Item(status='A ', wc_rev='-', copied='+')
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -628,7 +627,6 @@
expected_output = wc.State(wc_dir, {
'A/mu2' : Item(verb='Adding'),
})
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/mu2', status=' ', wc_rev=2, copied=None)
svntest.actions.run_and_verify_commit (wc_dir,
expected_output, expected_status,
Modified: trunk/subversion/tests/clients/cmdline/update_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/update_t \
ests.py?view=diff&rev=13814&p1=trunk/subversion/tests/clients/cmdline/update_tests.py&r1=13813&p2=trunk/subversion/tests/clients/cmdline/update_tests.py&r2=13814
==============================================================================
--- trunk/subversion/tests/clients/cmdline/update_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/update_tests.py Thu Mar 31 17:08:03 2005
@@ -96,7 +96,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/theta' : Item(status=' ', wc_rev=2),
})
# Commit the new binary file, creating revision 2.
@@ -122,7 +122,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/theta' : Item(status=' ', wc_rev=3),
})
# Commit original working copy again, creating revision 3.
@@ -152,7 +152,7 @@
# Create expected status tree for the update.
expected_status = svntest.actions.get_virginal_state(wc_backup, 3)
expected_status.add({
- 'A/theta' : Item(status='C ', wc_rev=3, repos_rev=3),
+ 'A/theta' : Item(status='C ', wc_rev=3),
})
# Extra 'singleton' files we expect to exist after the update.
@@ -227,8 +227,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=2, repos_rev=2),
- 'A/zeta' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/theta' : Item(status=' ', wc_rev=2),
+ 'A/zeta' : Item(status=' ', wc_rev=2),
})
# Commit the new binary filea, creating revision 2.
@@ -252,8 +252,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=1)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=3, repos_rev=3),
- 'A/zeta' : Item(status=' ', wc_rev=3, repos_rev=3),
+ 'A/theta' : Item(status=' ', wc_rev=3),
+ 'A/zeta' : Item(status=' ', wc_rev=3),
})
# Commit original working copy again, creating revision 3.
@@ -281,8 +281,8 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.tweak(wc_rev=2)
expected_status.add({
- 'A/theta' : Item(status=' ', wc_rev=2, repos_rev=3),
- 'A/zeta' : Item(status=' ', wc_rev=2, repos_rev=3),
+ 'A/theta' : Item(status=' ', wc_rev=2),
+ 'A/zeta' : Item(status=' ', wc_rev=2),
})
# Do an update from revision 2 and make sure that our binary file
@@ -392,7 +392,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak('A/D/gamma', wc_rev=1, status='R ')
expected_status.add({
- 'A/B/zeta' : Item(status='A ', wc_rev=0, repos_rev=2),
+ 'A/B/zeta' : Item(status='A ', wc_rev=0),
})
# Do the update and check the results in three ways.
@@ -473,7 +473,7 @@
# Create expected status tree
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
- expected_status.tweak('iota', wc_rev=2, repos_rev=2)
+ expected_status.tweak('iota', wc_rev=2)
# Commit the change, creating revision 2.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -674,7 +674,6 @@
svntest.main.file_append(pi_path, 'appended pi text')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
expected_status.tweak('A/B/E/alpha', 'A/D/G/pi', status='M ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -743,8 +742,8 @@
# New alpha and F should be in add state A
expected_status.add({
- 'A/B/E/alpha' : Item(status='A ', wc_rev=0, repos_rev=2),
- 'A/B/F' : Item(status='A ', wc_rev=0, repos_rev=2),
+ 'A/B/E/alpha' : Item(status='A ', wc_rev=0),
+ 'A/B/F' : Item(status='A ', wc_rev=0),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -763,8 +762,8 @@
# alpha and F to be restored in the WC when updated to rev 1
svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r', '1', wc_dir)
expected_status.add({
- 'A/B/E/alpha' : Item(status=' ', wc_rev=1, repos_rev=2),
- 'A/B/F' : Item(status=' ', wc_rev=1, repos_rev=2),
+ 'A/B/E/alpha' : Item(status=' ', wc_rev=1),
+ 'A/B/F' : Item(status=' ', wc_rev=1),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -823,7 +822,6 @@
# 'A/B/F' : Item(verb='Deleting'),
# })
#expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- #expected_status.tweak(repos_rev=3)
#svntest.actions.run_and_verify_update(wc_dir,
# expected_output,
# expected_disk,
@@ -834,7 +832,6 @@
# Update to revision 1 replaces the directory
svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r', '1', wc_dir)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=3)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
#----------------------------------------------------------------------
@@ -874,7 +871,6 @@
os.chdir(was_cwd)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak(repos_rev=2)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
#----------------------------------------------------------------------
@@ -902,7 +898,7 @@
# Create expected status tree
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak(wc_rev=1)
- expected_status.tweak('iota', wc_rev=2, repos_rev=2)
+ expected_status.tweak('iota', wc_rev=2)
# Commit the change, creating revision 2.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -1005,7 +1001,7 @@
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
expected_status.remove('A/D/H', 'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi')
- expected_status.tweak(wc_rev=1, repos_rev=2)
+ expected_status.tweak(wc_rev=1)
# Do the update, specifying the deleted paths explicitly.
svntest.actions.run_and_verify_update(wc_dir,
@@ -1023,7 +1019,7 @@
svntest.main.safe_rmtree(H_path)
# This time we're updating the whole working copy
- expected_status.tweak(wc_rev=2, repos_rev=2)
+ expected_status.tweak(wc_rev=2)
# Do the update, on the whole working copy this time
svntest.actions.run_and_verify_update(wc_dir,
@@ -1160,7 +1156,7 @@
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
- 'A/spacey dir' : Item(status=' ', wc_rev=2, repos_rev=2),
+ 'A/spacey dir' : Item(status=' ', wc_rev=2),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
@@ -1356,10 +1352,10 @@
# status should now show the dir scheduled for addition-with-history
expected_status.add({
- 'A/D/G' : Item(status='A ', copied='+', wc_rev='-', repos_rev=2),
- 'A/D/G/pi' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
- 'A/D/G/rho' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
- 'A/D/G/tau' : Item(status=' ', copied='+', wc_rev='-', repos_rev=2),
+ 'A/D/G' : Item(status='A ', copied='+', wc_rev='-'),
+ 'A/D/G/pi' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/D/G/rho' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/D/G/tau' : Item(status=' ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status (wc_dir, expected_status)
@@ -1478,7 +1474,6 @@
expected_output = svntest.wc.State(wc_dir, {
'A/B' : Item(verb='Deleting'),
})
- expected_status.tweak(repos_rev=3)
expected_status.remove('A/B', 'A/B/lambda', 'A/B/E', 'A/B/E/beta', 'A/B/F')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None,
@@ -1501,8 +1496,9 @@
'E' : Item(),
'E/alpha' : Item(),
'E/beta' : Item(),
+ 'F' : Item(),
})
- expected_status.tweak(wc_rev=1, repos_rev='?', status=' ')
+ expected_status.tweak(wc_rev=1, status=' ')
svntest.actions.run_and_verify_status(B_path, expected_status)
# Make enclosing wc read only
---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic