/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.65.4 by James Westby
Make the rename handling more robust.
1
# Copyright (C) 2008 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
import time
18
19
from bzrlib import (
20
    branch,
21
    tests,
22
    )
23
24
from bzrlib.plugins.fastimport import (
25
    commands,
26
    errors,
27
    )
28
29
from bzrlib.plugins.fastimport.processors import (
30
    generic_processor,
31
    )
32
33
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
34
class TestCaseForGenericProcessor(tests.TestCaseWithTransport):
0.65.4 by James Westby
Make the rename handling more robust.
35
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
36
    branch_format = "pack-0.92"
37
0.65.4 by James Westby
Make the rename handling more robust.
38
    def get_handler(self):
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
39
        branch = self.make_branch('.', format=self.branch_format)
0.96.1 by Ian Clatworthy
update existing tests to reflect implicit directory pruning bahaviour
40
        handler = generic_processor.GenericProcessor(branch.bzrdir)
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
41
        return handler, branch
0.65.4 by James Westby
Make the rename handling more robust.
42
43
    # FIXME: [] as a default is bad, as it is mutable, but I want
44
    # to use None to mean "don't check this".
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
45
    def assertChanges(self, branch, revno, expected_added=[],
46
            expected_removed=[], expected_modified=[],
0.80.3 by Ian Clatworthy
file <-> symlink change tests
47
            expected_renamed=[], expected_kind_changed=[]):
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
48
        """Check the changes introduced in a revision of a branch.
49
50
        This method checks that a revision introduces expected changes.
51
        The required changes are passed in as a list, where
52
        each entry contains the needed information about the change.
53
54
        If you do not wish to assert anything about a particular
55
        category then pass None instead.
56
57
        branch: The branch.
58
        revno: revision number of revision to check.
59
        expected_added: a list of (filename,) tuples that must have
60
            been added in the delta.
61
        expected_removed: a list of (filename,) tuples that must have
62
            been removed in the delta.
63
        expected_modified: a list of (filename,) tuples that must have
64
            been modified in the delta.
65
        expected_renamed: a list of (old_path, new_path) tuples that
66
            must have been renamed in the delta.
0.80.3 by Ian Clatworthy
file <-> symlink change tests
67
        expected_kind_changed: a list of (path, old_kind, new_kind) tuples
68
            that must have been changed in the delta.
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
69
        :return: revtree1, revtree2
70
        """
71
        repo = branch.repository
0.80.1 by Ian Clatworthy
basic units tests for filemodify
72
        revtree1 = repo.revision_tree(branch.get_rev_id(revno - 1))
73
        revtree2 = repo.revision_tree(branch.get_rev_id(revno))
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
74
        changes = revtree2.changes_from(revtree1)
0.80.3 by Ian Clatworthy
file <-> symlink change tests
75
        self._check_changes(changes, expected_added, expected_removed,
76
            expected_modified, expected_renamed, expected_kind_changed)
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
77
        return revtree1, revtree2
78
0.80.3 by Ian Clatworthy
file <-> symlink change tests
79
    def _check_changes(self, changes, expected_added=[],
0.65.4 by James Westby
Make the rename handling more robust.
80
            expected_removed=[], expected_modified=[],
0.80.3 by Ian Clatworthy
file <-> symlink change tests
81
            expected_renamed=[], expected_kind_changed=[]):
0.65.4 by James Westby
Make the rename handling more robust.
82
        """Check the changes in a TreeDelta
83
84
        This method checks that the TreeDelta contains the expected
85
        modifications between the two trees that were used to generate
86
        it. The required changes are passed in as a list, where
87
        each entry contains the needed information about the change.
88
89
        If you do not wish to assert anything about a particular
90
        category then pass None instead.
91
92
        changes: The TreeDelta to check.
93
        expected_added: a list of (filename,) tuples that must have
94
            been added in the delta.
95
        expected_removed: a list of (filename,) tuples that must have
96
            been removed in the delta.
97
        expected_modified: a list of (filename,) tuples that must have
98
            been modified in the delta.
99
        expected_renamed: a list of (old_path, new_path) tuples that
100
            must have been renamed in the delta.
0.80.3 by Ian Clatworthy
file <-> symlink change tests
101
        expected_kind_changed: a list of (path, old_kind, new_kind) tuples
102
            that must have been changed in the delta.
0.65.4 by James Westby
Make the rename handling more robust.
103
        """
104
        renamed = changes.renamed
105
        added = changes.added
106
        removed = changes.removed
107
        modified = changes.modified
0.80.3 by Ian Clatworthy
file <-> symlink change tests
108
        kind_changed = changes.kind_changed
0.65.4 by James Westby
Make the rename handling more robust.
109
        if expected_renamed is not None:
110
            self.assertEquals(len(renamed), len(expected_renamed),
0.74.1 by John Arbash Meinel
Change the rename code to create a new text entry.
111
                "%s is renamed, expected %s" % (renamed, expected_renamed))
0.65.4 by James Westby
Make the rename handling more robust.
112
            renamed_files = [(item[0], item[1]) for item in renamed]
113
            for expected_renamed_entry in expected_renamed:
114
                self.assertTrue(expected_renamed_entry in renamed_files,
115
                    "%s is not renamed, %s are" % (str(expected_renamed_entry),
116
                        renamed_files))
117
        if expected_added is not None:
118
            self.assertEquals(len(added), len(expected_added),
119
                "%s is added" % str(added))
120
            added_files = [(item[0],) for item in added]
121
            for expected_added_entry in expected_added:
122
                self.assertTrue(expected_added_entry in added_files,
123
                    "%s is not added, %s are" % (str(expected_added_entry),
124
                        added_files))
125
        if expected_removed is not None:
126
            self.assertEquals(len(removed), len(expected_removed),
127
                "%s is removed" % str(removed))
128
            removed_files = [(item[0],) for item in removed]
129
            for expected_removed_entry in expected_removed:
130
                self.assertTrue(expected_removed_entry in removed_files,
131
                    "%s is not removed, %s are" % (str(expected_removed_entry),
132
                        removed_files))
133
        if expected_modified is not None:
134
            self.assertEquals(len(modified), len(expected_modified),
135
                "%s is modified" % str(modified))
136
            modified_files = [(item[0],) for item in modified]
137
            for expected_modified_entry in expected_modified:
138
                self.assertTrue(expected_modified_entry in modified_files,
0.80.3 by Ian Clatworthy
file <-> symlink change tests
139
                    "%s is not modified, %s are" % (
140
                    str(expected_modified_entry), modified_files))
141
        if expected_kind_changed is not None:
142
            self.assertEquals(len(kind_changed), len(expected_kind_changed),
143
                "%s is kind-changed, expected %s" % (kind_changed,
144
                    expected_kind_changed))
145
            kind_changed_files = [(item[0], item[2], item[3])
146
                for item in kind_changed]
147
            for expected_kind_changed_entry in expected_kind_changed:
148
                self.assertTrue(expected_kind_changed_entry in
149
                    kind_changed_files, "%s is not kind-changed, %s are" % (
150
                    str(expected_kind_changed_entry), kind_changed_files))
0.65.4 by James Westby
Make the rename handling more robust.
151
0.80.1 by Ian Clatworthy
basic units tests for filemodify
152
    def assertContent(self, branch, tree, path, content):
153
        file_id = tree.inventory.path2id(path)
154
        branch.lock_read()
155
        self.addCleanup(branch.unlock)
156
        self.assertEqual(tree.get_file_text(file_id), content)
157
158
    def assertSymlinkTarget(self, branch, tree, path, target):
159
        file_id = tree.inventory.path2id(path)
160
        branch.lock_read()
161
        self.addCleanup(branch.unlock)
162
        self.assertEqual(tree.get_symlink_target(file_id), target)
163
0.80.4 by Ian Clatworthy
file executable off <-> on tests
164
    def assertExecutable(self, branch, tree, path, executable):
165
        file_id = tree.inventory.path2id(path)
166
        branch.lock_read()
167
        self.addCleanup(branch.unlock)
168
        self.assertEqual(tree.is_executable(file_id), executable)
169
0.80.1 by Ian Clatworthy
basic units tests for filemodify
170
    def assertRevisionRoot(self, revtree, path):
171
        self.assertEqual(revtree.get_revision_id(),
172
                         revtree.inventory.root.children[path].revision)
173
174
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
175
class TestImportToPackModify(TestCaseForGenericProcessor):
0.80.1 by Ian Clatworthy
basic units tests for filemodify
176
0.80.3 by Ian Clatworthy
file <-> symlink change tests
177
    def file_command_iter(self, path, kind='file', content='aaa',
0.80.4 by Ian Clatworthy
file executable off <-> on tests
178
        executable=False, to_kind=None, to_content='bbb', to_executable=None):
179
        # Revno 1: create a file or symlink
180
        # Revno 2: modify it
0.80.3 by Ian Clatworthy
file <-> symlink change tests
181
        if to_kind is None:
182
            to_kind = kind
0.80.4 by Ian Clatworthy
file executable off <-> on tests
183
        if to_executable is None:
184
            to_executable = executable
0.80.1 by Ian Clatworthy
basic units tests for filemodify
185
        def command_list():
186
            author = ['', 'bugs@a.com', time.time(), time.timezone]
187
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
188
            def files_one():
0.80.4 by Ian Clatworthy
file executable off <-> on tests
189
                yield commands.FileModifyCommand(path, kind, executable,
0.80.3 by Ian Clatworthy
file <-> symlink change tests
190
                        None, content)
0.80.1 by Ian Clatworthy
basic units tests for filemodify
191
            yield commands.CommitCommand('head', '1', author,
192
                committer, "commit 1", None, [], files_one)
193
            def files_two():
0.80.4 by Ian Clatworthy
file executable off <-> on tests
194
                yield commands.FileModifyCommand(path, to_kind, to_executable,
0.80.3 by Ian Clatworthy
file <-> symlink change tests
195
                        None, to_content)
0.80.1 by Ian Clatworthy
basic units tests for filemodify
196
            yield commands.CommitCommand('head', '2', author,
197
                committer, "commit 2", ":1", [], files_two)
198
        return command_list
199
200
    def test_modify_file_in_root(self):
201
        handler, branch = self.get_handler()
202
        path = 'a'
203
        handler.process(self.file_command_iter(path))
204
        revtree0, revtree1 = self.assertChanges(branch, 1,
205
            expected_added=[(path,)])
206
        revtree1, revtree2 = self.assertChanges(branch, 2,
207
            expected_modified=[(path,)])
208
        self.assertContent(branch, revtree1, path, "aaa")
209
        self.assertContent(branch, revtree2, path, "bbb")
210
        self.assertRevisionRoot(revtree1, path)
211
        self.assertRevisionRoot(revtree2, path)
212
213
    def test_modify_file_in_subdir(self):
214
        handler, branch = self.get_handler()
215
        path = 'a/a'
216
        handler.process(self.file_command_iter(path))
217
        revtree0, revtree1 = self.assertChanges(branch, 1,
218
            expected_added=[('a',), (path,)])
219
        revtree1, revtree2 = self.assertChanges(branch, 2,
220
            expected_modified=[(path,)])
221
        self.assertContent(branch, revtree1, path, "aaa")
222
        self.assertContent(branch, revtree2, path, "bbb")
223
224
    def test_modify_symlink_in_root(self):
225
        handler, branch = self.get_handler()
226
        path = 'a'
227
        handler.process(self.file_command_iter(path, kind='symlink'))
228
        revtree1, revtree2 = self.assertChanges(branch, 2,
229
            expected_modified=[(path,)])
230
        self.assertSymlinkTarget(branch, revtree1, path, "aaa")
231
        self.assertSymlinkTarget(branch, revtree2, path, "bbb")
232
        self.assertRevisionRoot(revtree1, path)
233
        self.assertRevisionRoot(revtree2, path)
234
235
    def test_modify_symlink_in_subdir(self):
236
        handler, branch = self.get_handler()
237
        path = 'a/a'
238
        handler.process(self.file_command_iter(path, kind='symlink'))
239
        revtree0, revtree1 = self.assertChanges(branch, 1,
240
            expected_added=[('a',), (path,)])
241
        revtree1, revtree2 = self.assertChanges(branch, 2,
242
            expected_modified=[(path,)])
243
        self.assertSymlinkTarget(branch, revtree1, path, "aaa")
244
        self.assertSymlinkTarget(branch, revtree2, path, "bbb")
245
0.80.3 by Ian Clatworthy
file <-> symlink change tests
246
    def test_modify_file_becomes_symlink(self):
247
        handler, branch = self.get_handler()
248
        path = 'a/a'
249
        handler.process(self.file_command_iter(path,
250
            kind='file', to_kind='symlink'))
251
        revtree0, revtree1 = self.assertChanges(branch, 1,
252
            expected_added=[('a',), (path,)])
253
        revtree1, revtree2 = self.assertChanges(branch, 2,
254
            expected_kind_changed=[(path, 'file', 'symlink')])
255
        self.assertContent(branch, revtree1, path, "aaa")
256
        self.assertSymlinkTarget(branch, revtree2, path, "bbb")
257
258
    def test_modify_symlink_becomes_file(self):
259
        handler, branch = self.get_handler()
260
        path = 'a/a'
261
        handler.process(self.file_command_iter(path,
262
            kind='symlink', to_kind='file'))
263
        revtree0, revtree1 = self.assertChanges(branch, 1,
264
            expected_added=[('a',), (path,)])
265
        revtree1, revtree2 = self.assertChanges(branch, 2,
266
            expected_kind_changed=[(path, 'symlink', 'file')])
267
        self.assertSymlinkTarget(branch, revtree1, path, "aaa")
268
        self.assertContent(branch, revtree2, path, "bbb")
269
0.80.4 by Ian Clatworthy
file executable off <-> on tests
270
    def test_modify_file_now_executable(self):
271
        handler, branch = self.get_handler()
272
        path = 'a/a'
273
        handler.process(self.file_command_iter(path,
274
            executable=False, to_executable=True, to_content='aaa'))
275
        revtree0, revtree1 = self.assertChanges(branch, 1,
276
            expected_added=[('a',), (path,)])
277
        revtree1, revtree2 = self.assertChanges(branch, 2,
278
            expected_modified=[(path,)])
279
        self.assertExecutable(branch, revtree1, path, False)
280
        self.assertExecutable(branch, revtree2, path, True)
281
282
    def test_modify_file_no_longer_executable(self):
283
        handler, branch = self.get_handler()
284
        path = 'a/a'
285
        handler.process(self.file_command_iter(path,
286
            executable=True, to_executable=False, to_content='aaa'))
287
        revtree0, revtree1 = self.assertChanges(branch, 1,
288
            expected_added=[('a',), (path,)])
289
        revtree1, revtree2 = self.assertChanges(branch, 2,
290
            expected_modified=[(path,)])
291
        self.assertExecutable(branch, revtree1, path, True)
292
        self.assertExecutable(branch, revtree2, path, False)
293
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
294
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
295
class TestImportToPackModifyTricky(TestCaseForGenericProcessor):
0.80.5 by Ian Clatworthy
file/symlink <-> directory change tests & fix
296
297
    def file_command_iter(self, path1, path2, kind='file'):
298
        # Revno 1: create a file or symlink in a directory
299
        # Revno 2: create a second file that implicitly deletes the
300
        # first one because either:
301
        # * the new file is a in directory with the old file name
302
        # * the new file has the same name as the directory of the first
303
        def command_list():
304
            author = ['', 'bugs@a.com', time.time(), time.timezone]
305
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
306
            def files_one():
307
                yield commands.FileModifyCommand(path1, kind, False,
308
                        None, "aaa")
309
            yield commands.CommitCommand('head', '1', author,
310
                committer, "commit 1", None, [], files_one)
311
            def files_two():
312
                yield commands.FileModifyCommand(path2, kind, False,
313
                        None, "bbb")
314
            yield commands.CommitCommand('head', '2', author,
315
                committer, "commit 2", ":1", [], files_two)
316
        return command_list
317
318
319
    def test_modify_file_becomes_directory(self):
320
        handler, branch = self.get_handler()
321
        path1 = 'a/b'
322
        path2 = 'a/b/c'
323
        handler.process(self.file_command_iter(path1, path2))
324
        revtree0, revtree1 = self.assertChanges(branch, 1,
325
            expected_added=[('a',), (path1,)])
326
        revtree1, revtree2 = self.assertChanges(branch, 2,
327
            expected_added=[(path2,)],
328
            expected_kind_changed=[(path1, 'file', 'directory')])
329
        self.assertContent(branch, revtree1, path1, "aaa")
330
        self.assertContent(branch, revtree2, path2, "bbb")
331
332
    def test_modify_directory_becomes_file(self):
333
        handler, branch = self.get_handler()
334
        path1 = 'a/b/c'
335
        path2 = 'a/b'
336
        handler.process(self.file_command_iter(path1, path2))
337
        revtree0, revtree1 = self.assertChanges(branch, 1,
338
            expected_added=[('a',), ('a/b',), (path1,)])
339
        revtree1, revtree2 = self.assertChanges(branch, 2,
340
            expected_removed=[(path1,),],
341
            expected_kind_changed=[(path2, 'directory', 'file')])
342
        self.assertContent(branch, revtree1, path1, "aaa")
343
        self.assertContent(branch, revtree2, path2, "bbb")
344
345
    def test_modify_symlink_becomes_directory(self):
346
        handler, branch = self.get_handler()
347
        path1 = 'a/b'
348
        path2 = 'a/b/c'
349
        handler.process(self.file_command_iter(path1, path2, 'symlink'))
350
        revtree0, revtree1 = self.assertChanges(branch, 1,
351
            expected_added=[('a',), (path1,)])
352
        revtree1, revtree2 = self.assertChanges(branch, 2,
353
            expected_added=[(path2,)],
354
            expected_kind_changed=[(path1, 'symlink', 'directory')])
355
        self.assertSymlinkTarget(branch, revtree1, path1, "aaa")
356
        self.assertSymlinkTarget(branch, revtree2, path2, "bbb")
357
358
    def test_modify_directory_becomes_symlink(self):
359
        handler, branch = self.get_handler()
360
        path1 = 'a/b/c'
361
        path2 = 'a/b'
362
        handler.process(self.file_command_iter(path1, path2, 'symlink'))
363
        revtree0, revtree1 = self.assertChanges(branch, 1,
364
            expected_added=[('a',), ('a/b',), (path1,)])
365
        revtree1, revtree2 = self.assertChanges(branch, 2,
366
            expected_removed=[(path1,),],
367
            expected_kind_changed=[(path2, 'directory', 'symlink')])
368
        self.assertSymlinkTarget(branch, revtree1, path1, "aaa")
369
        self.assertSymlinkTarget(branch, revtree2, path2, "bbb")
370
371
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
372
class TestImportToPackDelete(TestCaseForGenericProcessor):
0.80.2 by Ian Clatworthy
basic delete tests
373
374
    def file_command_iter(self, path, kind='file'):
0.80.4 by Ian Clatworthy
file executable off <-> on tests
375
        # Revno 1: create a file or symlink
376
        # Revno 2: delete it
0.80.2 by Ian Clatworthy
basic delete tests
377
        def command_list():
378
            author = ['', 'bugs@a.com', time.time(), time.timezone]
379
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
380
            def files_one():
381
                yield commands.FileModifyCommand(path, kind, False,
382
                        None, "aaa")
383
            yield commands.CommitCommand('head', '1', author,
384
                committer, "commit 1", None, [], files_one)
385
            def files_two():
386
                yield commands.FileDeleteCommand(path)
387
            yield commands.CommitCommand('head', '2', author,
388
                committer, "commit 2", ":1", [], files_two)
389
        return command_list
390
391
    def test_delete_file_in_root(self):
392
        handler, branch = self.get_handler()
393
        path = 'a'
394
        handler.process(self.file_command_iter(path))
395
        revtree0, revtree1 = self.assertChanges(branch, 1,
396
            expected_added=[(path,)])
397
        revtree1, revtree2 = self.assertChanges(branch, 2,
398
            expected_removed=[(path,)])
399
        self.assertContent(branch, revtree1, path, "aaa")
400
        self.assertRevisionRoot(revtree1, path)
401
402
    def test_delete_file_in_subdir(self):
403
        handler, branch = self.get_handler()
404
        path = 'a/a'
405
        handler.process(self.file_command_iter(path))
406
        revtree0, revtree1 = self.assertChanges(branch, 1,
407
            expected_added=[('a',), (path,)])
408
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.96.1 by Ian Clatworthy
update existing tests to reflect implicit directory pruning bahaviour
409
            expected_removed=[('a',), (path,)])
0.80.2 by Ian Clatworthy
basic delete tests
410
        self.assertContent(branch, revtree1, path, "aaa")
411
412
    def test_delete_symlink_in_root(self):
413
        handler, branch = self.get_handler()
414
        path = 'a'
415
        handler.process(self.file_command_iter(path, kind='symlink'))
416
        revtree1, revtree2 = self.assertChanges(branch, 2,
417
            expected_removed=[(path,)])
418
        self.assertSymlinkTarget(branch, revtree1, path, "aaa")
419
        self.assertRevisionRoot(revtree1, path)
420
421
    def test_delete_symlink_in_subdir(self):
422
        handler, branch = self.get_handler()
423
        path = 'a/a'
424
        handler.process(self.file_command_iter(path, kind='symlink'))
425
        revtree0, revtree1 = self.assertChanges(branch, 1,
426
            expected_added=[('a',), (path,)])
427
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.96.1 by Ian Clatworthy
update existing tests to reflect implicit directory pruning bahaviour
428
            expected_removed=[('a',), (path,)])
0.80.2 by Ian Clatworthy
basic delete tests
429
        self.assertSymlinkTarget(branch, revtree1, path, "aaa")
430
431
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
432
class TestImportToPackDeleteDirectory(TestCaseForGenericProcessor):
0.80.7 by Ian Clatworthy
add directory delete test
433
434
    def file_command_iter(self, paths, dir):
435
        # Revno 1: create multiple files
436
        # Revno 2: delete a directory holding those files
437
        def command_list():
438
            author = ['', 'bugs@a.com', time.time(), time.timezone]
439
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
440
            def files_one():
441
                for i, path in enumerate(paths):
442
                    yield commands.FileModifyCommand(path, 'file', False,
443
                            None, "aaa%d" % i)
444
            yield commands.CommitCommand('head', '1', author,
445
                committer, "commit 1", None, [], files_one)
446
            def files_two():
447
                yield commands.FileDeleteCommand(dir)
448
            yield commands.CommitCommand('head', '2', author,
449
                committer, "commit 2", ":1", [], files_two)
450
        return command_list
451
452
    def test_delete_dir(self):
453
        handler, branch = self.get_handler()
454
        paths = ['a/b/c', 'a/b/d', 'a/b/e/f', 'a/g']
455
        dir = 'a/b'
456
        handler.process(self.file_command_iter(paths, dir))
457
        revtree0, revtree1 = self.assertChanges(branch, 1,
458
            expected_added=[
459
                ('a',), ('a/b',), ('a/b/c',),
460
                ('a/b/d',),
461
                ('a/b/e',), ('a/b/e/f',),
462
                ('a/g',),
463
                ])
464
        revtree1, revtree2 = self.assertChanges(branch, 2,
465
            expected_removed=[
466
                ('a/b',), ('a/b/c',),
467
                ('a/b/d',),
468
                ('a/b/e',), ('a/b/e/f',),
469
                ])
470
471
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
472
class TestImportToPackRename(TestCaseForGenericProcessor):
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
473
474
    def get_command_iter(self, old_path, new_path):
0.80.4 by Ian Clatworthy
file executable off <-> on tests
475
        # Revno 1: create a file or symlink
476
        # Revno 2: rename it
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
477
        def command_list():
478
            author = ['', 'bugs@a.com', time.time(), time.timezone]
479
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
480
            def files_one():
481
                yield commands.FileModifyCommand(old_path, 'file', False,
482
                        None, "aaa")
483
            yield commands.CommitCommand('head', '1', author,
484
                committer, "commit 1", None, [], files_one)
485
            def files_two():
486
                yield commands.FileRenameCommand(old_path, new_path)
487
            yield commands.CommitCommand('head', '2', author,
488
                committer, "commit 2", ":1", [], files_two)
489
        return command_list
490
0.65.4 by James Westby
Make the rename handling more robust.
491
    def test_rename_in_root(self):
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
492
        handler, branch = self.get_handler()
0.65.4 by James Westby
Make the rename handling more robust.
493
        old_path = 'a'
494
        new_path = 'b'
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
495
        handler.process(self.get_command_iter(old_path, new_path))
0.80.1 by Ian Clatworthy
basic units tests for filemodify
496
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
497
            expected_renamed=[(old_path, new_path)])
0.80.1 by Ian Clatworthy
basic units tests for filemodify
498
        self.assertRevisionRoot(revtree1, old_path)
499
        self.assertRevisionRoot(revtree2, new_path)
0.65.4 by James Westby
Make the rename handling more robust.
500
501
    def test_rename_in_subdir(self):
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
502
        handler, branch = self.get_handler()
0.65.4 by James Westby
Make the rename handling more robust.
503
        old_path = 'a/a'
504
        new_path = 'a/b'
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
505
        handler.process(self.get_command_iter(old_path, new_path))
0.80.1 by Ian Clatworthy
basic units tests for filemodify
506
        self.assertChanges(branch, 2, expected_renamed=[(old_path, new_path)])
0.65.4 by James Westby
Make the rename handling more robust.
507
508
    def test_move_to_new_dir(self):
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
509
        handler, branch = self.get_handler()
0.65.4 by James Westby
Make the rename handling more robust.
510
        old_path = 'a/a'
511
        new_path = 'b/a'
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
512
        handler.process(self.get_command_iter(old_path, new_path))
0.96.1 by Ian Clatworthy
update existing tests to reflect implicit directory pruning bahaviour
513
        self.assertChanges(branch, 2,
514
            expected_renamed=[(old_path, new_path)],
515
            expected_added=[('b',)],
516
            expected_removed=[('a',)])
0.64.74 by Ian Clatworthy
fix symlink importing
517
518
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
519
class TestImportToPackRenameTricky(TestCaseForGenericProcessor):
0.80.6 by Ian Clatworthy
file/symlink <-> directory rename tests
520
521
    def file_command_iter(self, path1, old_path2, new_path2, kind='file'):
522
        # Revno 1: create two files or symlinks in a directory
523
        # Revno 2: rename the second file so that it implicitly deletes the
524
        # first one because either:
525
        # * the new file is a in directory with the old file name
526
        # * the new file has the same name as the directory of the first
527
        def command_list():
528
            author = ['', 'bugs@a.com', time.time(), time.timezone]
529
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
530
            def files_one():
531
                yield commands.FileModifyCommand(path1, kind, False,
532
                        None, "aaa")
533
                yield commands.FileModifyCommand(old_path2, kind, False,
534
                        None, "bbb")
535
            yield commands.CommitCommand('head', '1', author,
536
                committer, "commit 1", None, [], files_one)
537
            def files_two():
538
                yield commands.FileRenameCommand(old_path2, new_path2)
539
            yield commands.CommitCommand('head', '2', author,
540
                committer, "commit 2", ":1", [], files_two)
541
        return command_list
542
543
544
    def test_rename_file_becomes_directory(self):
545
        handler, branch = self.get_handler()
546
        old_path2 = 'foo'
547
        path1     = 'a/b'
548
        new_path2 = 'a/b/c'
549
        handler.process(self.file_command_iter(path1, old_path2, new_path2))
550
        revtree0, revtree1 = self.assertChanges(branch, 1,
551
            expected_added=[('a',), (path1,), (old_path2,)])
552
        revtree1, revtree2 = self.assertChanges(branch, 2,
553
            expected_renamed=[(old_path2, new_path2)],
554
            expected_kind_changed=[(path1, 'file', 'directory')])
555
        self.assertContent(branch, revtree1, path1, "aaa")
556
        self.assertContent(branch, revtree2, new_path2, "bbb")
557
558
    def test_rename_directory_becomes_file(self):
559
        handler, branch = self.get_handler()
560
        old_path2 = 'foo'
561
        path1     = 'a/b/c'
562
        new_path2 = 'a/b'
563
        handler.process(self.file_command_iter(path1, old_path2, new_path2))
564
        revtree0, revtree1 = self.assertChanges(branch, 1,
565
            expected_added=[('a',), ('a/b',), (path1,), (old_path2,)])
566
        revtree1, revtree2 = self.assertChanges(branch, 2,
567
            expected_renamed=[(old_path2, new_path2)],
568
            expected_removed=[(path1,), (new_path2,)])
569
        self.assertContent(branch, revtree1, path1, "aaa")
570
        self.assertContent(branch, revtree2, new_path2, "bbb")
571
572
    def test_rename_symlink_becomes_directory(self):
573
        handler, branch = self.get_handler()
574
        old_path2 = 'foo'
575
        path1     = 'a/b'
576
        new_path2 = 'a/b/c'
577
        handler.process(self.file_command_iter(path1, old_path2, new_path2,
578
            'symlink'))
579
        revtree0, revtree1 = self.assertChanges(branch, 1,
580
            expected_added=[('a',), (path1,), (old_path2,)])
581
        revtree1, revtree2 = self.assertChanges(branch, 2,
582
            expected_renamed=[(old_path2, new_path2)],
583
            expected_kind_changed=[(path1, 'symlink', 'directory')])
584
        self.assertSymlinkTarget(branch, revtree1, path1, "aaa")
585
        self.assertSymlinkTarget(branch, revtree2, new_path2, "bbb")
586
587
    def test_rename_directory_becomes_symlink(self):
588
        handler, branch = self.get_handler()
589
        old_path2 = 'foo'
590
        path1     = 'a/b/c'
591
        new_path2 = 'a/b'
592
        handler.process(self.file_command_iter(path1, old_path2, new_path2,
593
            'symlink'))
594
        revtree0, revtree1 = self.assertChanges(branch, 1,
595
            expected_added=[('a',), ('a/b',), (path1,), (old_path2,)])
596
        revtree1, revtree2 = self.assertChanges(branch, 2,
597
            expected_renamed=[(old_path2, new_path2)],
598
            expected_removed=[(path1,), (new_path2,)])
599
        self.assertSymlinkTarget(branch, revtree1, path1, "aaa")
600
        self.assertSymlinkTarget(branch, revtree2, new_path2, "bbb")
601
602
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
603
class TestImportToPackCopy(TestCaseForGenericProcessor):
0.76.2 by Ian Clatworthy
code & tests for file copying
604
0.80.1 by Ian Clatworthy
basic units tests for filemodify
605
    def file_command_iter(self, src_path, dest_path, kind='file'):
0.80.4 by Ian Clatworthy
file executable off <-> on tests
606
        # Revno 1: create a file or symlink
607
        # Revno 2: copy it
0.76.2 by Ian Clatworthy
code & tests for file copying
608
        def command_list():
609
            author = ['', 'bugs@a.com', time.time(), time.timezone]
610
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
611
            def files_one():
0.80.1 by Ian Clatworthy
basic units tests for filemodify
612
                yield commands.FileModifyCommand(src_path, kind, False,
0.76.2 by Ian Clatworthy
code & tests for file copying
613
                        None, "aaa")
614
            yield commands.CommitCommand('head', '1', author,
615
                committer, "commit 1", None, [], files_one)
616
            def files_two():
617
                yield commands.FileCopyCommand(src_path, dest_path)
618
            yield commands.CommitCommand('head', '2', author,
619
                committer, "commit 2", ":1", [], files_two)
620
        return command_list
621
622
    def test_copy_file_in_root(self):
623
        handler, branch = self.get_handler()
624
        src_path = 'a'
625
        dest_path = 'b'
626
        handler.process(self.file_command_iter(src_path, dest_path))
0.80.1 by Ian Clatworthy
basic units tests for filemodify
627
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.76.2 by Ian Clatworthy
code & tests for file copying
628
            expected_added=[(dest_path,)])
0.80.1 by Ian Clatworthy
basic units tests for filemodify
629
        self.assertContent(branch, revtree1, src_path, "aaa")
630
        self.assertContent(branch, revtree2, src_path, "aaa")
0.76.2 by Ian Clatworthy
code & tests for file copying
631
        self.assertContent(branch, revtree2, dest_path, "aaa")
0.80.1 by Ian Clatworthy
basic units tests for filemodify
632
        self.assertRevisionRoot(revtree1, src_path)
633
        self.assertRevisionRoot(revtree2, dest_path)
0.76.2 by Ian Clatworthy
code & tests for file copying
634
635
    def test_copy_file_in_subdir(self):
636
        handler, branch = self.get_handler()
637
        src_path = 'a/a'
638
        dest_path = 'a/b'
639
        handler.process(self.file_command_iter(src_path, dest_path))
0.80.1 by Ian Clatworthy
basic units tests for filemodify
640
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.76.2 by Ian Clatworthy
code & tests for file copying
641
            expected_added=[(dest_path,)])
0.80.1 by Ian Clatworthy
basic units tests for filemodify
642
        self.assertContent(branch, revtree1, src_path, "aaa")
643
        self.assertContent(branch, revtree2, src_path, "aaa")
0.76.2 by Ian Clatworthy
code & tests for file copying
644
        self.assertContent(branch, revtree2, dest_path, "aaa")
645
646
    def test_copy_file_to_new_dir(self):
647
        handler, branch = self.get_handler()
648
        src_path = 'a/a'
649
        dest_path = 'b/a'
650
        handler.process(self.file_command_iter(src_path, dest_path))
0.80.1 by Ian Clatworthy
basic units tests for filemodify
651
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.76.2 by Ian Clatworthy
code & tests for file copying
652
            expected_added=[('b',), (dest_path,)])
0.80.1 by Ian Clatworthy
basic units tests for filemodify
653
        self.assertContent(branch, revtree1, src_path, "aaa")
654
        self.assertContent(branch, revtree2, src_path, "aaa")
0.76.2 by Ian Clatworthy
code & tests for file copying
655
        self.assertContent(branch, revtree2, dest_path, "aaa")
656
0.76.3 by Ian Clatworthy
symlink copying tests
657
    def test_copy_symlink_in_root(self):
658
        handler, branch = self.get_handler()
659
        src_path = 'a'
660
        dest_path = 'b'
0.80.1 by Ian Clatworthy
basic units tests for filemodify
661
        handler.process(self.file_command_iter(src_path, dest_path, 'symlink'))
662
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.76.3 by Ian Clatworthy
symlink copying tests
663
            expected_added=[(dest_path,)])
0.80.1 by Ian Clatworthy
basic units tests for filemodify
664
        self.assertSymlinkTarget(branch, revtree1, src_path, "aaa")
665
        self.assertSymlinkTarget(branch, revtree2, src_path, "aaa")
0.76.3 by Ian Clatworthy
symlink copying tests
666
        self.assertSymlinkTarget(branch, revtree2, dest_path, "aaa")
0.80.1 by Ian Clatworthy
basic units tests for filemodify
667
        self.assertRevisionRoot(revtree1, src_path)
668
        self.assertRevisionRoot(revtree2, dest_path)
0.76.3 by Ian Clatworthy
symlink copying tests
669
670
    def test_copy_symlink_in_subdir(self):
671
        handler, branch = self.get_handler()
672
        src_path = 'a/a'
673
        dest_path = 'a/b'
0.80.1 by Ian Clatworthy
basic units tests for filemodify
674
        handler.process(self.file_command_iter(src_path, dest_path, 'symlink'))
675
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.76.3 by Ian Clatworthy
symlink copying tests
676
            expected_added=[(dest_path,)])
0.80.1 by Ian Clatworthy
basic units tests for filemodify
677
        self.assertSymlinkTarget(branch, revtree1, src_path, "aaa")
678
        self.assertSymlinkTarget(branch, revtree2, src_path, "aaa")
0.76.3 by Ian Clatworthy
symlink copying tests
679
        self.assertSymlinkTarget(branch, revtree2, dest_path, "aaa")
680
681
    def test_copy_symlink_to_new_dir(self):
682
        handler, branch = self.get_handler()
683
        src_path = 'a/a'
684
        dest_path = 'b/a'
0.80.1 by Ian Clatworthy
basic units tests for filemodify
685
        handler.process(self.file_command_iter(src_path, dest_path, 'symlink'))
686
        revtree1, revtree2 = self.assertChanges(branch, 2,
0.76.3 by Ian Clatworthy
symlink copying tests
687
            expected_added=[('b',), (dest_path,)])
0.80.1 by Ian Clatworthy
basic units tests for filemodify
688
        self.assertSymlinkTarget(branch, revtree1, src_path, "aaa")
689
        self.assertSymlinkTarget(branch, revtree2, src_path, "aaa")
0.76.3 by Ian Clatworthy
symlink copying tests
690
        self.assertSymlinkTarget(branch, revtree2, dest_path, "aaa")
691
0.76.2 by Ian Clatworthy
code & tests for file copying
692
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
693
class TestImportToPackFileKinds(TestCaseForGenericProcessor):
0.64.74 by Ian Clatworthy
fix symlink importing
694
695
    def get_command_iter(self, path, kind, content):
696
        def command_list():
697
            committer = ['', 'elmer@a.com', time.time(), time.timezone]
698
            def files_one():
699
                yield commands.FileModifyCommand(path, kind, False,
700
                        None, content)
701
            yield commands.CommitCommand('head', '1', None,
702
                committer, "commit 1", None, [], files_one)
703
        return command_list
704
705
    def test_import_plainfile(self):
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
706
        handler, branch = self.get_handler()
707
        handler.process(self.get_command_iter('foo', 'file', 'aaa'))
0.64.74 by Ian Clatworthy
fix symlink importing
708
709
    def test_import_symlink(self):
0.76.1 by Ian Clatworthy
clean-up tests for GenericProcessor
710
        handler, branch = self.get_handler()
711
        handler.process(self.get_command_iter('foo', 'symlink', 'bar'))
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
712
713
714
### TODO: Parameterise tests rather than below hack
715
0.85.2 by Ian Clatworthy
improve per-file graph generation
716
class TestImportToRichRootModify(TestImportToPackModify):
717
    branch_format = "1.9-rich-root"
718
719
class TestImportToRichRootModifyTricky(TestImportToPackModifyTricky):
720
    branch_format = "1.9-rich-root"
721
722
class TestImportToRichRootDelete(TestImportToPackDelete):
723
    branch_format = "1.9-rich-root"
724
725
class TestImportToRichRootDeleteDirectory(TestImportToPackDeleteDirectory):
726
    branch_format = "1.9-rich-root"
727
728
class TestImportToRichRootRename(TestImportToPackRename):
729
    branch_format = "1.9-rich-root"
730
731
class TestImportToRichRootRenameTricky(TestImportToPackRenameTricky):
732
    branch_format = "1.9-rich-root"
733
734
class TestImportToRichRootCopy(TestImportToPackCopy):
735
    branch_format = "1.9-rich-root"
736
737
class TestImportToRichRootFileKinds(TestImportToPackFileKinds):
738
    branch_format = "1.9-rich-root"
739
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
740
try:
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
741
    from bzrlib.repofmt.groupcompress_repo import RepositoryFormatCHK1
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
742
743
    class TestImportToChkModify(TestImportToPackModify):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
744
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
745
746
    class TestImportToChkModifyTricky(TestImportToPackModifyTricky):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
747
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
748
749
    class TestImportToChkDelete(TestImportToPackDelete):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
750
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
751
752
    class TestImportToChkDeleteDirectory(TestImportToPackDeleteDirectory):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
753
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
754
755
    class TestImportToChkRename(TestImportToPackRename):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
756
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
757
758
    class TestImportToChkRenameTricky(TestImportToPackRenameTricky):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
759
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
760
761
    class TestImportToChkCopy(TestImportToPackCopy):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
762
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
763
764
    class TestImportToChkFileKinds(TestImportToPackFileKinds):
0.64.179 by Ian Clatworthy
upgrade tests to use --development6-rich-root
765
        branch_format = "development6-rich-root"
0.85.1 by Ian Clatworthy
extend tests to test the chk code path
766
767
except ImportError:
768
    pass