~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

Merge in bzrdir work to enable checkout improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# (C) 2005 Canonical Ltd
 
1
# (C) 2005,2006 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
 
18
from cStringIO import StringIO
18
19
import os
 
20
 
 
21
import bzrlib
19
22
from bzrlib.branch import Branch
 
23
import bzrlib.bzrdir as bzrdir
 
24
from bzrlib.bzrdir import BzrDir
 
25
import bzrlib.errors as errors
20
26
from bzrlib.errors import NotBranchError, NotVersionedError
21
 
from bzrlib.tests import TestCaseInTempDir
 
27
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
 
28
from bzrlib.tests import TestCaseWithTransport
22
29
from bzrlib.trace import mutter
23
 
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
 
30
from bzrlib.transport import get_transport
 
31
import bzrlib.workingtree as workingtree
24
32
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
25
33
                                WorkingTree)
26
34
 
27
 
class TestTreeDirectory(TestCaseInTempDir):
 
35
class TestTreeDirectory(TestCaseWithTransport):
28
36
 
29
37
    def test_kind_character(self):
30
38
        self.assertEqual(TreeDirectory().kind_character(), '/')
31
39
 
32
40
 
33
 
class TestTreeEntry(TestCaseInTempDir):
 
41
class TestTreeEntry(TestCaseWithTransport):
34
42
 
35
43
    def test_kind_character(self):
36
44
        self.assertEqual(TreeEntry().kind_character(), '???')
37
45
 
38
46
 
39
 
class TestTreeFile(TestCaseInTempDir):
 
47
class TestTreeFile(TestCaseWithTransport):
40
48
 
41
49
    def test_kind_character(self):
42
50
        self.assertEqual(TreeFile().kind_character(), '')
43
51
 
44
52
 
45
 
class TestTreeLink(TestCaseInTempDir):
 
53
class TestTreeLink(TestCaseWithTransport):
46
54
 
47
55
    def test_kind_character(self):
48
56
        self.assertEqual(TreeLink().kind_character(), '')
49
57
 
50
58
 
51
 
class TestWorkingTree(TestCaseInTempDir):
52
 
 
53
 
    def test_listfiles(self):
54
 
        branch = Branch.initialize(u'.')
55
 
        os.mkdir('dir')
56
 
        print >> open('file', 'w'), "content"
57
 
        if has_symlinks():
58
 
            os.symlink('target', 'symlink')
59
 
        tree = branch.working_tree()
60
 
        files = list(tree.list_files())
61
 
        self.assertEqual(files[0], ('dir', '?', 'directory', None, TreeDirectory()))
62
 
        self.assertEqual(files[1], ('file', '?', 'file', None, TreeFile()))
63
 
        if has_symlinks():
64
 
            self.assertEqual(files[2], ('symlink', '?', 'symlink', None, TreeLink()))
65
 
 
66
 
    def test_open_containing(self):
67
 
        branch = Branch.initialize(u'.')
68
 
        wt, relpath = WorkingTree.open_containing()
69
 
        self.assertEqual('', relpath)
70
 
        self.assertEqual(wt.basedir + '/', branch.base)
71
 
        wt, relpath = WorkingTree.open_containing(u'.')
72
 
        self.assertEqual('', relpath)
73
 
        self.assertEqual(wt.basedir + '/', branch.base)
74
 
        wt, relpath = WorkingTree.open_containing('./foo')
75
 
        self.assertEqual('foo', relpath)
76
 
        self.assertEqual(wt.basedir + '/', branch.base)
77
 
        # paths that are urls are just plain wrong for working trees.
 
59
class TestDefaultFormat(TestCaseWithTransport):
 
60
 
 
61
    def test_get_set_default_format(self):
 
62
        old_format = workingtree.WorkingTreeFormat.get_default_format()
 
63
        # default is 3
 
64
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
 
65
        workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
 
66
        try:
 
67
            # the default branch format is used by the meta dir format
 
68
            # which is not the default bzrdir format at this point
 
69
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
70
            dir.create_repository()
 
71
            dir.create_branch()
 
72
            result = dir.create_workingtree()
 
73
            self.assertEqual(result, 'A tree')
 
74
        finally:
 
75
            workingtree.WorkingTreeFormat.set_default_format(old_format)
 
76
        self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
 
77
 
 
78
 
 
79
class SampleTreeFormat(workingtree.WorkingTreeFormat):
 
80
    """A sample format
 
81
 
 
82
    this format is initializable, unsupported to aid in testing the 
 
83
    open and open_downlevel routines.
 
84
    """
 
85
 
 
86
    def get_format_string(self):
 
87
        """See WorkingTreeFormat.get_format_string()."""
 
88
        return "Sample tree format."
 
89
 
 
90
    def initialize(self, a_bzrdir):
 
91
        """Sample branches cannot be created."""
 
92
        t = a_bzrdir.get_workingtree_transport(self)
 
93
        t.put('format', StringIO(self.get_format_string()))
 
94
        return 'A tree'
 
95
 
 
96
    def is_supported(self):
 
97
        return False
 
98
 
 
99
    def open(self, transport, _found=False):
 
100
        return "opened tree."
 
101
 
 
102
 
 
103
class TestWorkingTreeFormat(TestCaseWithTransport):
 
104
    """Tests for the WorkingTreeFormat facility."""
 
105
 
 
106
    def test_find_format(self):
 
107
        # is the right format object found for a working tree?
 
108
        # create a branch with a few known format objects.
 
109
        self.build_tree(["foo/", "bar/"])
 
110
        def check_format(format, url):
 
111
            dir = format._matchingbzrdir.initialize(url)
 
112
            dir.create_repository()
 
113
            dir.create_branch()
 
114
            format.initialize(dir)
 
115
            t = get_transport(url)
 
116
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
 
117
            self.failUnless(isinstance(found_format, format.__class__))
 
118
        check_format(workingtree.WorkingTreeFormat3(), "bar")
 
119
        
 
120
    def test_find_format_no_tree(self):
 
121
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
78
122
        self.assertRaises(NotBranchError,
79
 
                          WorkingTree.open_containing, 
80
 
                          'file:///' + getcwd())
81
 
 
82
 
    def test_construct_with_branch(self):
83
 
        branch = Branch.initialize(u'.')
84
 
        tree = WorkingTree(branch.base, branch)
85
 
        self.assertEqual(branch, tree.branch)
86
 
        self.assertEqual(branch.base, tree.basedir + '/')
87
 
    
88
 
    def test_construct_without_branch(self):
89
 
        branch = Branch.initialize(u'.')
90
 
        tree = WorkingTree(branch.base)
91
 
        self.assertEqual(branch.base, tree.branch.base)
92
 
        self.assertEqual(branch.base, tree.basedir + '/')
93
 
 
94
 
    def test_basic_relpath(self):
95
 
        # for comprehensive relpath tests, see whitebox.py.
96
 
        branch = Branch.initialize(u'.')
97
 
        tree = WorkingTree(branch.base)
98
 
        self.assertEqual('child',
99
 
                         tree.relpath(pathjoin(getcwd(), 'child')))
100
 
 
101
 
    def test_lock_locks_branch(self):
102
 
        branch = Branch.initialize(u'.')
103
 
        tree = WorkingTree(branch.base)
104
 
        tree.lock_read()
105
 
        self.assertEqual(1, tree.branch._lock_count)
106
 
        self.assertEqual('r', tree.branch._lock_mode)
107
 
        tree.unlock()
108
 
        self.assertEqual(None, tree.branch._lock_count)
109
 
        tree.lock_write()
110
 
        self.assertEqual(1, tree.branch._lock_count)
111
 
        self.assertEqual('w', tree.branch._lock_mode)
112
 
        tree.unlock()
113
 
        self.assertEqual(None, tree.branch._lock_count)
114
 
 
115
 
    def get_pullable_branches(self):
116
 
        self.build_tree(['from/', 'from/file', 'to/'])
117
 
        br_a = Branch.initialize('from')
118
 
        tree = br_a.working_tree()
119
 
        tree.add('file')
120
 
        tree.commit('foo', rev_id='A')
121
 
        br_b = Branch.initialize('to')
122
 
        return br_a, br_b
123
 
 
124
 
    def test_pull(self):
125
 
        br_a, br_b = self.get_pullable_branches()
126
 
        br_b.working_tree().pull(br_a)
127
 
        self.failUnless(br_b.has_revision('A'))
128
 
        self.assertEqual(['A'], br_b.revision_history())
129
 
 
130
 
    def test_pull_overwrites(self):
131
 
        br_a, br_b = self.get_pullable_branches()
132
 
        br_b.working_tree().commit('foo', rev_id='B')
133
 
        self.assertEqual(['B'], br_b.revision_history())
134
 
        br_b.working_tree().pull(br_a, overwrite=True)
135
 
        self.failUnless(br_b.has_revision('A'))
136
 
        self.failUnless(br_b.has_revision('B'))
137
 
        self.assertEqual(['A'], br_b.revision_history())
138
 
 
139
 
    def test_revert(self):
140
 
        """Test selected-file revert"""
141
 
        b = Branch.initialize(u'.')
142
 
 
143
 
        self.build_tree(['hello.txt'])
144
 
        file('hello.txt', 'w').write('initial hello')
145
 
 
146
 
        self.assertRaises(NotVersionedError,
147
 
                          b.working_tree().revert, ['hello.txt'])
148
 
        tree = WorkingTree(b.base, b)
149
 
        tree.add(['hello.txt'])
150
 
        tree.commit('create initial hello.txt')
151
 
 
152
 
        self.check_file_contents('hello.txt', 'initial hello')
153
 
        file('hello.txt', 'w').write('new hello')
154
 
        self.check_file_contents('hello.txt', 'new hello')
155
 
 
156
 
        # revert file modified since last revision
157
 
        tree.revert(['hello.txt'])
158
 
        self.check_file_contents('hello.txt', 'initial hello')
159
 
        self.check_file_contents('hello.txt~', 'new hello')
160
 
 
161
 
        # reverting again does not clobber the backup
162
 
        tree.revert(['hello.txt'])
163
 
        self.check_file_contents('hello.txt', 'initial hello')
164
 
        self.check_file_contents('hello.txt~', 'new hello')
165
 
 
166
 
    def test_unknowns(self):
167
 
        b = Branch.initialize(u'.')
168
 
        tree = WorkingTree(u'.', b)
169
 
        self.build_tree(['hello.txt',
170
 
                         'hello.txt~'])
171
 
        self.assertEquals(list(tree.unknowns()),
172
 
                          ['hello.txt'])
173
 
 
174
 
    def test_hashcache(self):
175
 
        from bzrlib.tests.test_hashcache import pause
176
 
        b = Branch.initialize(u'.')
177
 
        tree = WorkingTree(u'.', b)
178
 
        self.build_tree(['hello.txt',
179
 
                         'hello.txt~'])
180
 
        tree.add('hello.txt')
181
 
        pause()
182
 
        sha = tree.get_file_sha1(tree.path2id('hello.txt'))
183
 
        self.assertEqual(1, tree._hashcache.miss_count)
184
 
        tree2 = WorkingTree(u'.', b)
185
 
        sha2 = tree2.get_file_sha1(tree2.path2id('hello.txt'))
186
 
        self.assertEqual(0, tree2._hashcache.miss_count)
187
 
        self.assertEqual(1, tree2._hashcache.hit_count)
 
123
                          workingtree.WorkingTreeFormat.find_format,
 
124
                          dir)
 
125
 
 
126
    def test_find_format_unknown_format(self):
 
127
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
128
        dir.create_repository()
 
129
        dir.create_branch()
 
130
        SampleTreeFormat().initialize(dir)
 
131
        self.assertRaises(errors.UnknownFormatError,
 
132
                          workingtree.WorkingTreeFormat.find_format,
 
133
                          dir)
 
134
 
 
135
    def test_register_unregister_format(self):
 
136
        format = SampleTreeFormat()
 
137
        # make a control dir
 
138
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
139
        dir.create_repository()
 
140
        dir.create_branch()
 
141
        # make a branch
 
142
        format.initialize(dir)
 
143
        # register a format for it.
 
144
        workingtree.WorkingTreeFormat.register_format(format)
 
145
        # which branch.Open will refuse (not supported)
 
146
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
 
147
        # compatability
 
148
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree, '.')
 
149
        # but open_downlevel will work
 
150
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
 
151
        # unregister the format
 
152
        workingtree.WorkingTreeFormat.unregister_format(format)
 
153
 
 
154
 
 
155
class TestWorkingTreeFormat3(TestCaseWithTransport):
 
156
    """Tests specific to WorkingTreeFormat3."""
 
157
 
 
158
    def test_disk_layout(self):
 
159
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
160
        control.create_repository()
 
161
        control.create_branch()
 
162
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
163
        # we want:
 
164
        # format 'Bazaar-NG Working Tree format 3'
 
165
        # lock ''
 
166
        # inventory = blank inventory
 
167
        # pending-merges = ''
 
168
        # stat-cache = ??
 
169
        # no inventory.basis yet
 
170
        t = control.get_workingtree_transport(None)
 
171
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
 
172
                             t.get('format').read())
 
173
        self.assertEqualDiff('', t.get('lock').read())
 
174
        self.assertEqualDiff('<inventory format="5">\n'
 
175
                             '</inventory>\n',
 
176
                             t.get('inventory').read())
 
177
        self.assertEqualDiff('### bzr hashcache v5\n',
 
178
                             t.get('stat-cache').read())
 
179
        self.assertFalse(t.has('inventory.basis'))
 
180
        # TODO RBC 20060210 do a commit, check the inventory.basis is created 
 
181
        # correctly.