/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

• browse files at revision 4435.1.4
• compare with another revision
• download diff
• download tarball
• view history from revision 4435.1.4

• reverse the comparison (4435.1.4 to 5200.3.2)
• stop comparing with revision 5200.3.2

Show diffs side-by-side

added

removed

bzrlib/tests/test_transform.py

1

 

# Copyright (C) 2006-2010 Canonical Ltd

 

1

# Copyright (C) 2006, 2007, 2008 Canonical Ltd

2

2

#

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

15

15

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

16

16

 

17

17

import os

 

18

import stat

18

19

from StringIO import StringIO

19

20

import sys

20

 

import time

21

21

 

22

22

from bzrlib import (

23

23

    bencode,

24

24

    errors,

25

 

    filters,

26

25

    generate_ids,

27

26

    osutils,

28

27

    progress,

29

28

    revision as _mod_revision,

30

 

    rules,

 

29

    symbol_versioning,

31

30

    tests,

32

31

    urlutils,

33

32

    )

137

136

        transform.finalize()

138

137

        transform.finalize()

139

138

 

140

 

    def test_create_files_same_timestamp(self):

141

 

        transform, root = self.get_transform()

142

 

        self.wt.lock_tree_write()

143

 

        self.addCleanup(self.wt.unlock)

144

 

        # Roll back the clock, so that we know everything is being set to the

145

 

        # exact time

146

 

        transform._creation_mtime = creation_mtime = time.time() - 20.0

147

 

        transform.create_file('content-one',

148

 

                              transform.create_path('one', root))

149

 

        time.sleep(1) # *ugly*

150

 

        transform.create_file('content-two',

151

 

                              transform.create_path('two', root))

152

 

        transform.apply()

153

 

        fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)

154

 

        fo.close()

155

 

        fo, st2 = self.wt.get_file_with_stat(None, path='two', filtered=False)

156

 

        fo.close()

157

 

        # We only guarantee 2s resolution

158

 

        self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,

159

 

            "%s != %s within 2 seconds" % (creation_mtime, st1.st_mtime))

160

 

        # But if we have more than that, all files should get the same result

161

 

        self.assertEqual(st1.st_mtime, st2.st_mtime)

162

 

 

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()

170

 

        transform.apply()

171

 

        self.assertEqual('new-root-id', self.wt.get_root_id())

172

 

 

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'],

178

 

                           'new-file-id')

179

 

        transform.delete_contents(root)

180

 

        transform.unversion_file(root)

181

 

        transform.fixup_new_roots()

182

 

        transform.apply()

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'))

186

 

 

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)

192

 

 

193

139

    def test_hardlink(self):

194

140

        self.requireFeature(HardlinkFeature)

195

141

        transform, root = self.get_transform()

423

369

        self.assertContainsRe(transform._limbo_name(first), 'new-1/file')

424

370

        self.assertNotContainsRe(transform._limbo_name(second), 'new-1/FiLe')

425

371

 

426

 

    def test_adjust_path_updates_child_limbo_names(self):

427

 

        tree = self.make_branch_and_tree('tree')

428

 

        transform = TreeTransform(tree)

429

 

        self.addCleanup(transform.finalize)

430

 

        foo_id = transform.new_directory('foo', transform.root)

431

 

        bar_id = transform.new_directory('bar', foo_id)

432

 

        baz_id = transform.new_directory('baz', bar_id)

433

 

        qux_id = transform.new_directory('qux', baz_id)

434

 

        transform.adjust_path('quxx', foo_id, bar_id)

435

 

        self.assertStartsWith(transform._limbo_name(qux_id),

436

 

                              transform._limbo_name(bar_id))

437

 

 

438

372

    def test_add_del(self):

439

373

        start, root = self.get_transform()

440

374

        start.new_directory('a', root, 'a')

735

669

                                         ' versioned, but has versioned'

736

670

                                         ' children.  Versioned directory.')

737

671

        self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'

738

 

                                         ' oz/emeraldcity. Cancelled move.')

 

672

                                         ' oz/emeraldcity.  Cancelled move.')

739

673

 

740

674

    def prepare_wrong_parent_kind(self):

741

675

        tt, root = self.get_transform()

812

746

        create.apply()

813

747

        transform, root = self.get_transform()

814

748

        transform.adjust_root_path('oldroot', fun)

815

 

        new_root = transform.trans_id_tree_path('')

 

749

        new_root=transform.trans_id_tree_path('')

816

750

        transform.version_file('new-root', new_root)

817

751

        transform.apply()

818

752

 

1922

1856

        self.assertEqual([], list(target.iter_changes(revision_tree)))

1923

1857

        self.assertTrue(source.is_executable('file1-id'))

1924

1858

 

1925

 

    def install_rot13_content_filter(self, pattern):

1926

 

        # We could use

1927

 

        # self.addCleanup(filters._reset_registry, filters._reset_registry())

1928

 

        # below, but that looks a bit... hard to read even if it's exactly

1929

 

        # the same thing.

1930

 

        original_registry = filters._reset_registry()

1931

 

        def restore_registry():

1932

 

            filters._reset_registry(original_registry)

1933

 

        self.addCleanup(restore_registry)

1934

 

        def rot13(chunks, context=None):

1935

 

            return [''.join(chunks).encode('rot13')]

1936

 

        rot13filter = filters.ContentFilter(rot13, rot13)

1937

 

        filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)

1938

 

        os.mkdir(self.test_home_dir + '/.bazaar')

1939

 

        rules_filename = self.test_home_dir + '/.bazaar/rules'

1940

 

        f = open(rules_filename, 'wb')

1941

 

        f.write('[name %s]\nrot13=yes\n' % (pattern,))

1942

 

        f.close()

1943

 

        def uninstall_rules():

1944

 

            os.remove(rules_filename)

1945

 

            rules.reset_rules()

1946

 

        self.addCleanup(uninstall_rules)

1947

 

        rules.reset_rules()

1948

 

 

1949

 

    def test_build_tree_content_filtered_files_are_not_hardlinked(self):

1950

 

        """build_tree will not hardlink files that have content filtering rules

1951

 

        applied to them (but will still hardlink other files from the same tree

1952

 

        if it can).

1953

 

        """

1954

 

        self.requireFeature(HardlinkFeature)

1955

 

        self.install_rot13_content_filter('file1')

1956

 

        source = self.create_ab_tree()

1957

 

        target = self.make_branch_and_tree('target')

1958

 

        revision_tree = source.basis_tree()

1959

 

        revision_tree.lock_read()

1960

 

        self.addCleanup(revision_tree.unlock)

1961

 

        build_tree(revision_tree, target, source, hardlink=True)

1962

 

        target.lock_read()

1963

 

        self.addCleanup(target.unlock)

1964

 

        self.assertEqual([], list(target.iter_changes(revision_tree)))

1965

 

        source_stat = os.stat('source/file1')

1966

 

        target_stat = os.stat('target/file1')

1967

 

        self.assertNotEqual(source_stat, target_stat)

1968

 

        source_stat = os.stat('source/file2')

1969

 

        target_stat = os.stat('target/file2')

1970

 

        self.assertEqualStat(source_stat, target_stat)

1971

 

 

1972

1859

    def test_case_insensitive_build_tree_inventory(self):

1973

1860

        if (tests.CaseInsensitiveFilesystemFeature.available()

1974

1861

            or tests.CaseInsCasePresFilenameFeature.available()):

2029

1916

        branch.lock_write()

2030

1917

        self.addCleanup(branch.unlock)

2031

1918

        tt = TransformPreview(branch.basis_tree())

2032

 

        self.addCleanup(tt.finalize)

2033

 

        tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')

2034

1919

        rev = tt.commit(branch, 'my message')

2035

1920

        self.assertEqual([], branch.basis_tree().get_parent_ids())

2036

1921

        self.assertNotEqual(_mod_revision.NULL_REVISION,

2041

1926

        branch.lock_write()

2042

1927

        self.addCleanup(branch.unlock)

2043

1928

        tt = TransformPreview(branch.basis_tree())

2044

 

        self.addCleanup(tt.finalize)

2045

1929

        e = self.assertRaises(ValueError, tt.commit, branch,

2046

1930

                          'my message', ['rev1b-id'])

2047

1931

        self.assertEqual('Cannot supply merge parents for first commit.',

2052

1936

        branch, tt = self.get_branch_and_transform()

2053

1937

        tt.new_file('file', tt.root, 'contents', 'file-id')

2054

1938

        trans_id = tt.new_directory('dir', tt.root, 'dir-id')

2055

 

        if SymlinkFeature.available():

2056

 

            tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')

 

1939

        tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')

2057

1940

        rev = tt.commit(branch, 'message')

2058

1941

        tree = branch.basis_tree()

2059

1942

        self.assertEqual('file', tree.id2path('file-id'))

2060

1943

        self.assertEqual('contents', tree.get_file_text('file-id'))

2061

1944

        self.assertEqual('dir', tree.id2path('dir-id'))

2062

 

        if SymlinkFeature.available():

2063

 

            self.assertEqual('dir/symlink', tree.id2path('symlink-id'))

2064

 

            self.assertEqual('target', tree.get_symlink_target('symlink-id'))

 

1945

        self.assertEqual('dir/symlink', tree.id2path('symlink-id'))

 

1946

        self.assertEqual('target', tree.get_symlink_target('symlink-id'))

2065

1947

 

2066

1948

    def test_add_unversioned(self):

2067

1949

        branch, tt = self.get_branch_and_transform()

2074

1956

        tt.new_file('file', tt.root, 'contents', 'file-id')

2075

1957

        tt.commit(branch, 'message', strict=True)

2076

1958

        tt = TransformPreview(branch.basis_tree())

2077

 

        self.addCleanup(tt.finalize)

2078

1959

        trans_id = tt.trans_id_file_id('file-id')

2079

1960

        tt.delete_contents(trans_id)

2080

1961

        tt.create_file('contents', trans_id)

2264

2145

    def create_tree(self):

2265

2146

        tree = self.make_branch_and_tree('.')

2266

2147

        self.build_tree_contents([('a', 'content 1')])

2267

 

        tree.set_root_id('TREE_ROOT')

2268

2148

        tree.add('a', 'a-id')

2269

2149

        tree.commit('rev1', rev_id='rev1')

2270

2150

        return tree.branch.repository.revision_tree('rev1')

2371

2251

    def test_ignore_pb(self):

2372

2252

        # pb could be supported, but TT.iter_changes doesn't support it.

2373

2253

        revision_tree, preview_tree = self.get_tree_and_preview_tree()

2374

 

        preview_tree.iter_changes(revision_tree)

 

2254

        preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())

2375

2255

 

2376

2256

    def test_kind(self):

2377

2257

        revision_tree = self.create_tree()

2392

2272

        self.assertEqual(os.stat(limbo_path).st_mtime,

2393

2273

                         preview_tree.get_file_mtime('file-id'))

2394

2274

 

2395

 

    def test_get_file_mtime_renamed(self):

2396

 

        work_tree = self.make_branch_and_tree('tree')

2397

 

        self.build_tree(['tree/file'])

2398

 

        work_tree.add('file', 'file-id')

2399

 

        preview = TransformPreview(work_tree)

2400

 

        self.addCleanup(preview.finalize)

2401

 

        file_trans_id = preview.trans_id_tree_file_id('file-id')

2402

 

        preview.adjust_path('renamed', preview.root, file_trans_id)

2403

 

        preview_tree = preview.get_preview_tree()

2404

 

        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')

2405

 

        work_mtime = work_tree.get_file_mtime('file-id', 'file')

2406

 

 

2407

2275

    def test_get_file(self):

2408

2276

        preview = self.get_empty_preview()

2409

2277

        preview.new_file('file', preview.root, 'contents', 'file-id')

2557

2425

        self.assertEqual(('missing', None, None, None), summary)

2558

2426

 

2559

2427

    def test_file_content_summary_executable(self):

 

2428

        if not osutils.supports_executable():

 

2429

            raise TestNotApplicable()

2560

2430

        preview = self.get_empty_preview()

2561

2431

        path_id = preview.new_file('path', preview.root, 'contents', 'path-id')

2562

2432

        preview.set_executability(True, path_id)

2571

2441

        self.assertIs(None, summary[3])

2572

2442

 

2573

2443

    def test_change_executability(self):

 

2444

        if not osutils.supports_executable():

 

2445

            raise TestNotApplicable()

2574

2446

        tree = self.make_branch_and_tree('tree')

2575

2447

        self.build_tree(['tree/path'])

2576

2448

        tree.add('path')

2590

2462

        # size must be known

2591

2463

        self.assertEqual(len('contents'), summary[1])

2592

2464

        # not executable

2593

 

        self.assertEqual(False, summary[2])

 

2465

        if osutils.supports_executable():

 

2466

            self.assertEqual(False, summary[2])

 

2467

        else:

 

2468

            self.assertEqual(None, summary[2])

2594

2469

        # will not have hash (not cheap to determine)

2595

2470

        self.assertIs(None, summary[3])

2596

2471

 

2737

2612

 

2738

2613

    def test_walkdirs(self):

2739

2614

        preview = self.get_empty_preview()

2740

 

        root = preview.new_directory('', ROOT_PARENT, 'tree-root')

2741

 

        # FIXME: new_directory should mark root.

2742

 

        preview.fixup_new_roots()

 

2615

        preview.version_file('tree-root', preview.root)

2743

2616

        preview_tree = preview.get_preview_tree()

2744

2617

        file_trans_id = preview.new_file('a', preview.root, 'contents',

2745

2618

                                         'a-id')

2776

2649

        self.addCleanup(work_tree.unlock)

2777

2650

        preview = TransformPreview(work_tree)

2778

2651

        self.addCleanup(preview.finalize)

 

2652

        preview_tree = preview.get_preview_tree()

2779

2653

        file_trans_id = preview.trans_id_file_id('file-id')

2780

2654

        preview.delete_contents(file_trans_id)

2781

2655

        preview.create_file('a\nb\n', file_trans_id)

2782

 

        preview_tree = preview.get_preview_tree()

2783

 

        merger = Merger.from_revision_ids(None, preview_tree,

 

2656

        pb = progress.DummyProgress()

 

2657

        merger = Merger.from_revision_ids(pb, preview_tree,

2784

2658

                                          child_tree.branch.last_revision(),

2785

2659

                                          other_branch=child_tree.branch,

2786

2660

                                          tree_branch=work_tree.branch)

2792

2666

 

2793

2667

    def test_merge_preview_into_workingtree(self):

2794

2668

        tree = self.make_branch_and_tree('tree')

2795

 

        tree.set_root_id('TREE_ROOT')

2796

2669

        tt = TransformPreview(tree)

2797

2670

        self.addCleanup(tt.finalize)

2798

2671

        tt.new_file('name', tt.root, 'content', 'file-id')

2799

2672

        tree2 = self.make_branch_and_tree('tree2')

2800

 

        tree2.set_root_id('TREE_ROOT')

 

2673

        pb = progress.DummyProgress()

2801

2674

        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),

2802

 

                                         None, tree.basis_tree())

 

2675

                                         pb, tree.basis_tree())

2803

2676

        merger.merge_type = Merge3Merger

2804

2677

        merger.do_merge()

2805

2678

 

2815

2688

        tt.create_file('baz', trans_id)

2816

2689

        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()

2817

2690

        self.build_tree_contents([('tree2/foo', 'qux')])

2818

 

        pb = None

 

2691

        pb = progress.DummyProgress()

2819

2692

        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),

2820

2693

                                         pb, tree.basis_tree())

2821

2694

        merger.merge_type = Merge3Merger

2848

2721

        rev2_tree = tree.branch.repository.revision_tree(rev2_id)

2849

2722

        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))

2850

2723

 

2851

 

    def test_ascii_limbo_paths(self):

2852

 

        self.requireFeature(tests.UnicodeFilenameFeature)

2853

 

        branch = self.make_branch('any')

2854

 

        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)

2855

 

        tt = TransformPreview(tree)

2856

 

        self.addCleanup(tt.finalize)

2857

 

        foo_id = tt.new_directory('', ROOT_PARENT)

2858

 

        bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')

2859

 

        limbo_path = tt._limbo_name(bar_id)

2860

 

        self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)

2861

 

 

2862

2724

 

2863

2725

class FakeSerializer(object):

2864

2726

    """Serializer implementation that simply returns the input.

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0