/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_reference.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reference.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from breezy import (
19
 
    controldir,
20
 
    )
21
 
from breezy.bzr import (
22
 
    branch as _mod_bzrbranch,
23
 
    )
24
 
from breezy.tests import TestCaseWithTransport
 
18
from bzrlib import (
 
19
    branch as _mod_branch,
 
20
    bzrdir,
 
21
    )
 
22
from bzrlib.tests import TestCaseWithTransport
25
23
 
26
24
 
27
25
class TestReference(TestCaseWithTransport):
28
26
 
29
 
    def get_default_format(self):
30
 
        return controldir.format_registry.make_controldir('development-subtree')
 
27
    def make_branch(self, location, format=None):
 
28
        if format is None:
 
29
            format = bzrdir.format_registry.make_bzrdir('1.9')
 
30
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
 
31
        return TestCaseWithTransport.make_branch(self, location, format=format)
31
32
 
32
33
    def test_no_args_lists(self):
33
34
        branch = self.make_branch('branch')
34
 
        branch.set_reference_info('path', 'http://example.org', b'file-id')
35
 
        branch.set_reference_info('lath', 'http://example.org/2', b'file-id2')
 
35
        branch.set_reference_info('file-id', 'path', 'http://example.org')
 
36
        branch.set_reference_info('file-id2', 'lath', 'http://example.org/2')
36
37
        out, err = self.run_bzr('reference', working_dir='branch')
37
38
        lines = out.splitlines()
38
39
        self.assertEqual('lath http://example.org/2', lines[0])
41
42
    def make_tree_with_reference(self):
42
43
        tree = self.make_branch_and_tree('tree')
43
44
        self.build_tree(['tree/newpath'])
44
 
        tree.add('newpath', b'file-id')
45
 
        tree.branch.set_reference_info(
46
 
            'newpath', 'http://example.org', b'file-id')
47
 
        tree.branch.set_reference_info('lath', 'http://example.org/2',
48
 
                                       b'file-id2')
 
45
        tree.add('newpath', 'file-id')
 
46
        tree.branch.set_reference_info('file-id', 'path', 'http://example.org')
 
47
        tree.branch.set_reference_info('file-id2', 'lath',
 
48
                                       'http://example.org/2')
49
49
        return tree
50
50
 
51
51
    def test_uses_working_tree_location(self):
56
56
    def test_uses_basis_tree_location(self):
57
57
        tree = self.make_tree_with_reference()
58
58
        tree.commit('add newpath')
59
 
        tree.controldir.destroy_workingtree()
 
59
        tree.bzrdir.destroy_workingtree()
60
60
        out, err = self.run_bzr('reference', working_dir='tree')
61
61
        self.assertContainsRe(out, 'newpath http://example.org\n')
62
62
 
73
73
    def test_two_args_sets(self):
74
74
        tree = self.make_branch_and_tree('tree')
75
75
        self.build_tree(['tree/file'])
76
 
        tree.add('file', b'file-id')
 
76
        tree.add('file', 'file-id')
77
77
        out, err = self.run_bzr('reference tree/file http://example.org')
78
 
        location, file_id = tree.branch.get_reference_info('file')
 
78
        path, location = tree.branch.get_reference_info('file-id')
79
79
        self.assertEqual('http://example.org', location)
80
 
        self.assertEqual(b'file-id', file_id)
 
80
        self.assertEqual('file', path)
81
81
        self.assertEqual('', out)
82
82
        self.assertEqual('', err)
83
83
 
85
85
        tree = self.make_branch_and_tree('tree')
86
86
        out, err = self.run_bzr('reference file http://example.org',
87
87
                                working_dir='tree', retcode=3)
88
 
        self.assertEqual('brz: ERROR: file is not versioned.\n', err)
89
 
 
90
 
    def test_missing_file_forced(self):
91
 
        tree = self.make_branch_and_tree('tree')
92
 
        out, err = self.run_bzr(
93
 
            'reference --force-unversioned file http://example.org',
94
 
            working_dir='tree')
95
 
        location, file_id = tree.branch.get_reference_info('file')
96
 
        self.assertEqual('http://example.org', location)
97
 
        self.assertEqual('', out)
98
 
        self.assertEqual('', err)
 
88
        self.assertEqual('bzr: ERROR: file is not versioned.\n', err)