1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
import test_util
import sys
import unittest
class TestPushRenames(test_util.TestBase):
obsolete_mode_tests = True
stupid_mode_tests = True
def setUp(self):
test_util.TestBase.setUp(self)
self.repo_path = self.load_and_fetch('pushrenames.svndump')[1]
def _debug_print_copies(self, ctx):
w = sys.stderr.write
for f in ctx.files():
if f not in ctx:
w('R %s\n' % f)
else:
w('U %s %r\n' % (f, ctx[f].data()))
if ctx[f].renamed():
w('%s copied from %s\n' % (f, ctx[f].renamed()[0]))
def test_push_renames(self):
repo = self.repo
changes = [
# Regular copy of a single file
('a', 'a2', None),
# Copy and update of target
('a', 'a3', 'aa\n'),
# Regular move of a single file
('b', 'b2', None),
('b', None, None),
# Regular move and update of target
('c', 'c2', 'c\nc\n'),
('c', None, None),
# Copy and update of source and targets
('d', 'd2', 'd\nd2\n'),
('d', 'd', 'd\nd\n'),
# Double copy and removal (aka copy and move)
('e', 'e2', 'e\ne2\n'),
('e', 'e3', 'e\ne3\n'),
('e', None, None),
]
self.commitchanges(changes)
self.pushrevisions()
tip = self.repo['tip']
# self._debug_print_copies(tip)
self.assertchanges(changes, tip)
def test_push_rename_with_space(self):
changes = [
('random/dir with space/file with space',
'random/dir with space/file with space',
'file contents'),
]
self.commitchanges(changes)
changes = [
('random/dir with space/file with space',
'random2/dir with space/file with space',
None),
('random/dir with space/file with space',
None, None),
]
self.commitchanges(changes)
self.pushrevisions()
self.assertEqual(sorted(self.repo['tip'].manifest().keys()),
['a', 'b', 'c', 'd', 'e',
'random2/dir with space/file with space'])
def test_push_rename_tree(self):
repo = self.repo
changes = [
('geek/alpha', 'geek/alpha', 'content',),
('geek/beta', 'geek/beta', 'content',),
('geek/delta', 'geek/delta', 'content',),
('geek/gamma', 'geek/gamma', 'content',),
('geek/later/pi', 'geek/later/pi', 'content geek/later/pi',),
('geek/later/rho', 'geek/later/rho', 'content geek/later/rho',),
('geek/other/blah', 'geek/other/blah', 'content geek/other/blah',),
('geek/other/another/layer', 'geek/other/another/layer', 'content deep file',),
]
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
changes = [
# rename (copy + remove) all of geek to greek
('geek/alpha', 'greek/alpha', None,),
('geek/beta', 'greek/beta', None,),
('geek/delta', 'greek/delta', None,),
('geek/gamma', 'greek/gamma', None,),
('geek/later/pi', 'greek/later/pi', None,),
('geek/later/rho', 'greek/later/rho', None,),
('geek/other/blah', 'greek/other/blah', None,),
('geek/other/another/layer', 'greek/other/another/layer', None,),
('geek/alpha', None, None,),
('geek/beta', None, None,),
('geek/delta', None, None,),
('geek/gamma', None, None,),
('geek/later/pi', None, None,),
('geek/later/rho', None, None,),
('geek/other/blah', None, None,),
('geek/other/another/layer', None, None,),
]
self.commitchanges(changes)
self.pushrevisions()
assert reduce(lambda x, y: x and y,
('geek' not in f for f in test_util.svnls(self.repo_path, 'trunk'))), (
'This failure means rename of an entire tree is broken.'
' There is a print on the preceding line commented out '
'that should help you.')
|
