/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/blackbox/test_join.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
17
17
 
18
18
import os
19
19
 
20
 
from breezy import (
 
20
from bzrlib import (
 
21
    bzrdir,
21
22
    osutils,
 
23
    repository,
22
24
    tests,
23
25
    workingtree,
24
26
    )
28
30
 
29
31
    def make_trees(self):
30
32
        base_tree = self.make_branch_and_tree('tree',
31
 
                                              format='development-subtree')
 
33
            format='dirstate-with-subtree')
32
34
        base_tree.commit('empty commit')
33
35
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
34
36
        sub_tree = self.make_branch_and_tree('tree/subtree')
35
 
        sub_tree.add('file1', b'file1-id')
 
37
        sub_tree.set_root_id('subtree-root-id')
 
38
        sub_tree.add('file1', 'file1-id')
36
39
        sub_tree.commit('added file1')
37
40
        return base_tree, sub_tree
38
41
 
39
42
    def check_success(self, path):
40
43
        base_tree = workingtree.WorkingTree.open(path)
41
 
        self.assertEqual(b'file1-id', base_tree.path2id('subtree/file1'))
 
44
        self.assertEqual('file1-id', base_tree.path2id('subtree/file1'))
42
45
 
43
46
    def test_join(self):
44
47
        base_tree, sub_tree = self.make_trees()
56
59
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
57
60
        self.run_bzr_error(
58
61
            ('Cannot join .*subtree.  Parent directory is not versioned',),
59
 
            'join tree/subtree2/subtree')
 
62
             'join tree/subtree2/subtree')
60
63
        # disabled because this gives an ugly error at present -- mbp 20070306
61
 
        # self.run_bzr_error(
 
64
        ## self.run_bzr_error(
62
65
        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),
63
 
        # 'join', '--reference', 'tree/subtree2/subtree')
 
66
        ##      'join', '--reference', 'tree/subtree2/subtree')
64
67
        self.run_bzr_error(('Not a branch:.*subtree2',),
65
68
                           'join tree/subtree2')
66
69
 
67
70
    def test_join_reference(self):
68
71
        """Join can add a reference if --reference is supplied"""
69
72
        base_tree, sub_tree = self.make_trees()
70
 
        subtree_root_id = sub_tree.path2id('')
71
73
        self.run_bzr('join . --reference', working_dir='tree/subtree')
72
74
        sub_tree.lock_read()
73
75
        self.addCleanup(sub_tree.unlock)
74
 
        if sub_tree.supports_setting_file_ids():
75
 
            self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
76
 
            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
77
 
            self.assertEqual(subtree_root_id, sub_tree.path2id(''))
78
 
            self.assertEqual('', sub_tree.id2path(subtree_root_id))
79
 
            self.assertEqual(
80
 
                sub_tree.path2id('file1'), base_tree.path2id('subtree/file1'))
81
 
 
 
76
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
 
77
        self.assertTrue('file1-id' in sub_tree)
 
78
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
 
79
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
 
80
        self.assertIs(None, base_tree.path2id('subtree/file1'))
82
81
        base_tree.lock_read()
83
82
        self.addCleanup(base_tree.unlock)
84
 
        self.assertEqual(['subtree'], list(base_tree.iter_references()))
85
 
        if base_tree.supports_setting_file_ids():
86
 
            self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
87
 
            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
88
 
            self.assertEqual(subtree_root_id, base_tree.path2id('subtree'))
89
 
            self.assertEqual('subtree', base_tree.id2path(subtree_root_id))
 
83
        self.assertTrue('file1-id' not in base_tree)
 
84
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
 
85
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
90
86
 
91
87
    def test_references_check_repository_support(self):
92
88
        """Users are stopped from adding a reference that can't be committed."""
98
94
        out, err = self.run_bzr('join --reference tree/subtree',
99
95
                                retcode=3)
100
96
        self.assertContainsRe(err, r"Can't join trees")
101
 
        self.assertContainsRe(err, r"use brz upgrade")
 
97
        self.assertContainsRe(err, r"use bzr upgrade")
 
98
 
 
99