/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: Martin
  • Date: 2017-06-09 16:31:49 UTC
  • mto: This revision was merged to the branch mainline in revision 6673.
  • Revision ID: gzlist@googlemail.com-20170609163149-liveiasey25480q6
Make InventoryDeltaError use string formatting, and repr for fileids

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