← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Alexander Belchenko
  • Date: 2008-02-06 10:07:17 UTC
  • mfrom: (3211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080206100717-wnixj1s8u2fks08r
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
22
22
from bzrlib import (
23
23
    errors,
24
24
    generate_ids,
 
25
    osutils,
25
26
    progress,
26
27
    revision as _mod_revision,
27
28
    symbol_versioning,
1232
1233
 
1233
1234
 
1234
1235
class TestTransformMerge(TestCaseInTempDir):
 
1236
 
1235
1237
    def test_text_merge(self):
1236
1238
        root_id = generate_ids.gen_root_id()
1237
1239
        base = TransformGroup("base", root_id)
1832
1834
    def get_empty_preview(self):
1833
1835
        repository = self.make_repository('repo')
1834
1836
        tree = repository.revision_tree(_mod_revision.NULL_REVISION)
1835
 
        return TransformPreview(tree)
 
1837
        preview = TransformPreview(tree)
 
1838
        self.addCleanup(preview.finalize)
 
1839
        return preview
1836
1840
 
1837
1841
    def test_transform_preview(self):
1838
1842
        revision_tree = self.create_tree()
1839
1843
        preview = TransformPreview(revision_tree)
 
1844
        self.addCleanup(preview.finalize)
1840
1845
 
1841
1846
    def test_transform_preview_tree(self):
1842
1847
        revision_tree = self.create_tree()
1843
1848
        preview = TransformPreview(revision_tree)
 
1849
        self.addCleanup(preview.finalize)
1844
1850
        preview.get_preview_tree()
1845
1851
 
1846
1852
    def test_transform_new_file(self):
1847
1853
        revision_tree = self.create_tree()
1848
1854
        preview = TransformPreview(revision_tree)
 
1855
        self.addCleanup(preview.finalize)
1849
1856
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
1850
1857
        preview_tree = preview.get_preview_tree()
1851
1858
        self.assertEqual(preview_tree.kind('file2-id'), 'file')
1855
1862
    def test_diff_preview_tree(self):
1856
1863
        revision_tree = self.create_tree()
1857
1864
        preview = TransformPreview(revision_tree)
 
1865
        self.addCleanup(preview.finalize)
1858
1866
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
1859
1867
        preview_tree = preview.get_preview_tree()
1860
1868
        out = StringIO()
1867
1875
    def test_transform_conflicts(self):
1868
1876
        revision_tree = self.create_tree()
1869
1877
        preview = TransformPreview(revision_tree)
 
1878
        self.addCleanup(preview.finalize)
1870
1879
        preview.new_file('a', preview.root, 'content 2')
1871
1880
        resolve_conflicts(preview)
1872
1881
        trans_id = preview.trans_id_file_id('a-id')
1875
1884
    def get_tree_and_preview_tree(self):
1876
1885
        revision_tree = self.create_tree()
1877
1886
        preview = TransformPreview(revision_tree)
 
1887
        self.addCleanup(preview.finalize)
1878
1888
        a_trans_id = preview.trans_id_file_id('a-id')
1879
1889
        preview.delete_contents(a_trans_id)
1880
1890
        preview.create_file('b content', a_trans_id)
1932
1942
    def test_kind(self):
1933
1943
        revision_tree = self.create_tree()
1934
1944
        preview = TransformPreview(revision_tree)
 
1945
        self.addCleanup(preview.finalize)
1935
1946
        preview.new_file('file', preview.root, 'contents', 'file-id')
1936
1947
        preview.new_directory('directory', preview.root, 'dir-id')
1937
1948
        preview_tree = preview.get_preview_tree()