/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

Merge bzr.dev, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
197
197
            builder.build_snapshot, 'B-id', None, [('weirdo', ('foo',))])
198
198
        self.assertEqual('Unknown build action: "weirdo"', str(e))
199
199
 
200
 
    # TODO: rename a file/directory, but rename isn't supported by the
201
 
    #       MemoryTree api yet, so for now we wait until it is used
 
200
    def test_rename(self):
 
201
        builder = self.build_a_rev()
 
202
        builder.build_snapshot('B-id', None,
 
203
            [('rename', ('a', 'b'))])
 
204
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
 
205
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
 
206
                              (u'b', 'a-id', 'file')], rev_tree)
 
207
 
 
208
    def test_rename_into_subdir(self):
 
209
        builder = self.build_a_rev()
 
210
        builder.build_snapshot('B-id', None,
 
211
            [('add', ('dir', 'dir-id', 'directory', None)),
 
212
             ('rename', ('a', 'dir/a'))])
 
213
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
 
214
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
 
215
                              (u'dir', 'dir-id', 'directory'),
 
216
                              (u'dir/a', 'a-id', 'file')], rev_tree)
202
217
 
203
218
    def test_set_parent(self):
204
219
        builder = self.build_a_rev()