/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 breezy/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-20 00:00:04 UTC
  • mfrom: (6690.5.2 bundle-guess)
  • Revision ID: jelmer@jelmer.uk-20170720000004-wlknc5gthdk3tokn
Merge lp:~jelmer/brz/bundle-guess.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2016 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
 
from cStringIO import StringIO
19
 
import os
20
 
 
21
 
from bzrlib import (
22
 
    bzrdir,
 
18
from .. import (
23
19
    conflicts,
24
20
    errors,
 
21
    transport,
25
22
    workingtree,
26
23
    )
27
 
from bzrlib.branch import Branch
28
 
from bzrlib.bzrdir import BzrDir
29
 
from bzrlib.lockdir import LockDir
30
 
from bzrlib.mutabletree import needs_tree_write_lock
31
 
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
32
 
from bzrlib.transport import get_transport
33
 
from bzrlib.workingtree import (
 
24
from ..bzr import (
 
25
    bzrdir,
 
26
    workingtree as bzrworkingtree,
 
27
    workingtree_3,
 
28
    workingtree_4,
 
29
    )
 
30
from ..lock import write_locked
 
31
from ..lockdir import LockDir
 
32
from ..mutabletree import needs_tree_write_lock
 
33
from . import TestCase, TestCaseWithTransport, TestSkipped
 
34
from ..workingtree import (
34
35
    TreeEntry,
35
36
    TreeDirectory,
36
37
    TreeFile,
65
66
class TestDefaultFormat(TestCaseWithTransport):
66
67
 
67
68
    def test_get_set_default_format(self):
68
 
        old_format = workingtree.WorkingTreeFormat.get_default_format()
69
 
        # default is 3
70
 
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
71
 
        workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
72
 
        try:
73
 
            # the default branch format is used by the meta dir format
74
 
            # which is not the default bzrdir format at this point
75
 
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
76
 
            dir.create_repository()
77
 
            dir.create_branch()
78
 
            result = dir.create_workingtree()
79
 
            self.assertEqual(result, 'A tree')
80
 
        finally:
81
 
            workingtree.WorkingTreeFormat.set_default_format(old_format)
82
 
        self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
 
69
        old_format = workingtree.format_registry.get_default()
 
70
        # default is 6
 
71
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
 
72
        workingtree.format_registry.set_default(SampleTreeFormat())
 
73
        try:
 
74
            # the default branch format is used by the meta dir format
 
75
            # which is not the default bzrdir format at this point
 
76
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
77
            dir.create_repository()
 
78
            dir.create_branch()
 
79
            result = dir.create_workingtree()
 
80
            self.assertEqual(result, 'A tree')
 
81
        finally:
 
82
            workingtree.format_registry.set_default(old_format)
 
83
        self.assertEqual(old_format, workingtree.format_registry.get_default())
 
84
 
 
85
    def test_from_string(self):
 
86
        self.assertIsInstance(
 
87
            SampleTreeFormat.from_string("Sample tree format."),
 
88
            SampleTreeFormat)
 
89
        self.assertRaises(AssertionError,
 
90
            SampleTreeFormat.from_string, "Different format string.")
 
91
 
 
92
    def test_get_set_default_format_by_key(self):
 
93
        old_format = workingtree.format_registry.get_default()
 
94
        # default is 6
 
95
        format = SampleTreeFormat()
 
96
        workingtree.format_registry.register(format)
 
97
        self.addCleanup(workingtree.format_registry.remove, format)
 
98
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
 
99
        workingtree.format_registry.set_default_key(format.get_format_string())
 
100
        try:
 
101
            # the default branch format is used by the meta dir format
 
102
            # which is not the default bzrdir format at this point
 
103
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
104
            dir.create_repository()
 
105
            dir.create_branch()
 
106
            result = dir.create_workingtree()
 
107
            self.assertEqual(result, 'A tree')
 
108
        finally:
 
109
            workingtree.format_registry.set_default_key(
 
110
                old_format.get_format_string())
 
111
        self.assertEqual(old_format, workingtree.format_registry.get_default())
83
112
 
84
113
    def test_open(self):
85
114
        tree = self.make_branch_and_tree('.')
101
130
        self.assertEqual('subdir', relpath)
102
131
 
103
132
 
104
 
class SampleTreeFormat(workingtree.WorkingTreeFormat):
 
133
class SampleTreeFormat(bzrworkingtree.WorkingTreeFormatMetaDir):
105
134
    """A sample format
106
135
 
107
136
    this format is initializable, unsupported to aid in testing the
108
137
    open and open_downlevel routines.
109
138
    """
110
139
 
111
 
    def get_format_string(self):
 
140
    @classmethod
 
141
    def get_format_string(cls):
112
142
        """See WorkingTreeFormat.get_format_string()."""
113
143
        return "Sample tree format."
114
144
 
115
 
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
145
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
116
146
                   accelerator_tree=None, hardlink=False):
117
147
        """Sample branches cannot be created."""
118
 
        t = a_bzrdir.get_workingtree_transport(self)
 
148
        t = a_controldir.get_workingtree_transport(self)
119
149
        t.put_bytes('format', self.get_format_string())
120
150
        return 'A tree'
121
151
 
126
156
        return "opened tree."
127
157
 
128
158
 
 
159
class SampleExtraTreeFormat(workingtree.WorkingTreeFormat):
 
160
    """A sample format that does not support use in a metadir.
 
161
 
 
162
    """
 
163
 
 
164
    def get_format_string(self):
 
165
        # Not usable in a metadir, so no format string
 
166
        return None
 
167
 
 
168
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
 
169
                   accelerator_tree=None, hardlink=False):
 
170
        raise NotImplementedError(self.initialize)
 
171
 
 
172
    def is_supported(self):
 
173
        return False
 
174
 
 
175
    def open(self, transport, _found=False):
 
176
        raise NotImplementedError(self.open)
 
177
 
 
178
 
129
179
class TestWorkingTreeFormat(TestCaseWithTransport):
130
180
    """Tests for the WorkingTreeFormat facility."""
131
181
 
 
182
    def test_find_format_string(self):
 
183
        # is the right format object found for a working tree?
 
184
        branch = self.make_branch('branch')
 
185
        self.assertRaises(errors.NoWorkingTree,
 
186
            bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string, branch.controldir)
 
187
        transport = branch.controldir.get_workingtree_transport(None)
 
188
        transport.mkdir('.')
 
189
        transport.put_bytes("format", "some format name")
 
190
        # The format does not have to be known by Bazaar,
 
191
        # find_format_string just retrieves the name
 
192
        self.assertEqual("some format name",
 
193
            bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string(branch.controldir))
 
194
 
132
195
    def test_find_format(self):
133
196
        # is the right format object found for a working tree?
134
197
        # create a branch with a few known format objects.
138
201
            dir.create_repository()
139
202
            dir.create_branch()
140
203
            format.initialize(dir)
141
 
            t = get_transport(url)
142
 
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
143
 
            self.failUnless(isinstance(found_format, format.__class__))
144
 
        check_format(workingtree.WorkingTreeFormat3(), "bar")
 
204
            t = transport.get_transport(url)
 
205
            found_format = bzrworkingtree.WorkingTreeFormatMetaDir.find_format(dir)
 
206
            self.assertIsInstance(found_format, format.__class__)
 
207
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
145
208
 
146
209
    def test_find_format_no_tree(self):
147
210
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
148
211
        self.assertRaises(errors.NoWorkingTree,
149
 
                          workingtree.WorkingTreeFormat.find_format,
 
212
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
150
213
                          dir)
151
214
 
152
215
    def test_find_format_unknown_format(self):
155
218
        dir.create_branch()
156
219
        SampleTreeFormat().initialize(dir)
157
220
        self.assertRaises(errors.UnknownFormatError,
158
 
                          workingtree.WorkingTreeFormat.find_format,
 
221
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
159
222
                          dir)
160
223
 
 
224
    def test_find_format_with_features(self):
 
225
        tree = self.make_branch_and_tree('.', format='2a')
 
226
        tree.update_feature_flags({"name": "necessity"})
 
227
        found_format = bzrworkingtree.WorkingTreeFormatMetaDir.find_format(
 
228
            tree.controldir)
 
229
        self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
 
230
        self.assertEqual(found_format.features.get("name"), "necessity")
 
231
        self.assertRaises(bzrdir.MissingFeature, found_format.check_support_status,
 
232
            True)
 
233
        self.addCleanup(bzrworkingtree.WorkingTreeFormatMetaDir.unregister_feature,
 
234
            "name")
 
235
        bzrworkingtree.WorkingTreeFormatMetaDir.register_feature("name")
 
236
        found_format.check_support_status(True)
 
237
 
 
238
 
 
239
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
 
240
 
 
241
    def make_simple_tree(self):
 
242
        tree = self.make_branch_and_tree('tree', format='development-subtree')
 
243
        self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
 
244
        tree.set_root_id('root-id')
 
245
        tree.add(['a', 'a/b', 'a/b/c'], ['a-id', 'b-id', 'c-id'])
 
246
        tree.commit('initial')
 
247
        return tree
 
248
 
 
249
    def test_just_directory(self):
 
250
        tree = self.make_simple_tree()
 
251
        self.assertEqual([('directory', 'root-id'),
 
252
                          ('directory', 'a-id'),
 
253
                          ('directory', 'b-id'),
 
254
                          ('file', 'c-id')],
 
255
                         [(ie.kind, ie.file_id)
 
256
                          for path, ie in tree.iter_entries_by_dir()])
 
257
        subtree = self.make_branch_and_tree('tree/a/b')
 
258
        self.assertEqual([('tree-reference', 'b-id')],
 
259
                         [(ie.kind, ie.file_id)
 
260
                          for path, ie in tree.iter_entries_by_dir(['b-id'])])
 
261
 
 
262
    def test_direct_subtree(self):
 
263
        tree = self.make_simple_tree()
 
264
        subtree = self.make_branch_and_tree('tree/a/b')
 
265
        self.assertEqual([('directory', 'root-id'),
 
266
                          ('directory', 'a-id'),
 
267
                          ('tree-reference', 'b-id')],
 
268
                         [(ie.kind, ie.file_id)
 
269
                          for path, ie in tree.iter_entries_by_dir()])
 
270
 
 
271
    def test_indirect_subtree(self):
 
272
        tree = self.make_simple_tree()
 
273
        subtree = self.make_branch_and_tree('tree/a')
 
274
        self.assertEqual([('directory', 'root-id'),
 
275
                          ('tree-reference', 'a-id')],
 
276
                         [(ie.kind, ie.file_id)
 
277
                          for path, ie in tree.iter_entries_by_dir()])
 
278
 
 
279
 
 
280
class TestWorkingTreeFormatRegistry(TestCase):
 
281
 
 
282
    def setUp(self):
 
283
        super(TestWorkingTreeFormatRegistry, self).setUp()
 
284
        self.registry = workingtree.WorkingTreeFormatRegistry()
 
285
 
161
286
    def test_register_unregister_format(self):
162
287
        format = SampleTreeFormat()
163
 
        # make a control dir
164
 
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
165
 
        dir.create_repository()
166
 
        dir.create_branch()
167
 
        # make a branch
168
 
        format.initialize(dir)
169
 
        # register a format for it.
170
 
        workingtree.WorkingTreeFormat.register_format(format)
171
 
        # which branch.Open will refuse (not supported)
172
 
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
173
 
        # but open_downlevel will work
174
 
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
175
 
        # unregister the format
176
 
        workingtree.WorkingTreeFormat.unregister_format(format)
 
288
        self.registry.register(format)
 
289
        self.assertEqual(format, self.registry.get("Sample tree format."))
 
290
        self.registry.remove(format)
 
291
        self.assertRaises(KeyError, self.registry.get, "Sample tree format.")
 
292
 
 
293
    def test_get_all(self):
 
294
        format = SampleTreeFormat()
 
295
        self.assertEqual([], self.registry._get_all())
 
296
        self.registry.register(format)
 
297
        self.assertEqual([format], self.registry._get_all())
 
298
 
 
299
    def test_register_extra(self):
 
300
        format = SampleExtraTreeFormat()
 
301
        self.assertEqual([], self.registry._get_all())
 
302
        self.registry.register_extra(format)
 
303
        self.assertEqual([format], self.registry._get_all())
 
304
 
 
305
    def test_register_extra_lazy(self):
 
306
        self.assertEqual([], self.registry._get_all())
 
307
        self.registry.register_extra_lazy("breezy.tests.test_workingtree",
 
308
            "SampleExtraTreeFormat")
 
309
        formats = self.registry._get_all()
 
310
        self.assertEqual(1, len(formats))
 
311
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
177
312
 
178
313
 
179
314
class TestWorkingTreeFormat3(TestCaseWithTransport):
183
318
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
184
319
        control.create_repository()
185
320
        control.create_branch()
186
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
321
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
187
322
        # we want:
188
323
        # format 'Bazaar-NG Working Tree format 3'
189
324
        # inventory = blank inventory
217
352
        repo = dir.create_repository()
218
353
        branch = dir.create_branch()
219
354
        try:
220
 
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
 
355
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
221
356
        except errors.NotLocalUrl:
222
357
            raise TestSkipped('Not a local URL')
223
358
        self.assertIsDirectory('.bzr', t)
224
359
        self.assertIsDirectory('.bzr/checkout', t)
225
360
        self.assertIsDirectory('.bzr/checkout/lock', t)
226
361
        our_lock = LockDir(t, '.bzr/checkout/lock')
227
 
        self.assertEquals(our_lock.peek(), None)
 
362
        self.assertEqual(our_lock.peek(), None)
228
363
        tree.lock_write()
229
364
        self.assertTrue(our_lock.peek())
230
365
        tree.unlock()
231
 
        self.assertEquals(our_lock.peek(), None)
 
366
        self.assertEqual(our_lock.peek(), None)
232
367
 
233
368
    def test_missing_pending_merges(self):
234
369
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
235
370
        control.create_repository()
236
371
        control.create_branch()
237
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
372
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
238
373
        tree._transport.delete("pending-merges")
239
374
        self.assertEqual([], tree.get_parent_ids())
240
375
 
241
376
 
242
 
class TestFormat2WorkingTree(TestCaseWithTransport):
243
 
    """Tests that are specific to format 2 trees."""
244
 
 
245
 
    def create_format2_tree(self, url):
246
 
        return self.make_branch_and_tree(
247
 
            url, format=bzrdir.BzrDirFormat6())
248
 
 
249
 
    def test_conflicts(self):
250
 
        # test backwards compatability
251
 
        tree = self.create_format2_tree('.')
252
 
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
253
 
                          None)
254
 
        file('lala.BASE', 'wb').write('labase')
255
 
        expected = conflicts.ContentsConflict('lala')
256
 
        self.assertEqual(list(tree.conflicts()), [expected])
257
 
        file('lala', 'wb').write('la')
258
 
        tree.add('lala', 'lala-id')
259
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
260
 
        self.assertEqual(list(tree.conflicts()), [expected])
261
 
        file('lala.THIS', 'wb').write('lathis')
262
 
        file('lala.OTHER', 'wb').write('laother')
263
 
        # When "text conflict"s happen, stem, THIS and OTHER are text
264
 
        expected = conflicts.TextConflict('lala', file_id='lala-id')
265
 
        self.assertEqual(list(tree.conflicts()), [expected])
266
 
        os.unlink('lala.OTHER')
267
 
        os.mkdir('lala.OTHER')
268
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
269
 
        self.assertEqual(list(tree.conflicts()), [expected])
270
 
 
271
 
 
272
377
class InstrumentedTree(object):
273
378
    """A instrumented tree to check the needs_tree_write_lock decorator."""
274
379
 
323
428
                                  ('this-tree/foo/bar', 'bar')])
324
429
        this_tree.add(['foo', 'foo/bar'])
325
430
        this_tree.commit('created foo/bar')
326
 
        other_tree = this_tree.bzrdir.sprout('other-tree').open_workingtree()
 
431
        other_tree = this_tree.controldir.sprout('other-tree').open_workingtree()
327
432
        self.build_tree_contents([('other-tree/foo/bar', 'baz')])
328
433
        other_tree.commit('changed bar')
329
434
        self.build_tree_contents([('this-tree/foo/bar', 'qux')])
341
446
        self.build_tree_contents([('base/hello', 'Hello')])
342
447
        base.add('hello', 'hello_id')
343
448
        base.commit('Hello')
344
 
        other = base.bzrdir.sprout('other').open_workingtree()
 
449
        other = base.controldir.sprout('other').open_workingtree()
345
450
        self.build_tree_contents([('other/hello', 'hELLO')])
346
451
        other.commit('Case switch')
347
 
        this = base.bzrdir.sprout('this').open_workingtree()
348
 
        self.failUnlessExists('this/hello')
 
452
        this = base.controldir.sprout('this').open_workingtree()
 
453
        self.assertPathExists('this/hello')
349
454
        self.build_tree_contents([('this/hello', 'Hello World')])
350
455
        this.commit('Add World')
351
456
        this.merge_from_branch(other.branch)
352
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
457
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
353
458
                         this.conflicts())
354
459
        this.auto_resolve()
355
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
460
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
356
461
                         this.conflicts())
357
462
        self.build_tree_contents([('this/hello', '<<<<<<<')])
358
463
        this.auto_resolve()
359
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
464
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
360
465
                         this.conflicts())
361
466
        self.build_tree_contents([('this/hello', '=======')])
362
467
        this.auto_resolve()
363
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
468
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
364
469
                         this.conflicts())
365
470
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
366
471
        remaining, resolved = this.auto_resolve()
367
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
472
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
368
473
                         this.conflicts())
369
474
        self.assertEqual([], resolved)
370
475
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
371
476
        remaining, resolved = this.auto_resolve()
372
477
        self.assertEqual([], this.conflicts())
373
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
478
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
374
479
                         resolved)
375
 
        self.failIfExists('this/hello.BASE')
 
480
        self.assertPathDoesNotExist('this/hello.BASE')
376
481
 
377
482
    def test_auto_resolve_dir(self):
378
483
        tree = self.make_branch_and_tree('tree')
379
484
        self.build_tree(['tree/hello/'])
380
485
        tree.add('hello', 'hello-id')
381
 
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
 
486
        file_conflict = conflicts.TextConflict('file', 'hello-id')
382
487
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
383
488
        tree.auto_resolve()
384
489
 
393
498
        self.make_branch('qux')
394
499
        trees = workingtree.WorkingTree.find_trees('.')
395
500
        self.assertEqual(2, len(list(trees)))
 
501
 
 
502
 
 
503
class TestStoredUncommitted(TestCaseWithTransport):
 
504
 
 
505
    def store_uncommitted(self):
 
506
        tree = self.make_branch_and_tree('tree')
 
507
        tree.commit('get root in there')
 
508
        self.build_tree_contents([('tree/file', 'content')])
 
509
        tree.add('file', 'file-id')
 
510
        tree.store_uncommitted()
 
511
        return tree
 
512
 
 
513
    def test_store_uncommitted(self):
 
514
        self.store_uncommitted()
 
515
        self.assertPathDoesNotExist('tree/file')
 
516
 
 
517
    def test_store_uncommitted_no_change(self):
 
518
        tree = self.make_branch_and_tree('tree')
 
519
        tree.commit('get root in there')
 
520
        tree.store_uncommitted()
 
521
        self.assertIs(None, tree.branch.get_unshelver(tree))
 
522
 
 
523
    def test_restore_uncommitted(self):
 
524
        with write_locked(self.store_uncommitted()) as tree:
 
525
            tree.restore_uncommitted()
 
526
            self.assertPathExists('tree/file')
 
527
            self.assertIs(None, tree.branch.get_unshelver(tree))
 
528
 
 
529
    def test_restore_uncommitted_none(self):
 
530
        tree = self.make_branch_and_tree('tree')
 
531
        tree.restore_uncommitted()