~bzr-pqm/bzr/bzr.dev

1399.1.12 by Robert Collins
add new test script
1
# (C) 2005 Canonical Ltd
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
import os
19
from bzrlib.branch import Branch
1508.1.3 by Robert Collins
Do not consider urls to be relative paths within working trees.
20
from bzrlib.errors import NotBranchError, NotVersionedError
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
21
from bzrlib.tests import TestCaseInTempDir
1399.1.12 by Robert Collins
add new test script
22
from bzrlib.trace import mutter
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
23
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
24
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
25
                                WorkingTree)
1399.1.12 by Robert Collins
add new test script
26
27
class TestTreeDirectory(TestCaseInTempDir):
28
29
    def test_kind_character(self):
30
        self.assertEqual(TreeDirectory().kind_character(), '/')
31
32
33
class TestTreeEntry(TestCaseInTempDir):
34
35
    def test_kind_character(self):
36
        self.assertEqual(TreeEntry().kind_character(), '???')
37
38
39
class TestTreeFile(TestCaseInTempDir):
40
41
    def test_kind_character(self):
42
        self.assertEqual(TreeFile().kind_character(), '')
43
44
45
class TestTreeLink(TestCaseInTempDir):
46
47
    def test_kind_character(self):
48
        self.assertEqual(TreeLink().kind_character(), '')
49
50
51
class TestWorkingTree(TestCaseInTempDir):
52
53
    def test_listfiles(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
54
        branch = Branch.initialize(u'.')
1399.1.12 by Robert Collins
add new test script
55
        os.mkdir('dir')
56
        print >> open('file', 'w'), "content"
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
57
        if has_symlinks():
58
            os.symlink('target', 'symlink')
1399.1.12 by Robert Collins
add new test script
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()))
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
63
        if has_symlinks():
64
            self.assertEqual(files[2], ('symlink', '?', 'symlink', None, TreeLink()))
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
65
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
66
    def test_open_containing(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
67
        branch = Branch.initialize(u'.')
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
68
        wt, relpath = WorkingTree.open_containing()
69
        self.assertEqual('', relpath)
70
        self.assertEqual(wt.basedir, branch.base)
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
71
        wt, relpath = WorkingTree.open_containing(u'.')
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
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)
1508.1.3 by Robert Collins
Do not consider urls to be relative paths within working trees.
77
        # paths that are urls are just plain wrong for working trees.
78
        self.assertRaises(NotBranchError,
79
                          WorkingTree.open_containing, 
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
80
                          'file:///' + getcwd())
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
81
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
82
    def test_construct_with_branch(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
83
        branch = Branch.initialize(u'.')
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
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):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
89
        branch = Branch.initialize(u'.')
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
90
        tree = WorkingTree(branch.base)
91
        self.assertEqual(branch.base, tree.branch.base)
92
        self.assertEqual(branch.base, tree.basedir)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
93
94
    def test_basic_relpath(self):
95
        # for comprehensive relpath tests, see whitebox.py.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
96
        branch = Branch.initialize(u'.')
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
97
        tree = WorkingTree(branch.base)
98
        self.assertEqual('child',
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
99
                         tree.relpath(pathjoin(getcwd(), 'child')))
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
100
101
    def test_lock_locks_branch(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
102
        branch = Branch.initialize(u'.')
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
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)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
114
 
115
    def get_pullable_branches(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
116
        self.build_tree(['from/', 'from/file', 'to/'])
117
        br_a = Branch.initialize('from')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
118
        tree = br_a.working_tree()
119
        tree.add('file')
120
        tree.commit('foo', rev_id='A')
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
121
        br_b = Branch.initialize('to')
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
122
        return br_a, br_b
123
 
124
    def test_pull(self):
125
        br_a, br_b = self.get_pullable_branches()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
126
        br_b.working_tree().pull(br_a)
127
        self.failUnless(br_b.has_revision('A'))
128
        self.assertEqual(['A'], br_b.revision_history())
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
129
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
130
    def test_pull_overwrites(self):
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
131
        br_a, br_b = self.get_pullable_branches()
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
132
        br_b.working_tree().commit('foo', rev_id='B')
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
133
        self.assertEqual(['B'], br_b.revision_history())
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
134
        br_b.working_tree().pull(br_a, overwrite=True)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
135
        self.failUnless(br_b.has_revision('A'))
136
        self.failUnless(br_b.has_revision('B'))
137
        self.assertEqual(['A'], br_b.revision_history())
1501 by Robert Collins
Move revert from Branch to WorkingTree.
138
139
    def test_revert(self):
140
        """Test selected-file revert"""
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
141
        b = Branch.initialize(u'.')
1501 by Robert Collins
Move revert from Branch to WorkingTree.
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'])
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
148
        tree = WorkingTree(b.base, b)
149
        tree.add(['hello.txt'])
150
        tree.commit('create initial hello.txt')
1501 by Robert Collins
Move revert from Branch to WorkingTree.
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
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
157
        tree.revert(['hello.txt'])
1501 by Robert Collins
Move revert from Branch to WorkingTree.
158
        self.check_file_contents('hello.txt', 'initial hello')
159
        self.check_file_contents('hello.txt~', 'new hello')
160
1457.1.8 by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner.
161
        # reverting again does not clobber the backup
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
162
        tree.revert(['hello.txt'])
1501 by Robert Collins
Move revert from Branch to WorkingTree.
163
        self.check_file_contents('hello.txt', 'initial hello')
1457.1.8 by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner.
164
        self.check_file_contents('hello.txt~', 'new hello')
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
165
166
    def test_unknowns(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
167
        b = Branch.initialize(u'.')
168
        tree = WorkingTree(u'.', b)
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
169
        self.build_tree(['hello.txt',
170
                         'hello.txt~'])
171
        self.assertEquals(list(tree.unknowns()),
172
                          ['hello.txt'])
173
1185.60.6 by Aaron Bentley
Fixed hashcache
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)