/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: 2020-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

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
 
18
from io import BytesIO
19
19
import os
20
20
 
21
 
from bzrlib import (
22
 
    bzrdir,
 
21
from .. import (
23
22
    conflicts,
24
23
    errors,
 
24
    symbol_versioning,
 
25
    trace,
 
26
    transport,
25
27
    workingtree,
26
28
    )
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 (
 
29
from ..bzr import (
 
30
    bzrdir,
 
31
    workingtree as bzrworkingtree,
 
32
    workingtree_3,
 
33
    workingtree_4,
 
34
    )
 
35
from ..lock import write_locked
 
36
from ..lockdir import LockDir
 
37
from . import TestCase, TestCaseWithTransport, TestSkipped
 
38
from ..tree import (
34
39
    TreeEntry,
35
40
    TreeDirectory,
36
41
    TreeFile,
37
42
    TreeLink,
38
43
    )
39
44
 
 
45
from .features import SymlinkFeature
40
46
 
41
47
class TestTreeDirectory(TestCaseWithTransport):
42
48
 
65
71
class TestDefaultFormat(TestCaseWithTransport):
66
72
 
67
73
    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())
 
74
        old_format = workingtree.format_registry.get_default()
 
75
        # default is 6
 
76
        self.assertTrue(isinstance(
 
77
            old_format, workingtree_4.WorkingTreeFormat6))
 
78
        workingtree.format_registry.set_default(SampleTreeFormat())
 
79
        try:
 
80
            # the default branch format is used by the meta dir format
 
81
            # which is not the default bzrdir format at this point
 
82
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
83
            dir.create_repository()
 
84
            dir.create_branch()
 
85
            result = dir.create_workingtree()
 
86
            self.assertEqual(result, 'A tree')
 
87
        finally:
 
88
            workingtree.format_registry.set_default(old_format)
 
89
        self.assertEqual(old_format, workingtree.format_registry.get_default())
 
90
 
 
91
    def test_from_string(self):
 
92
        self.assertIsInstance(
 
93
            SampleTreeFormat.from_string(b"Sample tree format."),
 
94
            SampleTreeFormat)
 
95
        self.assertRaises(
 
96
            AssertionError, SampleTreeFormat.from_string,
 
97
            b"Different format string.")
 
98
 
 
99
    def test_get_set_default_format_by_key(self):
 
100
        old_format = workingtree.format_registry.get_default()
 
101
        # default is 6
 
102
        format = SampleTreeFormat()
 
103
        workingtree.format_registry.register(format)
 
104
        self.addCleanup(workingtree.format_registry.remove, format)
 
105
        self.assertTrue(isinstance(
 
106
            old_format, workingtree_4.WorkingTreeFormat6))
 
107
        workingtree.format_registry.set_default_key(format.get_format_string())
 
108
        try:
 
109
            # the default branch format is used by the meta dir format
 
110
            # which is not the default bzrdir format at this point
 
111
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
112
            dir.create_repository()
 
113
            dir.create_branch()
 
114
            result = dir.create_workingtree()
 
115
            self.assertEqual(result, 'A tree')
 
116
        finally:
 
117
            workingtree.format_registry.set_default_key(
 
118
                old_format.get_format_string())
 
119
        self.assertEqual(old_format, workingtree.format_registry.get_default())
83
120
 
84
121
    def test_open(self):
85
122
        tree = self.make_branch_and_tree('.')
96
133
        open_no_args, relpath = workingtree.WorkingTree.open_containing()
97
134
        self.assertEqual(tree.basedir, open_no_args.basedir)
98
135
        self.assertEqual('', relpath)
99
 
        open_subdir, relpath = workingtree.WorkingTree.open_containing('subdir')
 
136
        open_subdir, relpath = workingtree.WorkingTree.open_containing(
 
137
            'subdir')
100
138
        self.assertEqual(tree.basedir, open_subdir.basedir)
101
139
        self.assertEqual('subdir', relpath)
102
140
 
103
141
 
104
 
class SampleTreeFormat(workingtree.WorkingTreeFormat):
 
142
class SampleTreeFormat(bzrworkingtree.WorkingTreeFormatMetaDir):
105
143
    """A sample format
106
144
 
107
145
    this format is initializable, unsupported to aid in testing the
108
146
    open and open_downlevel routines.
109
147
    """
110
148
 
111
 
    def get_format_string(self):
 
149
    @classmethod
 
150
    def get_format_string(cls):
112
151
        """See WorkingTreeFormat.get_format_string()."""
113
 
        return "Sample tree format."
 
152
        return b"Sample tree format."
114
153
 
115
 
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
154
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
116
155
                   accelerator_tree=None, hardlink=False):
117
156
        """Sample branches cannot be created."""
118
 
        t = a_bzrdir.get_workingtree_transport(self)
 
157
        t = a_controldir.get_workingtree_transport(self)
119
158
        t.put_bytes('format', self.get_format_string())
120
159
        return 'A tree'
121
160
 
126
165
        return "opened tree."
127
166
 
128
167
 
 
168
class SampleExtraTreeFormat(workingtree.WorkingTreeFormat):
 
169
    """A sample format that does not support use in a metadir.
 
170
 
 
171
    """
 
172
 
 
173
    def get_format_string(self):
 
174
        # Not usable in a metadir, so no format string
 
175
        return None
 
176
 
 
177
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
 
178
                   accelerator_tree=None, hardlink=False):
 
179
        raise NotImplementedError(self.initialize)
 
180
 
 
181
    def is_supported(self):
 
182
        return False
 
183
 
 
184
    def open(self, transport, _found=False):
 
185
        raise NotImplementedError(self.open)
 
186
 
 
187
 
129
188
class TestWorkingTreeFormat(TestCaseWithTransport):
130
189
    """Tests for the WorkingTreeFormat facility."""
131
190
 
 
191
    def test_find_format_string(self):
 
192
        # is the right format object found for a working tree?
 
193
        branch = self.make_branch('branch')
 
194
        self.assertRaises(
 
195
            errors.NoWorkingTree,
 
196
            bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string,
 
197
            branch.controldir)
 
198
        transport = branch.controldir.get_workingtree_transport(None)
 
199
        transport.mkdir('.')
 
200
        transport.put_bytes("format", b"some format name")
 
201
        # The format does not have to be known by Bazaar,
 
202
        # find_format_string just retrieves the name
 
203
        self.assertEqual(
 
204
            b"some format name",
 
205
            bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string(
 
206
                branch.controldir))
 
207
 
132
208
    def test_find_format(self):
133
209
        # is the right format object found for a working tree?
134
210
        # create a branch with a few known format objects.
135
211
        self.build_tree(["foo/", "bar/"])
 
212
 
136
213
        def check_format(format, url):
137
 
            dir = format._matchingbzrdir.initialize(url)
 
214
            dir = format._matchingcontroldir.initialize(url)
138
215
            dir.create_repository()
139
216
            dir.create_branch()
140
217
            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")
 
218
            found_format = bzrworkingtree.WorkingTreeFormatMetaDir.find_format(
 
219
                dir)
 
220
            self.assertIsInstance(found_format, format.__class__)
 
221
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
145
222
 
146
223
    def test_find_format_no_tree(self):
147
224
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
148
225
        self.assertRaises(errors.NoWorkingTree,
149
 
                          workingtree.WorkingTreeFormat.find_format,
 
226
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
150
227
                          dir)
151
228
 
152
229
    def test_find_format_unknown_format(self):
155
232
        dir.create_branch()
156
233
        SampleTreeFormat().initialize(dir)
157
234
        self.assertRaises(errors.UnknownFormatError,
158
 
                          workingtree.WorkingTreeFormat.find_format,
 
235
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
159
236
                          dir)
160
237
 
 
238
    def test_find_format_with_features(self):
 
239
        tree = self.make_branch_and_tree('.', format='2a')
 
240
        tree.update_feature_flags({b"name": b"necessity"})
 
241
        found_format = bzrworkingtree.WorkingTreeFormatMetaDir.find_format(
 
242
            tree.controldir)
 
243
        self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
 
244
        self.assertEqual(found_format.features.get(b"name"), b"necessity")
 
245
        self.assertRaises(
 
246
            bzrdir.MissingFeature, found_format.check_support_status, True)
 
247
        self.addCleanup(
 
248
            bzrworkingtree.WorkingTreeFormatMetaDir.unregister_feature,
 
249
            b"name")
 
250
        bzrworkingtree.WorkingTreeFormatMetaDir.register_feature(b"name")
 
251
        found_format.check_support_status(True)
 
252
 
 
253
 
 
254
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
 
255
 
 
256
    def make_simple_tree(self):
 
257
        tree = self.make_branch_and_tree('tree', format='development-subtree')
 
258
        self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
 
259
        tree.set_root_id(b'root-id')
 
260
        tree.add(['a', 'a/b', 'a/b/c'], [b'a-id', b'b-id', b'c-id'])
 
261
        tree.commit('initial')
 
262
        return tree
 
263
 
 
264
    def test_just_directory(self):
 
265
        tree = self.make_simple_tree()
 
266
        self.assertEqual([('directory', b'root-id'),
 
267
                          ('directory', b'a-id'),
 
268
                          ('directory', b'b-id'),
 
269
                          ('file', b'c-id')],
 
270
                         [(ie.kind, ie.file_id)
 
271
                          for path, ie in tree.iter_entries_by_dir()])
 
272
        self.make_branch_and_tree('tree/a/b')
 
273
        self.assertEqual([('tree-reference', b'b-id')],
 
274
                         [(ie.kind, ie.file_id)
 
275
                          for path, ie in tree.iter_entries_by_dir(
 
276
                              specific_files=['a/b'])])
 
277
 
 
278
    def test_direct_subtree(self):
 
279
        tree = self.make_simple_tree()
 
280
        self.make_branch_and_tree('tree/a/b')
 
281
        self.assertEqual([('directory', b'root-id'),
 
282
                          ('directory', b'a-id'),
 
283
                          ('tree-reference', b'b-id')],
 
284
                         [(ie.kind, ie.file_id)
 
285
                          for path, ie in tree.iter_entries_by_dir()])
 
286
 
 
287
    def test_indirect_subtree(self):
 
288
        tree = self.make_simple_tree()
 
289
        self.make_branch_and_tree('tree/a')
 
290
        self.assertEqual([('directory', b'root-id'),
 
291
                          ('tree-reference', b'a-id')],
 
292
                         [(ie.kind, ie.file_id)
 
293
                          for path, ie in tree.iter_entries_by_dir()])
 
294
 
 
295
 
 
296
class TestWorkingTreeFormatRegistry(TestCase):
 
297
 
 
298
    def setUp(self):
 
299
        super(TestWorkingTreeFormatRegistry, self).setUp()
 
300
        self.registry = workingtree.WorkingTreeFormatRegistry()
 
301
 
161
302
    def test_register_unregister_format(self):
162
303
        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)
 
304
        self.registry.register(format)
 
305
        self.assertEqual(format, self.registry.get(b"Sample tree format."))
 
306
        self.registry.remove(format)
 
307
        self.assertRaises(KeyError, self.registry.get, b"Sample tree format.")
 
308
 
 
309
    def test_get_all(self):
 
310
        format = SampleTreeFormat()
 
311
        self.assertEqual([], self.registry._get_all())
 
312
        self.registry.register(format)
 
313
        self.assertEqual([format], self.registry._get_all())
 
314
 
 
315
    def test_register_extra(self):
 
316
        format = SampleExtraTreeFormat()
 
317
        self.assertEqual([], self.registry._get_all())
 
318
        self.registry.register_extra(format)
 
319
        self.assertEqual([format], self.registry._get_all())
 
320
 
 
321
    def test_register_extra_lazy(self):
 
322
        self.assertEqual([], self.registry._get_all())
 
323
        self.registry.register_extra_lazy("breezy.tests.test_workingtree",
 
324
                                          "SampleExtraTreeFormat")
 
325
        formats = self.registry._get_all()
 
326
        self.assertEqual(1, len(formats))
 
327
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
177
328
 
178
329
 
179
330
class TestWorkingTreeFormat3(TestCaseWithTransport):
183
334
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
184
335
        control.create_repository()
185
336
        control.create_branch()
186
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
337
        workingtree_3.WorkingTreeFormat3().initialize(control)
187
338
        # we want:
188
339
        # format 'Bazaar-NG Working Tree format 3'
189
340
        # inventory = blank inventory
191
342
        # stat-cache = ??
192
343
        # no inventory.basis yet
193
344
        t = control.get_workingtree_transport(None)
194
 
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
 
345
        self.assertEqualDiff(b'Bazaar-NG Working Tree format 3',
195
346
                             t.get('format').read())
196
347
        self.assertEqualDiff(t.get('inventory').read(),
197
 
                              '<inventory format="5">\n'
198
 
                              '</inventory>\n',
 
348
                             b'<inventory format="5">\n'
 
349
                             b'</inventory>\n',
199
350
                             )
200
 
        self.assertEqualDiff('### bzr hashcache v5\n',
 
351
        self.assertEqualDiff(b'### bzr hashcache v5\n',
201
352
                             t.get('stat-cache').read())
202
353
        self.assertFalse(t.has('inventory.basis'))
203
354
        # no last-revision file means 'None' or 'NULLREVISION'
214
365
        t = self.get_transport()
215
366
        url = self.get_url()
216
367
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
217
 
        repo = dir.create_repository()
218
 
        branch = dir.create_branch()
 
368
        dir.create_repository()
 
369
        dir.create_branch()
219
370
        try:
220
 
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
 
371
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
221
372
        except errors.NotLocalUrl:
222
373
            raise TestSkipped('Not a local URL')
223
374
        self.assertIsDirectory('.bzr', t)
224
375
        self.assertIsDirectory('.bzr/checkout', t)
225
376
        self.assertIsDirectory('.bzr/checkout/lock', t)
226
377
        our_lock = LockDir(t, '.bzr/checkout/lock')
227
 
        self.assertEquals(our_lock.peek(), None)
228
 
        tree.lock_write()
229
 
        self.assertTrue(our_lock.peek())
230
 
        tree.unlock()
231
 
        self.assertEquals(our_lock.peek(), None)
 
378
        self.assertEqual(our_lock.peek(), None)
 
379
        with tree.lock_write():
 
380
            self.assertTrue(our_lock.peek())
 
381
        self.assertEqual(our_lock.peek(), None)
232
382
 
233
383
    def test_missing_pending_merges(self):
234
384
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
235
385
        control.create_repository()
236
386
        control.create_branch()
237
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
387
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
238
388
        tree._transport.delete("pending-merges")
239
389
        self.assertEqual([], tree.get_parent_ids())
240
390
 
241
391
 
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
 
class InstrumentedTree(object):
273
 
    """A instrumented tree to check the needs_tree_write_lock decorator."""
274
 
 
275
 
    def __init__(self):
276
 
        self._locks = []
277
 
 
278
 
    def lock_tree_write(self):
279
 
        self._locks.append('t')
280
 
 
281
 
    @needs_tree_write_lock
282
 
    def method_with_tree_write_lock(self, *args, **kwargs):
283
 
        """A lock_tree_write decorated method that returns its arguments."""
284
 
        return args, kwargs
285
 
 
286
 
    @needs_tree_write_lock
287
 
    def method_that_raises(self):
288
 
        """This method causes an exception when called with parameters.
289
 
 
290
 
        This allows the decorator code to be checked - it should still call
291
 
        unlock.
292
 
        """
293
 
 
294
 
    def unlock(self):
295
 
        self._locks.append('u')
296
 
 
297
 
 
298
 
class TestInstrumentedTree(TestCase):
299
 
 
300
 
    def test_needs_tree_write_lock(self):
301
 
        """@needs_tree_write_lock should be semantically transparent."""
302
 
        tree = InstrumentedTree()
303
 
        self.assertEqual(
304
 
            'method_with_tree_write_lock',
305
 
            tree.method_with_tree_write_lock.__name__)
306
 
        self.assertDocstring(
307
 
            "A lock_tree_write decorated method that returns its arguments.",
308
 
            tree.method_with_tree_write_lock)
309
 
        args = (1, 2, 3)
310
 
        kwargs = {'a':'b'}
311
 
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
312
 
        self.assertEqual((args, kwargs), result)
313
 
        self.assertEqual(['t', 'u'], tree._locks)
314
 
        self.assertRaises(TypeError, tree.method_that_raises, 'foo')
315
 
        self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
316
 
 
317
 
 
318
392
class TestRevert(TestCaseWithTransport):
319
393
 
320
394
    def test_revert_conflicts_recursive(self):
321
395
        this_tree = self.make_branch_and_tree('this-tree')
322
396
        self.build_tree_contents([('this-tree/foo/',),
323
 
                                  ('this-tree/foo/bar', 'bar')])
 
397
                                  ('this-tree/foo/bar', b'bar')])
324
398
        this_tree.add(['foo', 'foo/bar'])
325
399
        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')])
 
400
        other_tree = this_tree.controldir.sprout(
 
401
            'other-tree').open_workingtree()
 
402
        self.build_tree_contents([('other-tree/foo/bar', b'baz')])
328
403
        other_tree.commit('changed bar')
329
 
        self.build_tree_contents([('this-tree/foo/bar', 'qux')])
 
404
        self.build_tree_contents([('this-tree/foo/bar', b'qux')])
330
405
        this_tree.commit('changed qux')
331
406
        this_tree.merge_from_branch(other_tree.branch)
332
407
        self.assertEqual(1, len(this_tree.conflicts()))
336
411
 
337
412
class TestAutoResolve(TestCaseWithTransport):
338
413
 
 
414
    def _auto_resolve(self, tree):
 
415
        """Call auto_resolve on tree expecting deprecation"""
 
416
        return self.applyDeprecated(
 
417
            symbol_versioning.deprecated_in((3, 0, 1)),
 
418
            tree.auto_resolve,)
 
419
 
339
420
    def test_auto_resolve(self):
340
421
        base = self.make_branch_and_tree('base')
341
 
        self.build_tree_contents([('base/hello', 'Hello')])
342
 
        base.add('hello', 'hello_id')
 
422
        self.build_tree_contents([('base/hello', b'Hello')])
 
423
        base.add('hello', b'hello_id')
343
424
        base.commit('Hello')
344
 
        other = base.bzrdir.sprout('other').open_workingtree()
345
 
        self.build_tree_contents([('other/hello', 'hELLO')])
 
425
        other = base.controldir.sprout('other').open_workingtree()
 
426
        self.build_tree_contents([('other/hello', b'hELLO')])
346
427
        other.commit('Case switch')
347
 
        this = base.bzrdir.sprout('this').open_workingtree()
348
 
        self.failUnlessExists('this/hello')
349
 
        self.build_tree_contents([('this/hello', 'Hello World')])
 
428
        this = base.controldir.sprout('this').open_workingtree()
 
429
        self.assertPathExists('this/hello')
 
430
        self.build_tree_contents([('this/hello', b'Hello World')])
350
431
        this.commit('Add World')
351
432
        this.merge_from_branch(other.branch)
352
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
433
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
353
434
                         this.conflicts())
354
 
        this.auto_resolve()
355
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
435
        self._auto_resolve(this)
 
436
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
356
437
                         this.conflicts())
357
438
        self.build_tree_contents([('this/hello', '<<<<<<<')])
358
 
        this.auto_resolve()
359
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
439
        self._auto_resolve(this)
 
440
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
360
441
                         this.conflicts())
361
442
        self.build_tree_contents([('this/hello', '=======')])
362
 
        this.auto_resolve()
363
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
443
        self._auto_resolve(this)
 
444
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
364
445
                         this.conflicts())
365
446
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
366
 
        remaining, resolved = this.auto_resolve()
367
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
447
        remaining, resolved = self._auto_resolve(this)
 
448
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
368
449
                         this.conflicts())
369
450
        self.assertEqual([], resolved)
370
 
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
371
 
        remaining, resolved = this.auto_resolve()
 
451
        self.build_tree_contents([('this/hello', b'hELLO wORLD')])
 
452
        remaining, resolved = self._auto_resolve(this)
372
453
        self.assertEqual([], this.conflicts())
373
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
454
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
374
455
                         resolved)
375
 
        self.failIfExists('this/hello.BASE')
 
456
        self.assertPathDoesNotExist('this/hello.BASE')
 
457
 
 
458
    def test_unsupported_symlink_auto_resolve(self):
 
459
        self.requireFeature(SymlinkFeature)
 
460
        base = self.make_branch_and_tree('base')
 
461
        self.build_tree_contents([('base/hello', 'Hello')])
 
462
        base.add('hello', b'hello_id')
 
463
        base.commit('commit 0')
 
464
        other = base.controldir.sprout('other').open_workingtree()
 
465
        self.build_tree_contents([('other/hello', 'Hello')])
 
466
        os.symlink('other/hello', 'other/foo')
 
467
        other.add('foo', b'foo_id')
 
468
        other.commit('commit symlink')
 
469
        this = base.controldir.sprout('this').open_workingtree()
 
470
        self.assertPathExists('this/hello')
 
471
        self.build_tree_contents([('this/hello', 'Hello')])
 
472
        this.commit('commit 2')
 
473
        log = BytesIO()
 
474
        trace.push_log_file(log)
 
475
        os_symlink = getattr(os, 'symlink', None)
 
476
        os.symlink = None
 
477
        try:
 
478
            this.merge_from_branch(other.branch)
 
479
        finally:
 
480
            if os_symlink:
 
481
                os.symlink = os_symlink
 
482
        self.assertContainsRe(
 
483
            log.getvalue(),
 
484
            b'Unable to create symlink "foo" on this filesystem')
376
485
 
377
486
    def test_auto_resolve_dir(self):
378
487
        tree = self.make_branch_and_tree('tree')
379
488
        self.build_tree(['tree/hello/'])
380
 
        tree.add('hello', 'hello-id')
381
 
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
382
 
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
383
 
        tree.auto_resolve()
384
 
 
385
 
 
386
 
class TestFindTrees(TestCaseWithTransport):
387
 
 
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)))
 
489
        tree.add('hello', b'hello-id')
 
490
        file_conflict = conflicts.TextConflict('hello', b'hello-id')
 
491
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
 
492
        remaining, resolved = self._auto_resolve(tree)
 
493
        self.assertEqual(
 
494
            remaining,
 
495
            conflicts.ConflictList([conflicts.TextConflict(u'hello', 'hello-id')]))
 
496
        self.assertEqual(resolved, [])
 
497
 
 
498
    def test_auto_resolve_missing(self):
 
499
        tree = self.make_branch_and_tree('tree')
 
500
        file_conflict = conflicts.TextConflict('hello', b'hello-id')
 
501
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
 
502
        remaining, resolved = self._auto_resolve(tree)
 
503
        self.assertEqual(remaining, [])
 
504
        self.assertEqual(
 
505
            resolved,
 
506
            conflicts.ConflictList([conflicts.TextConflict(u'hello', 'hello-id')]))
 
507
 
 
508
 
 
509
class TestStoredUncommitted(TestCaseWithTransport):
 
510
 
 
511
    def store_uncommitted(self):
 
512
        tree = self.make_branch_and_tree('tree')
 
513
        tree.commit('get root in there')
 
514
        self.build_tree_contents([('tree/file', b'content')])
 
515
        tree.add('file', b'file-id')
 
516
        tree.store_uncommitted()
 
517
        return tree
 
518
 
 
519
    def test_store_uncommitted(self):
 
520
        self.store_uncommitted()
 
521
        self.assertPathDoesNotExist('tree/file')
 
522
 
 
523
    def test_store_uncommitted_no_change(self):
 
524
        tree = self.make_branch_and_tree('tree')
 
525
        tree.commit('get root in there')
 
526
        tree.store_uncommitted()
 
527
        self.assertIs(None, tree.branch.get_unshelver(tree))
 
528
 
 
529
    def test_restore_uncommitted(self):
 
530
        with write_locked(self.store_uncommitted()) as tree:
 
531
            tree.restore_uncommitted()
 
532
            self.assertPathExists('tree/file')
 
533
            self.assertIs(None, tree.branch.get_unshelver(tree))
 
534
 
 
535
    def test_restore_uncommitted_none(self):
 
536
        tree = self.make_branch_and_tree('tree')
 
537
        tree.restore_uncommitted()