14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
from cStringIO import StringIO
28
28
from bzrlib.bzrdir import BzrDir
29
29
from bzrlib.lockdir import LockDir
30
30
from bzrlib.mutabletree import needs_tree_write_lock
31
from bzrlib.symbol_versioning import zero_thirteen
31
32
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
32
33
from bzrlib.transport import get_transport
33
34
from bzrlib.workingtree import (
81
82
workingtree.WorkingTreeFormat.set_default_format(old_format)
82
83
self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
85
tree = self.make_branch_and_tree('.')
86
open_direct = workingtree.WorkingTree.open('.')
87
self.assertEqual(tree.basedir, open_direct.basedir)
88
open_no_args = workingtree.WorkingTree.open()
89
self.assertEqual(tree.basedir, open_no_args.basedir)
91
def test_open_containing(self):
92
tree = self.make_branch_and_tree('.')
93
open_direct, relpath = workingtree.WorkingTree.open_containing('.')
94
self.assertEqual(tree.basedir, open_direct.basedir)
95
self.assertEqual('', relpath)
96
open_no_args, relpath = workingtree.WorkingTree.open_containing()
97
self.assertEqual(tree.basedir, open_no_args.basedir)
98
self.assertEqual('', relpath)
99
open_subdir, relpath = workingtree.WorkingTree.open_containing('subdir')
100
self.assertEqual(tree.basedir, open_subdir.basedir)
101
self.assertEqual('subdir', relpath)
104
86
class SampleTreeFormat(workingtree.WorkingTreeFormat):
105
87
"""A sample format
107
this format is initializable, unsupported to aid in testing the
89
this format is initializable, unsupported to aid in testing the
108
90
open and open_downlevel routines.
112
94
"""See WorkingTreeFormat.get_format_string()."""
113
95
return "Sample tree format."
115
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
116
accelerator_tree=None, hardlink=False):
97
def initialize(self, a_bzrdir, revision_id=None):
117
98
"""Sample branches cannot be created."""
118
99
t = a_bzrdir.get_workingtree_transport(self)
119
100
t.put_bytes('format', self.get_format_string())
142
123
found_format = workingtree.WorkingTreeFormat.find_format(dir)
143
124
self.failUnless(isinstance(found_format, format.__class__))
144
125
check_format(workingtree.WorkingTreeFormat3(), "bar")
146
127
def test_find_format_no_tree(self):
147
128
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
148
129
self.assertRaises(errors.NoWorkingTree,
193
174
t = control.get_workingtree_transport(None)
194
175
self.assertEqualDiff('Bazaar-NG Working Tree format 3',
195
176
t.get('format').read())
196
self.assertEqualDiff(t.get('inventory').read(),
177
self.assertEqualDiff(t.get('inventory').read(),
197
178
'<inventory format="5">\n'
198
179
'</inventory>\n',
202
183
self.assertFalse(t.has('inventory.basis'))
203
184
# no last-revision file means 'None' or 'NULLREVISION'
204
185
self.assertFalse(t.has('last-revision'))
205
# TODO RBC 20060210 do a commit, check the inventory.basis is created
186
# TODO RBC 20060210 do a commit, check the inventory.basis is created
206
187
# correctly and last-revision file becomes present.
208
189
def test_uses_lockdir(self):
209
190
"""WorkingTreeFormat3 uses its own LockDir:
211
192
- lock is a directory
212
193
- when the WorkingTree is locked, LockDir can see that
235
216
control.create_repository()
236
217
control.create_branch()
237
218
tree = workingtree.WorkingTreeFormat3().initialize(control)
238
tree._transport.delete("pending-merges")
219
tree._control_files._transport.delete("pending-merges")
239
220
self.assertEqual([], tree.get_parent_ids())
269
250
self.assertEqual(list(tree.conflicts()), [expected])
253
class TestNonFormatSpecificCode(TestCaseWithTransport):
254
"""This class contains tests of workingtree that are not format specific."""
256
def test_gen_file_id(self):
257
file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_file_id,
259
self.assertStartsWith(file_id, 'filename-')
261
def test_gen_root_id(self):
262
file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_root_id)
263
self.assertStartsWith(file_id, 'tree_root-')
272
266
class InstrumentedTree(object):
273
267
"""A instrumented tree to check the needs_tree_write_lock decorator."""
315
309
self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
318
class TestRevert(TestCaseWithTransport):
320
def test_revert_conflicts_recursive(self):
321
this_tree = self.make_branch_and_tree('this-tree')
322
self.build_tree_contents([('this-tree/foo/',),
323
('this-tree/foo/bar', 'bar')])
324
this_tree.add(['foo', 'foo/bar'])
325
this_tree.commit('created foo/bar')
326
other_tree = this_tree.bzrdir.sprout('other-tree').open_workingtree()
327
self.build_tree_contents([('other-tree/foo/bar', 'baz')])
328
other_tree.commit('changed bar')
329
self.build_tree_contents([('this-tree/foo/bar', 'qux')])
330
this_tree.commit('changed qux')
331
this_tree.merge_from_branch(other_tree.branch)
332
self.assertEqual(1, len(this_tree.conflicts()))
333
this_tree.revert(['foo'])
334
self.assertEqual(0, len(this_tree.conflicts()))
337
312
class TestAutoResolve(TestCaseWithTransport):
339
314
def test_auto_resolve(self):
381
356
file_conflict = conflicts.TextConflict('file', None, 'hello-id')
382
357
tree.set_conflicts(conflicts.ConflictList([file_conflict]))
383
358
tree.auto_resolve()
386
class TestFindTrees(TestCaseWithTransport):
388
def test_find_trees(self):
389
self.make_branch_and_tree('foo')
390
self.make_branch_and_tree('foo/bar')
391
# Sticking a tree inside a control dir is heinous, so let's skip it
392
self.make_branch_and_tree('foo/.bzr/baz')
393
self.make_branch('qux')
394
trees = workingtree.WorkingTree.find_trees('.')
395
self.assertEqual(2, len(list(trees)))