You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/10/06 10:46:44 UTC
svn commit: r1706963 [5/6] - in /subversion/branches/move-tracking-2: ./
build/ subversion/ subversion/bindings/javahl/native/ subversion/include/
subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_diff/ subversion/libsvn_fs_base/ ...
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py?rev=1706963&r1=1706962&r2=1706963&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py Tue Oct 6 08:46:43 2015
@@ -39,7 +39,6 @@ import filecmp
# Our testing module
import svntest
from svntest import wc
-from svntest.main import SVN_PROP_MERGEINFO, is_os_windows
# (abbreviation)
Skip = svntest.testcase.Skip_deco
@@ -50,11 +49,6 @@ Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
Item = svntest.wc.StateItem
-def make_patch_path(sbox, name='my.patch'):
- dir = sbox.add_wc_path('patches')
- os.mkdir(dir)
- return os.path.abspath(os.path.join(dir, name))
-
########################################################################
#Tests
@@ -64,7 +58,7 @@ def patch(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -194,13 +188,13 @@ def patch(sbox):
"winnings with the below details.\n",
]
- expected_output = [
- 'U %s\n' % sbox.ospath('A/D/gamma'),
- 'U %s\n' % sbox.ospath('iota'),
- 'A %s\n' % sbox.ospath('new'),
- 'U %s\n' % sbox.ospath('A/mu'),
- 'D %s\n' % sbox.ospath('A/B/E/beta'),
- ]
+ expected_output = wc.State(wc_dir, {
+ 'A/D/gamma' : Item(status='U '),
+ 'iota' : Item(status='U '),
+ 'new' : Item(status='A '),
+ 'A/mu' : Item(status='U '),
+ 'A/B/E/beta' : Item(status='D '),
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('A/D/gamma', contents=gamma_contents)
@@ -218,15 +212,21 @@ def patch(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
+ # Retry
+ expected_output.tweak(status='G ')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
def patch_absolute_paths(sbox):
"patch containing absolute paths"
@@ -234,7 +234,7 @@ def patch_absolute_paths(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = os.path.abspath(sbox.get_tempname('my.patch'))
os.chdir(wc_dir)
@@ -280,7 +280,7 @@ def patch_absolute_paths(sbox):
lambda_path: Item(verb='Skipped missing target'),
})
- svntest.actions.run_and_verify_patch('', os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch('', patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -295,7 +295,7 @@ def patch_offset(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = os.path.abspath(sbox.get_tempname('my.patch'))
mu_path = sbox.ospath('A/mu')
iota_path = sbox.ospath('iota')
@@ -493,7 +493,7 @@ def patch_offset(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch('', os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch('', patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -508,7 +508,7 @@ def patch_chopped_leading_spaces(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -662,7 +662,7 @@ def patch_chopped_leading_spaces(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -678,7 +678,7 @@ def patch_strip1(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -832,7 +832,7 @@ def patch_strip1(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -848,7 +848,7 @@ def patch_no_index_line(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
gamma_path = sbox.ospath('A/D/gamma')
iota_path = sbox.ospath('iota')
@@ -919,7 +919,7 @@ def patch_no_index_line(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -934,7 +934,7 @@ def patch_add_new_dir(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# The first diff is adding 'new' with two missing dirs. The second is
# adding 'new' with one missing dir to a 'A/B/E' that is locally deleted
@@ -1015,7 +1015,7 @@ def patch_add_new_dir(sbox):
A_C_new_path : Item(verb='Skipped missing target')})
svntest.actions.run_and_verify_patch(wc_dir,
- os.path.abspath(patch_file_path),
+ patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1029,7 +1029,7 @@ def patch_remove_empty_dirs(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Contents of B:
# A/B/lamba
@@ -1109,20 +1109,15 @@ def patch_remove_empty_dirs(sbox):
'A/B/F')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.add({'A/D/H/chi' : Item(status='! ', wc_rev=1)})
- expected_status.add({'A/D/H/omega' : Item(status='D ', wc_rev=1)})
- expected_status.add({'A/D/H/psi' : Item(status='D ', wc_rev=1)})
- expected_status.add({'A/B' : Item(status='D ', wc_rev=1)})
- expected_status.add({'A/B/E' : Item(status='D ', wc_rev=1)})
- expected_status.add({'A/B/E/beta' : Item(status='D ', wc_rev=1)})
- expected_status.add({'A/B/E/alpha' : Item(status='D ', wc_rev=1)})
- expected_status.add({'A/B/lambda' : Item(status='D ', wc_rev=1)})
- expected_status.add({'A/B/F' : Item(status='D ', wc_rev=1)})
+ expected_status.tweak('A/D/H/chi', status='! ')
+ expected_status.tweak('A/D/H/omega', 'A/D/H/psi', 'A/B', 'A/B/E',
+ 'A/B/E/beta', 'A/B/E/alpha', 'A/B/lambda',
+ 'A/B/F', status='D ')
expected_skip = wc.State('', { })
svntest.actions.run_and_verify_patch(wc_dir,
- os.path.abspath(patch_file_path),
+ patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1150,7 +1145,7 @@ def patch_reject(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Apply patch
@@ -1191,7 +1186,7 @@ def patch_reject(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1221,7 +1216,7 @@ def patch_keywords(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Apply patch
@@ -1252,7 +1247,7 @@ def patch_keywords(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1266,7 +1261,7 @@ def patch_with_fuzz(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
@@ -1391,7 +1386,7 @@ def patch_with_fuzz(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1406,7 +1401,7 @@ def patch_reverse(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -1560,7 +1555,7 @@ def patch_reverse(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1576,7 +1571,7 @@ def patch_no_svn_eol_style(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
# CRLF is a string that will match a CRLF sequence read from a text file.
@@ -1651,9 +1646,9 @@ def patch_no_svn_eol_style(sbox):
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
- expected_output = [
- 'G %s\n' % sbox.ospath('A/mu'),
- ]
+ expected_output = wc.State(wc_dir, {
+ 'A/mu' : Item(status='U '),
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('A/mu', contents=''.join(mu_contents))
@@ -1663,17 +1658,16 @@ def patch_no_svn_eol_style(sbox):
expected_skip = wc.State('', { })
svntest.actions.run_and_verify_patch(wc_dir,
- os.path.abspath(patch_file_path),
+ patch_file_path,
expected_output,
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
expected_output = ["Reverted '" + mu_path + "'\n"]
- svntest.actions.run_and_verify_svn(expected_output, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(expected_output, [],
+ 'revert', '-R', wc_dir)
def patch_with_svn_eol_style(sbox):
"patch target with svn:eol-style"
@@ -1681,7 +1675,7 @@ def patch_with_svn_eol_style(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
# CRLF is a string that will match a CRLF sequence read from a text file.
@@ -1778,7 +1772,7 @@ def patch_with_svn_eol_style(sbox):
expected_skip = wc.State('', { })
svntest.actions.run_and_verify_patch(wc_dir,
- os.path.abspath(patch_file_path),
+ patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1796,7 +1790,7 @@ def patch_with_svn_eol_style_uncommitted
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
# CRLF is a string that will match a CRLF sequence read from a text file.
@@ -1874,9 +1868,9 @@ def patch_with_svn_eol_style_uncommitted
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
- expected_output = [
- 'G %s\n' % sbox.ospath('A/mu'),
- ]
+ expected_output = wc.State(wc_dir, {
+ 'A/mu' : Item(status='U '),
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('A/mu', contents=''.join(mu_contents),
props={'svn:eol-style' : target_eol_style})
@@ -1887,7 +1881,7 @@ def patch_with_svn_eol_style_uncommitted
expected_skip = wc.State('', { })
svntest.actions.run_and_verify_patch(wc_dir,
- os.path.abspath(patch_file_path),
+ patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -1905,7 +1899,7 @@ def patch_with_ignore_whitespace(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -2023,7 +2017,7 @@ def patch_with_ignore_whitespace(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2039,7 +2033,7 @@ def patch_replace_locally_deleted_file(s
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -2108,7 +2102,7 @@ def patch_replace_locally_deleted_file(s
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2123,7 +2117,7 @@ def patch_no_eol_at_eof(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
iota_path = sbox.ospath('iota')
iota_contents = [
@@ -2181,7 +2175,7 @@ def patch_no_eol_at_eof(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2196,7 +2190,7 @@ def patch_with_properties(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
iota_path = sbox.ospath('iota')
modified_prop_contents = "This is the property 'modified'.\n"
@@ -2235,7 +2229,7 @@ def patch_with_properties(sbox):
"-This is the property 'deleted'.\n",
]
- svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
+ svntest.main.file_write(patch_file_path, ''.join(unidiff_patch), 'wb')
modified_prop_contents = "The property 'modified' has changed.\n"
added_prop_contents = "This is the property 'added'.\n"
@@ -2250,16 +2244,65 @@ def patch_with_properties(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', status=' M', wc_rev='2')
- expected_skip = wc.State('', { })
+ expected_skip = wc.State(wc_dir, { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
+ # And repeat
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota' : Item(status=' G')
+ })
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
+
+ # Reverse
+ expected_output.tweak('iota', status=' U')
+ expected_status.tweak('iota', status=' ')
+ expected_disk.tweak('iota',
+ props={'deleted': "This is the property 'deleted'.\n",
+ 'modified': "This is the property 'modified'.\n"})
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # Repeat
+ expected_output.tweak('iota', status=' G')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # And now try against a not existing target
+ svntest.actions.run_and_verify_svn(None, [],
+ 'rm', '--force', sbox.ospath('iota'))
+ expected_output.remove('iota')
+ expected_disk.remove('iota')
+ expected_status.tweak('iota', status='D ')
+ expected_skip.add({
+ 'iota' : Item(verb='Skipped'),
+ })
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
+
def patch_same_twice(sbox):
"apply the same patch twice"
@@ -2267,7 +2310,7 @@ def patch_same_twice(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
beta_path = sbox.ospath('A/B/E/beta')
@@ -2422,7 +2465,7 @@ def patch_same_twice(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2436,28 +2479,20 @@ def patch_same_twice(sbox):
'> hunk @@ -1,1 +1,1 @@ already applied\n',
'G %s\n' % sbox.ospath('iota'),
# The iota patch inserts a line after the first line in the file,
- # with no trailing context. Currently, Subversion applies this patch
- # multiple times, which matches the behaviour of Larry Wall's patch
- # implementation. A more complicated hunk matching algorithm is needed
- # to detect the duplicate application in this case. GNU patch does detect
- # the duplicate application. Should Subversion be taught to detect it,
- # we need this line here:
- # '> hunk @@ -1,1 +1,2 @@ already applied\n',
+ # with no trailing context. Originally, Subversion applied this patch
+ # multiple times, which matched the behaviour of Larry Wall's patch
+ # implementation.
+ '> hunk @@ -1,1 +1,2 @@ already applied\n',
'G %s\n' % sbox.ospath('new'),
'> hunk @@ -0,0 +1,1 @@ already applied\n',
'G %s\n' % sbox.ospath('A/mu'),
'> hunk @@ -6,6 +6,9 @@ already applied\n',
'> hunk @@ -14,11 +17,8 @@ already applied\n',
- 'Skipped \'%s\'\n' % beta_path,
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
-
- expected_skip = wc.State('', {beta_path : Item(verb='Skipped')})
-
- # See above comment about the iota patch being applied twice.
- iota_contents += "Some more bytes\n"
- expected_disk.tweak('iota', contents=iota_contents)
+ 'G %s\n' % sbox.ospath('A/B/E/beta'),
+ '> hunk @@ -1,1 +0,0 @@ already applied\n',
+ ]
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2472,7 +2507,7 @@ def patch_dir_properties(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
B_path = sbox.ospath('A/B')
modified_prop_contents = "This is the property 'modified'.\n"
@@ -2552,7 +2587,7 @@ def patch_dir_properties(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2567,7 +2602,7 @@ def patch_add_path_with_props(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
iota_path = sbox.ospath('iota')
# Apply patch that adds two files, one of which is empty.
@@ -2618,7 +2653,7 @@ def patch_add_path_with_props(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2633,7 +2668,7 @@ def patch_prop_offset(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = os.path.abspath(sbox.get_tempname('my.patch'))
iota_path = sbox.ospath('iota')
prop1_content = ''.join([
@@ -2832,7 +2867,7 @@ def patch_prop_offset(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch('', os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch('', patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2846,7 +2881,7 @@ def patch_prop_with_fuzz(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
@@ -2975,7 +3010,7 @@ def patch_prop_with_fuzz(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -2989,7 +3024,7 @@ def patch_git_empty_files(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
new_path = sbox.ospath('new')
@@ -3020,7 +3055,7 @@ def patch_git_empty_files(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3035,7 +3070,7 @@ def patch_old_target_names(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -3146,7 +3181,7 @@ def patch_old_target_names(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3161,7 +3196,7 @@ def patch_reverse_revert(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents_pre_patch = [
@@ -3291,13 +3326,13 @@ def patch_reverse_revert(sbox):
"winnings with the below details.\n",
]
- expected_output = [
- 'U %s\n' % sbox.ospath('A/D/gamma'),
- 'U %s\n' % sbox.ospath('iota'),
- 'A %s\n' % sbox.ospath('new'),
- 'U %s\n' % sbox.ospath('A/mu'),
- 'D %s\n' % sbox.ospath('A/B/E/beta'),
- ]
+ expected_output = wc.State(wc_dir, {
+ 'A/D/gamma' : Item(status='U '),
+ 'iota' : Item(status='U '),
+ 'new' : Item(status='A '),
+ 'A/mu' : Item(status='U '),
+ 'A/B/E/beta' : Item(status='D '),
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('A/D/gamma', contents=gamma_contents)
@@ -3313,25 +3348,32 @@ def patch_reverse_revert(sbox):
expected_status.tweak('A/mu', status='M ', wc_rev=2)
expected_status.tweak('A/B/E/beta', status='D ')
- expected_skip = wc.State('', { })
+ expected_skip = wc.State(wc_dir, { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
+
+ # Try again
+ expected_output.tweak(status='G ')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
# Applying the same patch in reverse should undo local mods
- expected_output = [
- 'G %s\n' % sbox.ospath('A/D/gamma'),
- 'G %s\n' % sbox.ospath('iota'),
- 'D %s\n' % sbox.ospath('new'),
- 'G %s\n' % sbox.ospath('A/mu'),
- 'A %s\n' % sbox.ospath('A/B/E/beta'),
- ]
+ expected_output = wc.State(wc_dir, {
+ 'A/D/gamma' : Item(status='U '),
+ 'iota' : Item(status='U '),
+ 'new' : Item(status='D '),
+ 'A/mu' : Item(status='U '),
+ 'A/B/E/beta' : Item(status='A '),
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('A/mu', contents=''.join(mu_contents_pre_patch))
@@ -3343,14 +3385,22 @@ def patch_reverse_revert(sbox):
### instead of causing a replacement.
expected_status.tweak('A/B/E/beta', status='R ')
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1, # dry-run
+ [], True, True,
+ '--reverse-diff')
+
+ # And again
+ expected_output.tweak(status='G ')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
'--reverse-diff')
def patch_one_property(sbox, trailing_eol):
@@ -3360,7 +3410,7 @@ def patch_one_property(sbox, trailing_eo
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
# Apply patch
@@ -3385,9 +3435,9 @@ def patch_one_property(sbox, trailing_eo
value = "v\n"
else:
value = "v"
- unidiff_patch += ['\ No newline at end of property']
+ unidiff_patch += ['\ No newline at end of property\n']
- svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
+ svntest.main.file_write(patch_file_path, ''.join(unidiff_patch), 'wb')
expected_output = [
' U %s\n' % os.path.join(wc_dir),
@@ -3401,7 +3451,7 @@ def patch_one_property(sbox, trailing_eo
expected_skip = wc.State('.', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3411,10 +3461,6 @@ def patch_one_property(sbox, trailing_eo
1, # dry-run
'--strip', '3')
- if is_os_windows():
- # On Windows 'svn pg' uses \r\n as EOL.
- value = value.replace('\n', '\r\n')
-
svntest.actions.check_prop('k', wc_dir, [value])
def patch_strip_cwd(sbox):
@@ -3427,7 +3473,6 @@ def patch_set_prop_no_eol(sbox):
return patch_one_property(sbox, False)
# Regression test for issue #3697
-@SkipUnless(svntest.main.is_posix_os)
@Issue(3697)
def patch_add_symlink(sbox):
"patch that adds a symlink"
@@ -3435,7 +3480,7 @@ def patch_add_symlink(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Apply patch
@@ -3446,37 +3491,69 @@ def patch_add_symlink(sbox):
"+++ iota_symlink\t(working copy)\n",
"@@ -0,0 +1 @@\n",
"+link iota\n",
+ "\\ No newline at end of file\n"
"\n",
"Property changes on: iota_symlink\n",
"-------------------------------------------------------------------\n",
"Added: svn:special\n",
"## -0,0 +1 ##\n",
"+*\n",
- "+\\ No newline at end of property\n"
+ "\\ No newline at end of property\n"
]
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
- expected_output = [
- 'A %s\n' % sbox.ospath('iota_symlink'),
- ]
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota_symlink' : Item(status='A ')
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({'iota_symlink': Item(contents="This is the file 'iota'.\n",
props={'svn:special' : '*'})})
+ if not svntest.main.is_posix_os():
+ expected_disk.tweak('iota_symlink', contents='link iota')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({'iota_symlink': Item(status='A ', wc_rev='0')})
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
+
+ # And again
+ expected_output.tweak('iota_symlink', status='GG')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
+
+ # Reverse
+ expected_output.tweak('iota_symlink', status='D ')
+ expected_disk.remove('iota_symlink')
+ expected_status.remove('iota_symlink')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # And again
+ expected_output.tweak('iota_symlink', status='GG')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
def patch_moved_away(sbox):
"patch a file that was moved away"
@@ -3484,7 +3561,7 @@ def patch_moved_away(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
mu_path = sbox.ospath('A/mu')
mu_contents = [
@@ -3602,7 +3679,7 @@ def patch_moved_away(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3618,7 +3695,7 @@ def patch_lacking_trailing_eol(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
iota_path = sbox.ospath('iota')
mu_path = sbox.ospath('A/mu')
@@ -3656,7 +3733,7 @@ def patch_lacking_trailing_eol(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3672,7 +3749,7 @@ def patch_deletes_prop(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
iota_path = sbox.ospath('iota')
svntest.main.run_svn(None, 'propset', 'propname', 'propvalue',
@@ -3710,14 +3787,14 @@ def patch_deletes_prop(sbox):
expected_output = [
' U %s\n' % sbox.ospath('iota'),
]
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
expected_skip,
None, # expected err
1, # check-props
- 0) # dry-run
+ 1) # dry-run
# Revert any local mods, then try to reverse-apply a patch which
# *adds* the property.
@@ -3738,7 +3815,7 @@ def patch_deletes_prop(sbox):
]
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3754,7 +3831,7 @@ def patch_reversed_add_with_props(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Add a new file which also has props set on it.
newfile_path = sbox.ospath('newfile')
@@ -3787,7 +3864,7 @@ def patch_reversed_add_with_props(sbox):
expected_output = [
'D %s\n' % newfile_path,
]
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3803,7 +3880,7 @@ def patch_reversed_add_with_props2(sbox)
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Add a new file which also has props set on it.
newfile_path = sbox.ospath('newfile')
@@ -3842,7 +3919,7 @@ def patch_reversed_add_with_props2(sbox)
expected_output = [
'D %s\n' % newfile_path,
]
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3858,7 +3935,7 @@ def patch_dev_null(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Git (and maybe other tools) use '/dev/null' as the old path for
# newly added files, and as the new path for deleted files.
@@ -3898,7 +3975,7 @@ def patch_dev_null(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3914,7 +3991,7 @@ def patch_delete_and_skip(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = os.path.abspath(sbox.get_tempname('my.patch'))
os.chdir(wc_dir)
@@ -3976,7 +4053,7 @@ def patch_delete_and_skip(sbox):
'',
{skipped_path: Item(verb='Skipped missing target')})
- svntest.actions.run_and_verify_patch('', os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch('', patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -3991,7 +4068,7 @@ def patch_target_no_eol_at_eof(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
iota_path = sbox.ospath('iota')
mu_path = sbox.ospath('A/mu')
@@ -4080,7 +4157,7 @@ def patch_target_no_eol_at_eof(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -4094,7 +4171,7 @@ def patch_add_and_delete(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
unidiff_patch = [
"Index: foo\n",
@@ -4133,7 +4210,7 @@ def patch_add_and_delete(sbox):
# Failed with "The node 'P' was not found" when erroneously checking
# whether 'P/Q' should be deleted.
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -4148,7 +4225,7 @@ def patch_git_with_index_line(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
unidiff_patch = [
"diff --git a/src/tools/ConsoleRunner/hi.txt b/src/tools/ConsoleRunner/hi.txt\n",
@@ -4188,7 +4265,7 @@ def patch_git_with_index_line(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output,
expected_disk,
expected_status,
@@ -4203,7 +4280,7 @@ def patch_change_symlink_target(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, '\n'.join([
"Index: link",
"===================================================================",
@@ -4263,8 +4340,9 @@ def patch_change_symlink_target(sbox):
def patch_replace_dir_with_file_and_vv(sbox):
"replace dir with file and file with dir"
sbox.build(read_only=True)
+ wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join([
# Delete all files in D and descendants to delete D itself
"Index: A/D/G/pi\n",
@@ -4340,24 +4418,39 @@ def patch_replace_dir_with_file_and_vv(s
"\ No newline at end of property\n",
]))
- expected_output = [
- 'D %s\n' % sbox.ospath('A/D/G/pi'),
- 'D %s\n' % sbox.ospath('A/D/G/rho'),
- 'D %s\n' % sbox.ospath('A/D/G/tau'),
- 'D %s\n' % sbox.ospath('A/D/G'),
- 'D %s\n' % sbox.ospath('A/D/H/chi'),
- 'D %s\n' % sbox.ospath('A/D/H/omega'),
- 'D %s\n' % sbox.ospath('A/D/H/psi'),
- 'D %s\n' % sbox.ospath('A/D/H'),
- 'D %s\n' % sbox.ospath('A/D/gamma'),
- 'D %s\n' % sbox.ospath('A/D'),
- 'D %s\n' % sbox.ospath('iota'),
- 'A %s\n' % sbox.ospath('A/D'),
- 'A %s\n' % sbox.ospath('iota'),
- ]
+ expected_output = 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' : Item(status='D '),
+ 'A/D/H/chi' : Item(status='D '),
+ 'A/D/H/omega' : Item(status='D '),
+ 'A/D/H/psi' : Item(status='D '),
+ 'A/D/H' : Item(status='D '),
+ 'A/D/gamma' : Item(status='D '),
+ 'A/D' : Item(status='A ', prev_status='D '),
+ 'iota' : Item(status='A ', prev_status='D '),
+ })
+ expected_skip = wc.State(wc_dir, {})
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.remove('A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',
+ 'A/D/H/psi', 'A/D/H/omega', 'A/D/H/chi',
+ 'A/D/gamma', 'A/D/G', 'A/D/H')
+ expected_status.tweak('A/D', status='R ')
+ expected_status.tweak('iota', status='RM')
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.remove('A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',
+ 'A/D/H/psi', 'A/D/H/omega', 'A/D/H/chi',
+ 'A/D/gamma', 'A/D', 'A/D/G', 'A/D/H')
+ expected_disk.add({
+ 'A/D' : Item(contents="New file"),
+ 'iota' : Item(contents="", props={u'k': u'v'}),
+ })
- svntest.actions.run_and_verify_svn(expected_output, [],
- 'patch', patch_file_path, sbox.wc_dir)
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True)
@Issue(4297)
def single_line_mismatch(sbox):
@@ -4365,7 +4458,7 @@ def single_line_mismatch(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join([
"Index: test\n",
"===================================================================\n",
@@ -4385,13 +4478,30 @@ def single_line_mismatch(sbox):
# And now this patch should fail, as 'line' doesn't equal 'foo'
# But yet it shows up as deleted instead of conflicted
- expected_output = [
- 'C %s\n' % sbox.ospath('test'),
- '> rejected hunk @@ -1,1 +1,1 @@\n',
- ] + svntest.main.summary_of_conflicts(text_conflicts=1)
+ expected_output = wc.State(wc_dir, {
+ 'test' : Item(status='C ')
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.add({
+ 'test' : Item(status=' ', wc_rev='2'),
+ })
+ expected_skip = wc.State(wc_dir, {})
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.add({
+ 'test' : Item(contents="line"),
+ 'test.svnpatch.rej' : Item(contents="--- test\n"
+ "+++ test\n"
+ "@@ -1,1 +1,1 @@\n"
+ "-foo\n"
+ "\\ No newline at end of file\n"
+ "+bar\n"
+ "\\ No newline at end of file\n"),
+ })
- svntest.actions.run_and_verify_svn(expected_output, [],
- 'patch', patch_file_path, wc_dir)
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True)
@Issue(3644)
def patch_empty_file(sbox):
@@ -4400,7 +4510,7 @@ def patch_empty_file(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join([
# patch a file containing just '\n' to 'replacement\n'
"Index: lf.txt\n",
@@ -4441,17 +4551,18 @@ def patch_empty_file(sbox):
]
# Current result: lf.txt patched ok, new created, empty succeeds with offset.
- svntest.actions.run_and_verify_svn(expected_output, [],
- 'patch', patch_file_path, wc_dir)
-
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'lf.txt' : Item(contents="\n"),
'new.txt' : Item(contents="new file\n"),
'empty.txt' : Item(contents="replacement\n"),
})
+ expected_skip = wc.State(wc_dir, {})
+ expected_status = None
- svntest.actions.verify_disk(wc_dir, expected_disk)
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output, expected_disk,
+ expected_status, expected_skip)
@Issue(3362)
def patch_apply_no_fuz(sbox):
@@ -4460,7 +4571,7 @@ def patch_apply_no_fuz(sbox):
sbox.build(read_only=True)
wc_dir = sbox.wc_dir
- svntest.main.file_write(sbox.ospath('test.txt'), '\n'.join([
+ test1_body = '\n'.join([
"line_1",
"line_2",
"line_3",
@@ -4492,8 +4603,9 @@ def patch_apply_no_fuz(sbox):
"line_29",
"line_30",
""
- ]))
- svntest.main.file_write(sbox.ospath('test_v2.txt'), '\n'.join([
+ ])
+ svntest.main.file_write(sbox.ospath('test.txt'), test1_body, 'wb')
+ test2_body = '\n'.join([
"line_1a",
"line_1b",
"line_1c",
@@ -4536,7 +4648,8 @@ def patch_apply_no_fuz(sbox):
"line_29",
"line_30",
""
- ]))
+ ])
+ svntest.main.file_write(sbox.ospath('test_v2.txt'), test2_body, 'wb')
sbox.simple_add('test.txt', 'test_v2.txt')
@@ -4547,21 +4660,32 @@ def patch_apply_no_fuz(sbox):
'--new',
sbox.ospath('test_v2.txt'))
- patch_path = sbox.ospath('patch.diff')
- svntest.main.file_write(patch_path, ''.join(out_text))
+ patch_path = sbox.get_tempname('patch.diff')
+ svntest.main.file_write(patch_path, ''.join(out_text), 'wb')
- expected_output = [
- 'G %s\n' % sbox.ospath('test.txt'),
- ]
+ expected_output = wc.State(wc_dir, {
+ 'test.txt' : Item(status='U '),
+ })
- # Current result: lf.txt patched ok, new created, empty succeeds with offset.
- svntest.actions.run_and_verify_svn(expected_output, [],
- 'patch', patch_path, wc_dir)
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.add({
+ 'test.txt' : Item(contents=test2_body),
+ 'test_v2.txt' : Item(contents=test2_body),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.add({
+ 'test_v2.txt' : Item(status='A ', wc_rev='-'),
+ 'test.txt' : Item(status='A ', wc_rev='-'),
+ })
- if not filecmp.cmp(sbox.ospath('test.txt'), sbox.ospath('test_v2.txt')):
- raise svntest.Failure("Patch result not identical")
+ expected_skip = wc.State(wc_dir, {})
-def patch_lacking_trailing_eol_on_context(sbox):
+ svntest.actions.run_and_verify_patch(wc_dir, patch_path,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True)
+
+def patch_lacking_trailing_eol_on_context(sbox):
"patch file lacking trailing eol on context"
# Apply a patch where a hunk (the only hunk, in this case) ends with a
@@ -4574,7 +4698,7 @@ def patch_lacking_trailing_eol_on_contex
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
# Prepare
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -4601,7 +4725,7 @@ def patch_lacking_trailing_eol_on_contex
expected_disk.tweak('iota', contents="Some more bytes\n" + iota_contents)
expected_status.tweak('iota', status='M ')
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -4610,8 +4734,10 @@ def patch_lacking_trailing_eol_on_contex
sbox.simple_append('iota', "Another line.\n")
expected_disk.tweak('iota', contents="Some more bytes\n" + iota_contents +
"Another line.\n")
- expected_output = [ 'G %s\n' % sbox.ospath('iota') ]
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ expected_output = wc.State(wc_dir, {
+ 'iota' : Item(status='U ')
+ })
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -4641,7 +4767,7 @@ def patch_with_custom_keywords(sbox):
" ZZ\n"
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [ 'U %s\n' % sbox.ospath('A/mu') ]
@@ -4651,7 +4777,7 @@ def patch_with_custom_keywords(sbox):
expected_status.tweak('A/mu', wc_rev=2)
expected_status.tweak('A/mu', status='M ')
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -4669,11 +4795,13 @@ def patch_git_rename(sbox):
"rename to iota2\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
- expected_output = [ 'A %s\n' % sbox.ospath('iota2'),
- 'D %s\n' % sbox.ospath('iota')]
+ expected_output = wc.State(wc_dir, {
+ 'iota' : Item(status='D '),
+ 'iota2' : Item(status='A ')
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('iota')
expected_disk.add({'iota2' : Item(contents="This is the file 'iota'.\n")})
@@ -4683,9 +4811,43 @@ def patch_git_rename(sbox):
})
expected_status.tweak('iota', status='D ', wc_rev=1, moved_to='iota2')
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
- expected_status, expected_skip)
+ expected_status, expected_skip,
+ [], True, True)
+
+ # Retry
+ expected_output = wc.State(wc_dir, {
+ 'iota2' : Item(status='G ')
+ })
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True)
+
+ # Reverse
+ expected_output = wc.State(wc_dir, {
+ 'iota2' : Item(status='D '),
+ 'iota' : Item(status='A '),
+ })
+ expected_disk.remove('iota2')
+ expected_disk.add({
+ 'iota' : Item(contents="This is the file 'iota'.\n"),
+ })
+ expected_status.remove('iota2')
+ expected_status.tweak('iota', moved_to=None, status=' ')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # Retry reverse
+ # svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ # expected_output, expected_disk,
+ # expected_status, expected_skip,
+ # [], True, True,
+ # '--reverse-diff')
@Issue(4533)
def patch_hunk_avoid_reorder(sbox):
@@ -4732,7 +4894,7 @@ def patch_hunk_avoid_reorder(sbox):
" YY\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [
@@ -4755,7 +4917,7 @@ def patch_hunk_avoid_reorder(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=2)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -4786,7 +4948,7 @@ def patch_hunk_avoid_reorder(sbox):
" YY\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [
@@ -4809,7 +4971,7 @@ def patch_hunk_avoid_reorder(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=2)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -4861,7 +5023,7 @@ def patch_hunk_avoid_reorder2(sbox):
" YY\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [
@@ -4884,7 +5046,7 @@ def patch_hunk_avoid_reorder2(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=2)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -4925,7 +5087,7 @@ def patch_hunk_reorder(sbox):
" GG\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [
@@ -4940,7 +5102,7 @@ def patch_hunk_reorder(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=2)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -4984,7 +5146,7 @@ def patch_hunk_reorder(sbox):
" 6\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [
@@ -5004,7 +5166,7 @@ def patch_hunk_reorder(sbox):
expected_status.tweak('A/mu', status='M ', wc_rev=3)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
sbox.simple_revert('A/mu')
@@ -5036,7 +5198,7 @@ def patch_hunk_reorder(sbox):
" 6\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [
@@ -5056,7 +5218,7 @@ def patch_hunk_reorder(sbox):
expected_status.tweak('A/mu', status='M ', wc_rev=3)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5096,7 +5258,7 @@ def patch_hunk_overlap(sbox):
" II\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
expected_output = [
@@ -5110,7 +5272,7 @@ def patch_hunk_overlap(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=2)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5130,7 +5292,7 @@ def patch_delete_modified(sbox):
"-This is the file 'beta'.\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
# First application deletes beta
@@ -5142,18 +5304,16 @@ def patch_delete_modified(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/E/beta', status='D ')
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
- # Second application skips
+ # Second application notifies already applied
expected_output = [
- 'Skipped \'%s\'\n' % sbox.ospath('A/B/E/beta'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
- expected_skip = wc.State('', {
- sbox.ospath('A/B/E/beta') : Item(verb='Skipped'),
- })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ 'G %s\n' % sbox.ospath('A/B/E/beta'),
+ '> hunk @@ -1,1 +0,0 @@ already applied\n',
+ ]
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5166,7 +5326,7 @@ def patch_delete_modified(sbox):
expected_skip = wc.State('', {
sbox.ospath('A/B/E/beta') : Item(verb='Skipped'),
})
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5189,7 +5349,7 @@ def patch_delete_modified(sbox):
: Item(contents=''.join(reject_file_contents))
})
expected_status.tweak('A/B/E/beta', status='M ')
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5232,7 +5392,7 @@ def patch_closest(sbox):
" 5\n",
" 6\n",
]
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
# Previous offset for hunk3 is +4, hunk3 matches at relative offsets
@@ -5282,7 +5442,7 @@ def patch_closest(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=2)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5301,6 +5461,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -47,7 +47,7 @@ with offset 4\n',
@@ -5320,7 +5481,7 @@ def patch_closest(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=3)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5339,6 +5500,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -47,7 +47,7 @@ with offset 4\n',
@@ -5358,7 +5520,7 @@ def patch_closest(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=4)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5377,6 +5539,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -47,7 +47,7 @@ with offset 4\n',
@@ -5396,7 +5559,7 @@ def patch_closest(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=5)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5415,6 +5578,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -180,7 +180,7 @@ with offset -169\n',
@@ -5434,7 +5598,7 @@ def patch_closest(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status='M ', wc_rev=6)
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5471,12 +5635,11 @@ def patch_symlink_traversal(sbox):
" This is the file 'alpha'.\n"
"+xx\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
- expected_output = [
- 'Skipped missing target: \'%s\'\n' % sbox.ospath('A/B/E/unversioned'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
+ expected_output = wc.State(wc_dir, {
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({'A/B/E/unversioned' : Item(contents=alpha_contents)})
expected_disk.add({'A/B/E/versioned' : Item(contents=alpha_contents)})
@@ -5485,10 +5648,10 @@ def patch_symlink_traversal(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({'A/B/E/versioned' : Item(status='A ', wc_rev='-')})
expected_status.add({'A/B/versioned' : Item(status='A ', wc_rev='-')})
- expected_skip = wc.State('', {
- sbox.ospath('A/B/E/unversioned') : Item(verb='Skipped missing target'),
+ expected_skip = wc.State(wc_dir, {
+ 'A/B/E/unversioned' : Item(verb='Skipped'),
})
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
svntest.actions.run_and_verify_status(wc_dir, prepatch_status)
@@ -5503,7 +5666,7 @@ def patch_symlink_traversal(sbox):
" This is the file 'alpha'.\n"
"+xx\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
reject_contents = (
"--- A/B/E/versioned\n"
@@ -5513,14 +5676,14 @@ def patch_symlink_traversal(sbox):
"+xx\n"
)
- expected_output = [
- 'C %s\n' % sbox.ospath('A/B/E/versioned'),
- '> rejected hunk @@ -1,1 +1,2 @@\n',
- ] + svntest.main.summary_of_conflicts(text_conflicts=1)
- expected_disk.add({'A/B/E/versioned.svnpatch.rej'
- : Item(contents=reject_contents)})
- expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ expected_output = wc.State(wc_dir, {
+ 'A/B/E/versioned' : Item(status='C ')
+ })
+ expected_disk.add({
+ 'A/B/E/versioned.svnpatch.rej' : Item(contents=reject_contents)
+ })
+ expected_skip = wc.State(wc_dir, { })
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
os.remove(sbox.ospath('A/B/E/versioned.svnpatch.rej'))
@@ -5537,16 +5700,14 @@ def patch_symlink_traversal(sbox):
" This is the file 'alpha'.\n"
"+xx\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
- expected_output = [
- 'Skipped missing target: \'%s\'\n' % sbox.ospath('A/B/unversioned/alpha'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
- expected_skip = wc.State('', {
- sbox.ospath('A/B/unversioned/alpha') : Item(verb='Skipped missing target'),
+ expected_output = wc.State(wc_dir, {})
+ expected_skip = wc.State(wc_dir, {
+ 'A/B/unversioned/alpha' : Item(verb='Skipped'),
})
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
svntest.actions.run_and_verify_status(wc_dir, prepatch_status)
@@ -5561,16 +5722,14 @@ def patch_symlink_traversal(sbox):
" This is the file 'alpha'.\n"
"+xx\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
- expected_output = [
- 'Skipped missing target: \'%s\'\n' % sbox.ospath('A/B/versioned/alpha'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
- expected_skip = wc.State('', {
- sbox.ospath('A/B/versioned/alpha') : Item(verb='Skipped missing target'),
+ expected_output = wc.State(wc_dir, {})
+ expected_skip = wc.State(wc_dir, {
+ 'A/B/versioned/alpha' : Item(verb='Skipped'),
})
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
svntest.actions.run_and_verify_status(wc_dir, prepatch_status)
@@ -5601,7 +5760,7 @@ def patch_obstructing_symlink_traversal(
" This is the file 'alpha'.\n"
"+xx\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
### Patch applies through the unversioned symlink
@@ -5617,7 +5776,7 @@ def patch_obstructing_symlink_traversal(
expected_status.tweak('A/B/E/alpha', 'A/B/F/alpha', status='M ')
expected_status.tweak('A/B/E/beta', status='! ')
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5680,7 +5839,7 @@ def patch_binary_file(sbox):
[], True, True)
# Ok, now try applying it backwards
- expected_output.tweak('iota', status='GU')
+ expected_output.tweak('iota', status='UU')
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_patch(wc_dir, tmp,
@@ -5800,12 +5959,9 @@ def patch_delete_missing_eol(sbox):
expected_status, expected_skip,
[], False, True)
- # Try again? -> Skip... Why not some already applied notification?
- # -> There is nothing to compare to
+ # Try again? -> Merged
expected_output = wc.State(wc_dir, {
- })
- expected_skip = wc.State(wc_dir, {
- 'A/B/E/beta' : Item(verb='Skipped'),
+ 'A/B/E/beta' : Item(status='G '),
})
svntest.actions.run_and_verify_patch(wc_dir, patch,
expected_output, expected_disk,
@@ -5881,14 +6037,15 @@ def patch_final_eol(sbox):
expected_status, expected_skip,
[], False, True)
- # And again
- expected_output.tweak('iota', 'A/mu', status='G ')
+ # And again - Still U as patch doesn't check final EOL of source
+ expected_output.tweak('iota', 'A/mu', status='U ')
svntest.actions.run_and_verify_patch(wc_dir, patch,
expected_output, expected_disk,
expected_status, expected_skip,
[], False, True)
# Reverse
+ expected_output.tweak('iota', 'A/mu', status='U ')
expected_disk.tweak('iota', contents="This is the file 'iota'.\n")
expected_disk.tweak('A/mu', contents="This is the file 'mu'.\n")
expected_status.tweak('iota', 'A/mu', status=' ')
@@ -5942,13 +6099,14 @@ def patch_final_eol(sbox):
[], False, True)
# And again
- expected_output.tweak('iota', 'A/mu', status='G ')
+ expected_output.tweak('iota', 'A/mu', status='U ')
svntest.actions.run_and_verify_patch(wc_dir, patch,
expected_output, expected_disk,
expected_status, expected_skip,
[], False, True)
# And in reverse
+ expected_output.tweak('iota', 'A/mu', status='U ')
expected_disk.tweak('iota', contents="This is the file 'iota'.")
expected_disk.tweak('A/mu', contents="This is the file 'mu'.")
expected_status.tweak('iota', 'A/mu', status=' ')
@@ -5975,7 +6133,7 @@ def patch_adds_executability_nocontents(
"old mode 100644\n"
"new mode 100755\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
expected_output = wc.State(wc_dir, {
@@ -5990,14 +6148,15 @@ def patch_adds_executability_nocontents(
expected_skip = wc.State(wc_dir, { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
check_props=True)
# And try it again
# This may produce different output but must have the same result
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ expected_output.tweak('iota', status=' G')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
check_props=True)
@@ -6005,6 +6164,7 @@ def patch_adds_executability_nocontents(
# And then try it in reverse
expected_disk.tweak('iota', props={})
expected_status.tweak('iota', status=' ')
+ expected_output.tweak('iota', status=' U')
svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
@@ -6012,12 +6172,12 @@ def patch_adds_executability_nocontents(
# And try it again
# This may produce different output but must have the same result
+ expected_output.tweak('iota', status=' G')
svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
[], True, True, '--reverse-diff')
-@XFail()
def patch_adds_executability_nocontents2(sbox):
"patch adds svn:executable, without contents 2"
@@ -6029,17 +6189,16 @@ def patch_adds_executability_nocontents2
"old mode 100644\n"
"new mode 100755\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
expected_output = wc.State(wc_dir, {
})
expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak('iota', status=' M')
expected_skip = wc.State(wc_dir, {
- 'new' : Item(verb='Skipped')
+ 'new' : Item(verb='Skipped missing target')
})
# This creates 'new', while a skip or reject is expected
@@ -6070,7 +6229,7 @@ def patch_adds_executability_yescontents
" This is the file 'mu'.\n"
"+with text mods too\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
expected_output = [
@@ -6086,7 +6245,7 @@ def patch_adds_executability_yescontents
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
check_props=True)
@@ -6106,7 +6265,7 @@ def patch_deletes_executability(sbox):
"old mode 100755\n"
"new mode 100644\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
expected_output = [
@@ -6120,7 +6279,7 @@ def patch_deletes_executability(sbox):
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
check_props=True)
@@ -6143,7 +6302,7 @@ def patch_ambiguous_executability_contra
"## -0,0 +1 ##\n"
"+*\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
expected_output = []
@@ -6155,7 +6314,7 @@ def patch_ambiguous_executability_contra
expected_skip = wc.State('', { })
error_re_string = r'.*Invalid patch:.*contradicting.*mode.*svn:executable'
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
error_re_string=error_re_string,
@@ -6179,7 +6338,7 @@ def patch_ambiguous_executability_consis
"## -0,0 +1 ##\n"
"+*\n"
)
- patch_file_path = make_patch_path(sbox)
+ patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
expected_output = [
@@ -6194,7 +6353,7 @@ def patch_ambiguous_executability_consis
expected_skip = wc.State('', { })
- svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip,
error_re_string=None,
@@ -6227,6 +6386,17 @@ def patch_prop_madness(sbox):
sbox.simple_commit()
+ r2_props = {
+ 'mod_l_n' : 'this\nis\na\nvery\nvery\nlong\nvalue.\nwithout\neol',
+ 'mod_l' : 'this\nis\na\nvery\nvery\nlong\nvalue.\n',
+ 'mod_s' : 'value\n',
+ 'mod_s_n' : 'no-eol',
+ 'del' : 'value\n',
+ 'del_n' : 'no-eol',
+ }
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.tweak('iota', 'A/mu', props=r2_props)
+
sbox.simple_propset('mod_s', 'other\n',
'iota', 'A/mu')
@@ -6259,7 +6429,6 @@ def patch_prop_madness(sbox):
_, output, _ = svntest.actions.run_and_verify_svn(None, [],
'diff', wc_dir)
- expected_disk = svntest.main.greek_state.copy()
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
new_props = {
@@ -6311,15 +6480,7 @@ def patch_prop_madness(sbox):
# Reverse
expected_output.tweak('A/mu', 'iota', status=' U')
- props = {
- 'mod_l_n' : 'this\nis\na\nvery\nvery\nlong\nvalue.\nwithout\neol',
- 'mod_l' : 'this\nis\na\nvery\nvery\nlong\nvalue.\n',
- 'mod_s' : 'value\n',
- 'mod_s_n' : 'no-eol',
- 'del' : 'value\n',
- 'del_n' : 'no-eol',
- }
- expected_disk.tweak('A/mu', 'iota', props=props)
+ expected_disk.tweak('A/mu', 'iota', props=r2_props)
expected_status.tweak('A/mu', 'iota', status=' ')
svntest.actions.run_and_verify_patch(wc_dir, patch,
expected_output, expected_disk,
@@ -6340,18 +6501,1033 @@ def patch_prop_madness(sbox):
# Ok, and now introduce some conflicts
sbox.simple_propset('del', 'value', 'iota') # Wrong EOL
- sbox.simple_propset('del', 'waarde', 'A/mu') # Wrong EOL+value
-
- sbox.simple_propset('del_n', 'no-eol\n', 'iota') # Wrong EOL
sbox.simple_propset('del_n', 'regeleinde\n', 'iota') # Wrong EOL+value
+ sbox.simple_propset('del', 'waarde', 'A/mu') # Wrong EOL+value
+ sbox.simple_propset('del_n', 'no-eol\n', 'A/mu') # Wrong EOL
+
expected_output.tweak('A/mu', 'iota', status=' C')
+ expected_status.tweak('iota', 'A/mu', status=' M')
+
+ iota_props = new_props.copy()
+ iota_props['del_n'] = 'regeleinde\n'
+ mu_props = new_props.copy()
+ mu_props['del'] = 'waarde'
+ expected_disk.tweak('iota', props=iota_props)
+ expected_disk.tweak('A/mu', props=mu_props)
+
+ expected_disk.add({
+ 'A/mu.svnpatch.rej' : Item(contents="--- %s\n"
+ "+++ %s\n"
+ "Property: del\n"
+ "## -1,1 +0,0 ##\n"
+ "-value\n"
+ % (sbox.path('A/mu'),
+ sbox.path('A/mu'))),
+ 'iota.svnpatch.rej' : Item(contents="--- %s\n"
+ "+++ %s\n"
+ "Property: del_n\n"
+ "## -1,1 +0,0 ##\n"
+ "-no-eol\n"
+ "\ No newline at end of property\n"
+ % (sbox.path('iota'),
+ sbox.path('iota'))),
+ })
+
svntest.actions.run_and_verify_patch(wc_dir, patch,
expected_output, expected_disk,
expected_status, expected_skip,
[], True, True,
'--strip', strip_count)
+def patch_empty_vs_delete(sbox):
+ "patch empty vs delete"
+
+ sbox.build(read_only = True)
+ wc_dir = sbox.wc_dir
+ strip_count = wc_dir.count(os.path.sep)+1
+
+ sbox.simple_append('iota', '', truncate=True)
+
+ _, empty_diff, _ = svntest.actions.run_and_verify_svn(None, [],
+ 'diff', wc_dir)
+
+ _, empty_git, _ = svntest.actions.run_and_verify_svn(None, [],
[... 994 lines stripped ...]