1
# Copyright (C) 2006-2010 Canonical Ltd
1
# Copyright (C) 2006, 2007, 2008, 2009, 2010 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
160
160
# But if we have more than that, all files should get the same result
161
161
self.assertEqual(st1.st_mtime, st2.st_mtime)
163
def test_change_root_id(self):
164
transform, root = self.get_transform()
165
self.assertNotEqual('new-root-id', self.wt.get_root_id())
166
transform.new_directory('', ROOT_PARENT, 'new-root-id')
167
transform.delete_contents(root)
168
transform.unversion_file(root)
169
transform.fixup_new_roots()
171
self.assertEqual('new-root-id', self.wt.get_root_id())
173
def test_change_root_id_add_files(self):
174
transform, root = self.get_transform()
175
self.assertNotEqual('new-root-id', self.wt.get_root_id())
176
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
177
transform.new_file('file', new_trans_id, ['new-contents\n'],
179
transform.delete_contents(root)
180
transform.unversion_file(root)
181
transform.fixup_new_roots()
183
self.assertEqual('new-root-id', self.wt.get_root_id())
184
self.assertEqual('new-file-id', self.wt.path2id('file'))
185
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
187
def test_add_two_roots(self):
188
transform, root = self.get_transform()
189
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
190
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
191
self.assertRaises(ValueError, transform.fixup_new_roots)
193
163
def test_hardlink(self):
194
164
self.requireFeature(HardlinkFeature)
195
165
transform, root = self.get_transform()
735
705
' versioned, but has versioned'
736
706
' children. Versioned directory.')
737
707
self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
738
' oz/emeraldcity. Cancelled move.')
708
' oz/emeraldcity. Cancelled move.')
740
710
def prepare_wrong_parent_kind(self):
741
711
tt, root = self.get_transform()
813
783
transform, root = self.get_transform()
814
784
transform.adjust_root_path('oldroot', fun)
815
new_root = transform.trans_id_tree_path('')
785
new_root=transform.trans_id_tree_path('')
816
786
transform.version_file('new-root', new_root)
817
787
transform.apply()
1923
1893
self.assertTrue(source.is_executable('file1-id'))
1925
1895
def install_rot13_content_filter(self, pattern):
1927
# self.addCleanup(filters._reset_registry, filters._reset_registry())
1928
# below, but that looks a bit... hard to read even if it's exactly
1930
1896
original_registry = filters._reset_registry()
1931
1897
def restore_registry():
1932
1898
filters._reset_registry(original_registry)
2371
2337
def test_ignore_pb(self):
2372
2338
# pb could be supported, but TT.iter_changes doesn't support it.
2373
2339
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2374
preview_tree.iter_changes(revision_tree)
2340
preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
2376
2342
def test_kind(self):
2377
2343
revision_tree = self.create_tree()
2739
2705
preview = self.get_empty_preview()
2740
2706
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
2741
2707
# FIXME: new_directory should mark root.
2742
preview.fixup_new_roots()
2708
preview.adjust_path('', ROOT_PARENT, root)
2743
2709
preview_tree = preview.get_preview_tree()
2744
2710
file_trans_id = preview.new_file('a', preview.root, 'contents',
2779
2745
file_trans_id = preview.trans_id_file_id('file-id')
2780
2746
preview.delete_contents(file_trans_id)
2781
2747
preview.create_file('a\nb\n', file_trans_id)
2748
pb = progress.DummyProgress()
2782
2749
preview_tree = preview.get_preview_tree()
2783
merger = Merger.from_revision_ids(None, preview_tree,
2750
merger = Merger.from_revision_ids(pb, preview_tree,
2784
2751
child_tree.branch.last_revision(),
2785
2752
other_branch=child_tree.branch,
2786
2753
tree_branch=work_tree.branch)
2798
2765
tt.new_file('name', tt.root, 'content', 'file-id')
2799
2766
tree2 = self.make_branch_and_tree('tree2')
2800
2767
tree2.set_root_id('TREE_ROOT')
2768
pb = progress.DummyProgress()
2801
2769
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
None, tree.basis_tree())
2770
pb, tree.basis_tree())
2803
2771
merger.merge_type = Merge3Merger
2804
2772
merger.do_merge()
2815
2783
tt.create_file('baz', trans_id)
2816
2784
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2817
2785
self.build_tree_contents([('tree2/foo', 'qux')])
2786
pb = progress.DummyProgress()
2819
2787
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
2788
pb, tree.basis_tree())
2821
2789
merger.merge_type = Merge3Merger
added
removed
bzrlib/tests/test_transform.py
