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
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
|
import test_util
import os, unittest, sys
from mercurial import commands
from mercurial import util as hgutil
try:
from mercurial import subrepo
# require svnsubrepo and hg >= 1.7.1
subrepo.svnsubrepo
hgutil.checknlink
except (ImportError, AttributeError), e:
print >> sys.stderr, 'test_externals: skipping .hgsub tests'
subrepo = None
from hgsubversion import svnexternals
class TestFetchExternals(test_util.TestBase):
stupid_mode_tests = True
def test_externalsfile(self):
f = svnexternals.externalsfile()
f['t1'] = 'dir1 -r10 svn://foobar'
f['t 2'] = 'dir2 -r10 svn://foobar'
f['t3'] = ['dir31 -r10 svn://foobar', 'dir32 -r10 svn://foobar']
refext = """[t 2]
dir2 -r10 svn://foobar
[t1]
dir1 -r10 svn://foobar
[t3]
dir31 -r10 svn://foobar
dir32 -r10 svn://foobar
"""
value = f.write()
self.assertEqual(refext, value)
f2 = svnexternals.externalsfile()
f2.read(value)
self.assertEqual(sorted(f), sorted(f2))
for t in f:
self.assertEqual(f[t], f2[t])
def test_parsedefinitions(self):
# Taken from svn book
samples = [
('third-party/sounds http://svn.example.com/repos/sounds',
('third-party/sounds', None, 'http://svn.example.com/repos/sounds', None,
'third-party/sounds http://svn.example.com/repos/sounds')),
('third-party/skins -r148 http://svn.example.com/skinproj',
('third-party/skins', '148', 'http://svn.example.com/skinproj', None,
'third-party/skins -r{REV} http://svn.example.com/skinproj')),
('third-party/skins -r 148 http://svn.example.com/skinproj',
('third-party/skins', '148', 'http://svn.example.com/skinproj', None,
'third-party/skins -r {REV} http://svn.example.com/skinproj')),
('http://svn.example.com/repos/sounds third-party/sounds',
('third-party/sounds', None, 'http://svn.example.com/repos/sounds', None,
'http://svn.example.com/repos/sounds third-party/sounds')),
('-r148 http://svn.example.com/skinproj third-party/skins',
('third-party/skins', '148', 'http://svn.example.com/skinproj', None,
'-r{REV} http://svn.example.com/skinproj third-party/skins')),
('-r 148 http://svn.example.com/skinproj third-party/skins',
('third-party/skins', '148', 'http://svn.example.com/skinproj', None,
'-r {REV} http://svn.example.com/skinproj third-party/skins')),
('http://svn.example.com/skin-maker@21 third-party/skins/toolkit',
('third-party/skins/toolkit', None, 'http://svn.example.com/skin-maker', '21',
'http://svn.example.com/skin-maker@21 third-party/skins/toolkit')),
]
for line, expected in samples:
self.assertEqual(expected, svnexternals.parsedefinition(line))
def test_externals(self):
repo = self._load_fixture_and_fetch('externals.svndump')
ref0 = """[.]
^/externals/project1 deps/project1
"""
self.assertMultiLineEqual(ref0, repo[0]['.hgsvnexternals'].data())
ref1 = """\
[.]
# A comment, then an empty line, then a blank line
^/externals/project1 deps/project1
-r2 ^/externals/project2@2 deps/project2
"""
self.assertMultiLineEqual(ref1, repo[1]['.hgsvnexternals'].data())
ref2 = """[.]
-r2 ^/externals/project2@2 deps/project2
[subdir]
^/externals/project1 deps/project1
[subdir2]
^/externals/project1 deps/project1
"""
actual = repo[2]['.hgsvnexternals'].data()
self.assertEqual(ref2, actual)
ref3 = """[.]
-r2 ^/externals/project2@2 deps/project2
[subdir]
^/externals/project1 deps/project1
"""
self.assertEqual(ref3, repo[3]['.hgsvnexternals'].data())
ref4 = """[subdir]
^/externals/project1 deps/project1
"""
self.assertEqual(ref4, repo[4]['.hgsvnexternals'].data())
ref5 = """[.]
-r2 ^/externals/project2@2 deps/project2
[subdir2]
^/externals/project1 deps/project1
"""
self.assertEqual(ref5, repo[5]['.hgsvnexternals'].data())
ref6 = """[.]
-r2 ^/externals/project2@2 deps/project2
"""
self.assertEqual(ref6, repo[6]['.hgsvnexternals'].data())
def test_updateexternals(self):
def checkdeps(deps, nodeps, repo, rev=None):
svnexternals.updateexternals(ui, [rev], repo)
for d in deps:
p = os.path.join(repo.root, d)
self.assertTrue(os.path.isdir(p),
'missing: %s@%r' % (d, rev))
for d in nodeps:
p = os.path.join(repo.root, d)
self.assertTrue(not os.path.isdir(p),
'unexpected: %s@%r' % (d, rev))
ui = self.ui()
repo = self._load_fixture_and_fetch('externals.svndump')
commands.update(ui, repo)
checkdeps(['deps/project1'], [], repo, 0)
checkdeps(['deps/project1', 'deps/project2'], [], repo, 1)
checkdeps(['subdir/deps/project1', 'subdir2/deps/project1',
'deps/project2'],
['deps/project1'], repo, 2)
checkdeps(['subdir/deps/project1', 'deps/project2'],
['subdir2/deps/project1'], repo, 3)
checkdeps(['subdir/deps/project1'], ['deps/project2'], repo, 4)
def test_hgsub(self):
if subrepo is None:
return
repo = self._load_fixture_and_fetch('externals.svndump',
externals='subrepos')
self.assertEqual("""\
deps/project1 = [hgsubversion] :^/externals/project1 deps/project1
""", repo[0]['.hgsub'].data())
self.assertEqual("""\
HEAD deps/project1
""", repo[0]['.hgsubstate'].data())
self.assertEqual("""\
deps/project1 = [hgsubversion] :^/externals/project1 deps/project1
deps/project2 = [hgsubversion] :-r{REV} ^/externals/project2@2 deps/project2
""", repo[1]['.hgsub'].data())
self.assertEqual("""\
HEAD deps/project1
2 deps/project2
""", repo[1]['.hgsubstate'].data())
self.assertEqual("""\
deps/project2 = [hgsubversion] :-r{REV} ^/externals/project2@2 deps/project2
subdir/deps/project1 = [hgsubversion] subdir:^/externals/project1 deps/project1
subdir2/deps/project1 = [hgsubversion] subdir2:^/externals/project1 deps/project1
""", repo[2]['.hgsub'].data())
self.assertEqual("""\
2 deps/project2
HEAD subdir/deps/project1
HEAD subdir2/deps/project1
""", repo[2]['.hgsubstate'].data())
self.assertMultiLineEqual("""\
deps/project2 = [hgsubversion] :-r{REV} ^/externals/project2@2 deps/project2
subdir/deps/project1 = [hgsubversion] subdir:^/externals/project1 deps/project1
""", repo[3]['.hgsub'].data())
self.assertEqual("""\
2 deps/project2
HEAD subdir/deps/project1
""", repo[3]['.hgsubstate'].data())
self.assertEqual("""\
subdir/deps/project1 = [hgsubversion] subdir:^/externals/project1 deps/project1
""", repo[4]['.hgsub'].data())
self.assertEqual("""\
HEAD subdir/deps/project1
""", repo[4]['.hgsubstate'].data())
self.assertEqual("""\
deps/project2 = [hgsubversion] :-r{REV} ^/externals/project2@2 deps/project2
subdir2/deps/project1 = [hgsubversion] subdir2:^/externals/project1 deps/project1
""", repo[5]['.hgsub'].data())
self.assertEqual("""\
2 deps/project2
HEAD subdir2/deps/project1
""", repo[5]['.hgsubstate'].data())
self.assertEqual("""\
deps/project2 = [hgsubversion] :-r{REV} ^/externals/project2@2 deps/project2
""", repo[6]['.hgsub'].data())
self.assertEqual("""\
2 deps/project2
""", repo[6]['.hgsubstate'].data())
def test_ignore(self):
repo = self._load_fixture_and_fetch('externals.svndump',
externals='ignore')
for rev in repo:
ctx = repo[rev]
self.assertTrue('.hgsvnexternals' not in ctx)
self.assertTrue('.hgsub' not in ctx)
self.assertTrue('.hgsubstate' not in ctx)
def test_updatehgsub(self):
def checkdeps(ui, repo, rev, deps, nodeps):
commands.update(ui, repo, node=str(rev))
for d in deps:
p = os.path.join(repo.root, d)
self.assertTrue(os.path.isdir(p),
'missing: %s@%r' % (d, repo[None].rev()))
for d in nodeps:
p = os.path.join(repo.root, d)
self.assertTrue(not os.path.isdir(p),
'unexpected: %s@%r' % (d, repo[None].rev()))
if subrepo is None:
return
ui = self.ui()
repo = self._load_fixture_and_fetch('externals.svndump',
externals='subrepos')
checkdeps(ui, repo, 0, ['deps/project1'], [])
checkdeps(ui, repo, 1, ['deps/project1', 'deps/project2'], [])
checkdeps(ui, repo, 2, ['subdir/deps/project1', 'subdir2/deps/project1',
'deps/project2'],
['deps/project1'])
checkdeps(ui, repo, 3, ['subdir/deps/project1', 'deps/project2'],
['subdir2/deps/project1'])
checkdeps(ui, repo, 4, ['subdir/deps/project1'], ['deps/project2'])
# Test update --clean, used to crash
repo.wwrite('subdir/deps/project1/a', 'foobar', '')
commands.update(ui, repo, node='4', clean=True)
def test_mergeexternals(self):
if subrepo is None:
return
repo = self._load_fixture_and_fetch('mergeexternals.svndump',
externals='subrepos')
# Check merged directories externals are fine
self.assertEqual("""\
d1/ext = [hgsubversion] d1:^/trunk/common/ext ext
d2/ext = [hgsubversion] d2:^/trunk/common/ext ext
d3/ext3 = [hgsubversion] d3:^/trunk/common/ext ext3
""", repo['tip']['.hgsub'].data())
class TestPushExternals(test_util.TestBase):
stupid_mode_tests = True
obsolete_mode_tests = True
def test_push_externals(self):
repo = self._load_fixture_and_fetch('pushexternals.svndump')
# Add a new reference on an existing and non-existing directory
changes = [
('.hgsvnexternals', '.hgsvnexternals',
"""[dir]
../externals/project2 deps/project2
[subdir1]
../externals/project1 deps/project1
[subdir2]
../externals/project2 deps/project2
"""),
('subdir1/a', 'subdir1/a', 'a'),
('subdir2/a', 'subdir2/a', 'a'),
]
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
# Remove all references from one directory, add a new one
# to the other (test multiline entries)
changes = [
('.hgsvnexternals', '.hgsvnexternals',
"""[subdir1]
../externals/project1 deps/project1
../externals/project2 deps/project2
"""),
# This removal used to trigger the parent directory removal
('subdir1/a', None, None),
]
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
# Check subdir2/a is still there even if the externals were removed
self.assertTrue('subdir2/a' in self.repo['tip'])
self.assertTrue('subdir1/a' not in self.repo['tip'])
# Test externals removal
changes = [
('.hgsvnexternals', None, None),
]
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
def test_push_hgsub(self):
if subrepo is None:
return
repo, repo_path = self.load_and_fetch('pushexternals.svndump',
externals='subrepos')
# Add a new reference on an existing and non-existing directory
changes = [
('.hgsub', '.hgsub', """\
dir/deps/project2 = [hgsubversion] dir:^/externals/project2 deps/project2
subdir1/deps/project1 = [hgsubversion] subdir1:^/externals/project1 deps/project1
subdir2/deps/project2 = [hgsubversion] subdir2:^/externals/project2 deps/project2
"""),
('.hgsubstate', '.hgsubstate', """\
HEAD dir/deps/project2
HEAD subdir1/deps/project1
HEAD subdir2/deps/project2
"""),
('subdir1/a', 'subdir1/a', 'a'),
('subdir2/a', 'subdir2/a', 'a'),
]
self.svnco(repo_path, 'externals/project2', '2', 'dir/deps/project2')
self.svnco(repo_path, 'externals/project1', '2', 'subdir1/deps/project1')
self.svnco(repo_path, 'externals/project2', '2', 'subdir2/deps/project2')
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
# Check .hgsub and .hgsubstate were not pushed
self.assertEqual(['dir', 'subdir1', 'subdir1/a', 'subdir2',
'subdir2/a'], test_util.svnls(repo_path, 'trunk'))
# Remove all references from one directory, add a new one
# to the other (test multiline entries)
changes = [
('.hgsub', '.hgsub', """\
subdir1/deps/project1 = [hgsubversion] subdir1:^/externals/project1 deps/project1
subdir1/deps/project2 = [hgsubversion] subdir1:^/externals/project2 deps/project2
"""),
('.hgsubstate', '.hgsubstate', """\
HEAD subdir1/deps/project1
HEAD subdir1/deps/project2
"""),
# This removal used to trigger the parent directory removal
('subdir1/a', None, None),
]
self.svnco(repo_path, 'externals/project1', '2', 'subdir1/deps/project1')
self.svnco(repo_path, 'externals/project2', '2', 'subdir1/deps/project2')
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
# Check subdir2/a is still there even if the externals were removed
self.assertTrue('subdir2/a' in self.repo['tip'])
self.assertTrue('subdir1/a' not in self.repo['tip'])
# Move the externals so they are defined on the base directory,
# this used to cause full branch removal when deleting the .hgsub
changes = [
('.hgsub', '.hgsub', """\
subdir1/deps/project1 = [hgsubversion] :^/externals/project1 subdir1/deps/project1
"""),
('.hgsubstate', '.hgsubstate', """\
HEAD subdir1/deps/project1
"""),
]
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
# Test externals removal
changes = [
('.hgsub', None, None),
('.hgsubstate', None, None),
]
self.commitchanges(changes)
self.pushrevisions()
self.assertchanges(changes, self.repo['tip'])
|
