/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: 2018-07-26 19:15:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7055.
  • Revision ID: jelmer@jelmer.uk-20180726191527-wniq205k6tzfo1xx
Install fastimport from git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_workingtree.py
 
1
# Copyright (C) 2005-2012, 2016 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 
 
18
from .. import (
 
19
    conflicts,
 
20
    errors,
 
21
    lock,
 
22
    transport,
 
23
    workingtree,
 
24
    )
 
25
from ..bzr import (
 
26
    bzrdir,
 
27
    workingtree as bzrworkingtree,
 
28
    workingtree_3,
 
29
    workingtree_4,
 
30
    )
 
31
from ..lock import write_locked
 
32
from ..lockdir import LockDir
 
33
from . import TestCase, TestCaseWithTransport, TestSkipped
 
34
from ..tree import (
 
35
    TreeEntry,
 
36
    TreeDirectory,
 
37
    TreeFile,
 
38
    TreeLink,
 
39
    )
 
40
 
 
41
 
 
42
class TestTreeDirectory(TestCaseWithTransport):
 
43
 
 
44
    def test_kind_character(self):
 
45
        self.assertEqual(TreeDirectory().kind_character(), '/')
 
46
 
 
47
 
 
48
class TestTreeEntry(TestCaseWithTransport):
 
49
 
 
50
    def test_kind_character(self):
 
51
        self.assertEqual(TreeEntry().kind_character(), '???')
 
52
 
 
53
 
 
54
class TestTreeFile(TestCaseWithTransport):
 
55
 
 
56
    def test_kind_character(self):
 
57
        self.assertEqual(TreeFile().kind_character(), '')
 
58
 
 
59
 
 
60
class TestTreeLink(TestCaseWithTransport):
 
61
 
 
62
    def test_kind_character(self):
 
63
        self.assertEqual(TreeLink().kind_character(), '')
 
64
 
 
65
 
 
66
class TestDefaultFormat(TestCaseWithTransport):
 
67
 
 
68
    def test_get_set_default_format(self):
 
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(b"Sample tree format."),
 
88
            SampleTreeFormat)
 
89
        self.assertRaises(AssertionError,
 
90
            SampleTreeFormat.from_string, b"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())
 
112
 
 
113
    def test_open(self):
 
114
        tree = self.make_branch_and_tree('.')
 
115
        open_direct = workingtree.WorkingTree.open('.')
 
116
        self.assertEqual(tree.basedir, open_direct.basedir)
 
117
        open_no_args = workingtree.WorkingTree.open()
 
118
        self.assertEqual(tree.basedir, open_no_args.basedir)
 
119
 
 
120
    def test_open_containing(self):
 
121
        tree = self.make_branch_and_tree('.')
 
122
        open_direct, relpath = workingtree.WorkingTree.open_containing('.')
 
123
        self.assertEqual(tree.basedir, open_direct.basedir)
 
124
        self.assertEqual('', relpath)
 
125
        open_no_args, relpath = workingtree.WorkingTree.open_containing()
 
126
        self.assertEqual(tree.basedir, open_no_args.basedir)
 
127
        self.assertEqual('', relpath)
 
128
        open_subdir, relpath = workingtree.WorkingTree.open_containing('subdir')
 
129
        self.assertEqual(tree.basedir, open_subdir.basedir)
 
130
        self.assertEqual('subdir', relpath)
 
131
 
 
132
 
 
133
class SampleTreeFormat(bzrworkingtree.WorkingTreeFormatMetaDir):
 
134
    """A sample format
 
135
 
 
136
    this format is initializable, unsupported to aid in testing the
 
137
    open and open_downlevel routines.
 
138
    """
 
139
 
 
140
    @classmethod
 
141
    def get_format_string(cls):
 
142
        """See WorkingTreeFormat.get_format_string()."""
 
143
        return b"Sample tree format."
 
144
 
 
145
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
 
146
                   accelerator_tree=None, hardlink=False):
 
147
        """Sample branches cannot be created."""
 
148
        t = a_controldir.get_workingtree_transport(self)
 
149
        t.put_bytes('format', self.get_format_string())
 
150
        return 'A tree'
 
151
 
 
152
    def is_supported(self):
 
153
        return False
 
154
 
 
155
    def open(self, transport, _found=False):
 
156
        return "opened tree."
 
157
 
 
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
 
 
179
class TestWorkingTreeFormat(TestCaseWithTransport):
 
180
    """Tests for the WorkingTreeFormat facility."""
 
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
 
 
195
    def test_find_format(self):
 
196
        # is the right format object found for a working tree?
 
197
        # create a branch with a few known format objects.
 
198
        self.build_tree(["foo/", "bar/"])
 
199
        def check_format(format, url):
 
200
            dir = format._matchingcontroldir.initialize(url)
 
201
            dir.create_repository()
 
202
            dir.create_branch()
 
203
            format.initialize(dir)
 
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")
 
208
 
 
209
    def test_find_format_no_tree(self):
 
210
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
211
        self.assertRaises(errors.NoWorkingTree,
 
212
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
 
213
                          dir)
 
214
 
 
215
    def test_find_format_unknown_format(self):
 
216
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
217
        dir.create_repository()
 
218
        dir.create_branch()
 
219
        SampleTreeFormat().initialize(dir)
 
220
        self.assertRaises(errors.UnknownFormatError,
 
221
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
 
222
                          dir)
 
223
 
 
224
    def test_find_format_with_features(self):
 
225
        tree = self.make_branch_and_tree('.', format='2a')
 
226
        tree.update_feature_flags({b"name": b"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(b"name"), b"necessity")
 
231
        self.assertRaises(bzrdir.MissingFeature, found_format.check_support_status,
 
232
            True)
 
233
        self.addCleanup(bzrworkingtree.WorkingTreeFormatMetaDir.unregister_feature,
 
234
            b"name")
 
235
        bzrworkingtree.WorkingTreeFormatMetaDir.register_feature(b"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(b'root-id')
 
245
        tree.add(['a', 'a/b', 'a/b/c'], [b'a-id', b'b-id', b'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', b'root-id'),
 
252
                          ('directory', b'a-id'),
 
253
                          ('directory', b'b-id'),
 
254
                          ('file', b'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'b-id')],
 
259
                         [(ie.kind, ie.file_id)
 
260
                          for path, ie in tree.iter_entries_by_dir(
 
261
                              specific_files=['a/b'])])
 
262
 
 
263
    def test_direct_subtree(self):
 
264
        tree = self.make_simple_tree()
 
265
        subtree = self.make_branch_and_tree('tree/a/b')
 
266
        self.assertEqual([('directory', b'root-id'),
 
267
                          ('directory', b'a-id'),
 
268
                          ('tree-reference', b'b-id')],
 
269
                         [(ie.kind, ie.file_id)
 
270
                          for path, ie in tree.iter_entries_by_dir()])
 
271
 
 
272
    def test_indirect_subtree(self):
 
273
        tree = self.make_simple_tree()
 
274
        subtree = self.make_branch_and_tree('tree/a')
 
275
        self.assertEqual([('directory', b'root-id'),
 
276
                          ('tree-reference', b'a-id')],
 
277
                         [(ie.kind, ie.file_id)
 
278
                          for path, ie in tree.iter_entries_by_dir()])
 
279
 
 
280
 
 
281
class TestWorkingTreeFormatRegistry(TestCase):
 
282
 
 
283
    def setUp(self):
 
284
        super(TestWorkingTreeFormatRegistry, self).setUp()
 
285
        self.registry = workingtree.WorkingTreeFormatRegistry()
 
286
 
 
287
    def test_register_unregister_format(self):
 
288
        format = SampleTreeFormat()
 
289
        self.registry.register(format)
 
290
        self.assertEqual(format, self.registry.get(b"Sample tree format."))
 
291
        self.registry.remove(format)
 
292
        self.assertRaises(KeyError, self.registry.get, b"Sample tree format.")
 
293
 
 
294
    def test_get_all(self):
 
295
        format = SampleTreeFormat()
 
296
        self.assertEqual([], self.registry._get_all())
 
297
        self.registry.register(format)
 
298
        self.assertEqual([format], self.registry._get_all())
 
299
 
 
300
    def test_register_extra(self):
 
301
        format = SampleExtraTreeFormat()
 
302
        self.assertEqual([], self.registry._get_all())
 
303
        self.registry.register_extra(format)
 
304
        self.assertEqual([format], self.registry._get_all())
 
305
 
 
306
    def test_register_extra_lazy(self):
 
307
        self.assertEqual([], self.registry._get_all())
 
308
        self.registry.register_extra_lazy("breezy.tests.test_workingtree",
 
309
            "SampleExtraTreeFormat")
 
310
        formats = self.registry._get_all()
 
311
        self.assertEqual(1, len(formats))
 
312
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
 
313
 
 
314
 
 
315
class TestWorkingTreeFormat3(TestCaseWithTransport):
 
316
    """Tests specific to WorkingTreeFormat3."""
 
317
 
 
318
    def test_disk_layout(self):
 
319
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
320
        control.create_repository()
 
321
        control.create_branch()
 
322
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
323
        # we want:
 
324
        # format 'Bazaar-NG Working Tree format 3'
 
325
        # inventory = blank inventory
 
326
        # pending-merges = ''
 
327
        # stat-cache = ??
 
328
        # no inventory.basis yet
 
329
        t = control.get_workingtree_transport(None)
 
330
        self.assertEqualDiff(b'Bazaar-NG Working Tree format 3',
 
331
                             t.get('format').read())
 
332
        self.assertEqualDiff(t.get('inventory').read(),
 
333
                              b'<inventory format="5">\n'
 
334
                              b'</inventory>\n',
 
335
                             )
 
336
        self.assertEqualDiff(b'### bzr hashcache v5\n',
 
337
                             t.get('stat-cache').read())
 
338
        self.assertFalse(t.has('inventory.basis'))
 
339
        # no last-revision file means 'None' or 'NULLREVISION'
 
340
        self.assertFalse(t.has('last-revision'))
 
341
        # TODO RBC 20060210 do a commit, check the inventory.basis is created
 
342
        # correctly and last-revision file becomes present.
 
343
 
 
344
    def test_uses_lockdir(self):
 
345
        """WorkingTreeFormat3 uses its own LockDir:
 
346
 
 
347
            - lock is a directory
 
348
            - when the WorkingTree is locked, LockDir can see that
 
349
        """
 
350
        t = self.get_transport()
 
351
        url = self.get_url()
 
352
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
 
353
        repo = dir.create_repository()
 
354
        branch = dir.create_branch()
 
355
        try:
 
356
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
 
357
        except errors.NotLocalUrl:
 
358
            raise TestSkipped('Not a local URL')
 
359
        self.assertIsDirectory('.bzr', t)
 
360
        self.assertIsDirectory('.bzr/checkout', t)
 
361
        self.assertIsDirectory('.bzr/checkout/lock', t)
 
362
        our_lock = LockDir(t, '.bzr/checkout/lock')
 
363
        self.assertEqual(our_lock.peek(), None)
 
364
        with tree.lock_write():
 
365
            self.assertTrue(our_lock.peek())
 
366
        self.assertEqual(our_lock.peek(), None)
 
367
 
 
368
    def test_missing_pending_merges(self):
 
369
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
370
        control.create_repository()
 
371
        control.create_branch()
 
372
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
373
        tree._transport.delete("pending-merges")
 
374
        self.assertEqual([], tree.get_parent_ids())
 
375
 
 
376
 
 
377
class TestRevert(TestCaseWithTransport):
 
378
 
 
379
    def test_revert_conflicts_recursive(self):
 
380
        this_tree = self.make_branch_and_tree('this-tree')
 
381
        self.build_tree_contents([('this-tree/foo/',),
 
382
                                  ('this-tree/foo/bar', b'bar')])
 
383
        this_tree.add(['foo', 'foo/bar'])
 
384
        this_tree.commit('created foo/bar')
 
385
        other_tree = this_tree.controldir.sprout('other-tree').open_workingtree()
 
386
        self.build_tree_contents([('other-tree/foo/bar', b'baz')])
 
387
        other_tree.commit('changed bar')
 
388
        self.build_tree_contents([('this-tree/foo/bar', b'qux')])
 
389
        this_tree.commit('changed qux')
 
390
        this_tree.merge_from_branch(other_tree.branch)
 
391
        self.assertEqual(1, len(this_tree.conflicts()))
 
392
        this_tree.revert(['foo'])
 
393
        self.assertEqual(0, len(this_tree.conflicts()))
 
394
 
 
395
 
 
396
class TestAutoResolve(TestCaseWithTransport):
 
397
 
 
398
    def test_auto_resolve(self):
 
399
        base = self.make_branch_and_tree('base')
 
400
        self.build_tree_contents([('base/hello', b'Hello')])
 
401
        base.add('hello', b'hello_id')
 
402
        base.commit('Hello')
 
403
        other = base.controldir.sprout('other').open_workingtree()
 
404
        self.build_tree_contents([('other/hello', b'hELLO')])
 
405
        other.commit('Case switch')
 
406
        this = base.controldir.sprout('this').open_workingtree()
 
407
        self.assertPathExists('this/hello')
 
408
        self.build_tree_contents([('this/hello', b'Hello World')])
 
409
        this.commit('Add World')
 
410
        this.merge_from_branch(other.branch)
 
411
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
412
                         this.conflicts())
 
413
        this.auto_resolve()
 
414
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
415
                         this.conflicts())
 
416
        self.build_tree_contents([('this/hello', b'<<<<<<<')])
 
417
        this.auto_resolve()
 
418
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
419
                         this.conflicts())
 
420
        self.build_tree_contents([('this/hello', b'=======')])
 
421
        this.auto_resolve()
 
422
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
423
                         this.conflicts())
 
424
        self.build_tree_contents([('this/hello', b'\n>>>>>>>')])
 
425
        remaining, resolved = this.auto_resolve()
 
426
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
427
                         this.conflicts())
 
428
        self.assertEqual([], resolved)
 
429
        self.build_tree_contents([('this/hello', b'hELLO wORLD')])
 
430
        remaining, resolved = this.auto_resolve()
 
431
        self.assertEqual([], this.conflicts())
 
432
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
433
                         resolved)
 
434
        self.assertPathDoesNotExist('this/hello.BASE')
 
435
 
 
436
    def test_auto_resolve_dir(self):
 
437
        tree = self.make_branch_and_tree('tree')
 
438
        self.build_tree(['tree/hello/'])
 
439
        tree.add('hello', b'hello-id')
 
440
        file_conflict = conflicts.TextConflict('file', b'hello-id')
 
441
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
 
442
        tree.auto_resolve()
 
443
 
 
444
 
 
445
class TestFindTrees(TestCaseWithTransport):
 
446
 
 
447
    def test_find_trees(self):
 
448
        self.make_branch_and_tree('foo')
 
449
        self.make_branch_and_tree('foo/bar')
 
450
        # Sticking a tree inside a control dir is heinous, so let's skip it
 
451
        self.make_branch_and_tree('foo/.bzr/baz')
 
452
        self.make_branch('qux')
 
453
        trees = workingtree.WorkingTree.find_trees('.')
 
454
        self.assertEqual(2, len(list(trees)))
 
455
 
 
456
 
 
457
class TestStoredUncommitted(TestCaseWithTransport):
 
458
 
 
459
    def store_uncommitted(self):
 
460
        tree = self.make_branch_and_tree('tree')
 
461
        tree.commit('get root in there')
 
462
        self.build_tree_contents([('tree/file', b'content')])
 
463
        tree.add('file', b'file-id')
 
464
        tree.store_uncommitted()
 
465
        return tree
 
466
 
 
467
    def test_store_uncommitted(self):
 
468
        self.store_uncommitted()
 
469
        self.assertPathDoesNotExist('tree/file')
 
470
 
 
471
    def test_store_uncommitted_no_change(self):
 
472
        tree = self.make_branch_and_tree('tree')
 
473
        tree.commit('get root in there')
 
474
        tree.store_uncommitted()
 
475
        self.assertIs(None, tree.branch.get_unshelver(tree))
 
476
 
 
477
    def test_restore_uncommitted(self):
 
478
        with write_locked(self.store_uncommitted()) as tree:
 
479
            tree.restore_uncommitted()
 
480
            self.assertPathExists('tree/file')
 
481
            self.assertIs(None, tree.branch.get_unshelver(tree))
 
482
 
 
483
    def test_restore_uncommitted_none(self):
 
484
        tree = self.make_branch_and_tree('tree')
 
485
        tree.restore_uncommitted()