/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-01-28 23:51:14 UTC
  • mfrom: (7251.1.1 skip-crypto-deprecation)
  • Revision ID: breezy.the.bot@gmail.com-20190128235114-wurthh67hpldlyip
Ignore UserWarning on travis.

Merged from https://code.launchpad.net/~jelmer/brz/skip-crypto-deprecation/+merge/362227

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 . import TestCase, TestCaseWithTransport, TestSkipped
 
33
from ..tree import (
34
34
    TreeEntry,
35
35
    TreeDirectory,
36
36
    TreeFile,
65
65
class TestDefaultFormat(TestCaseWithTransport):
66
66
 
67
67
    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())
 
68
        old_format = workingtree.format_registry.get_default()
 
69
        # default is 6
 
70
        self.assertTrue(isinstance(
 
71
            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(
 
90
            AssertionError, SampleTreeFormat.from_string,
 
91
            b"Different format string.")
 
92
 
 
93
    def test_get_set_default_format_by_key(self):
 
94
        old_format = workingtree.format_registry.get_default()
 
95
        # default is 6
 
96
        format = SampleTreeFormat()
 
97
        workingtree.format_registry.register(format)
 
98
        self.addCleanup(workingtree.format_registry.remove, format)
 
99
        self.assertTrue(isinstance(
 
100
            old_format, workingtree_4.WorkingTreeFormat6))
 
101
        workingtree.format_registry.set_default_key(format.get_format_string())
 
102
        try:
 
103
            # the default branch format is used by the meta dir format
 
104
            # which is not the default bzrdir format at this point
 
105
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
106
            dir.create_repository()
 
107
            dir.create_branch()
 
108
            result = dir.create_workingtree()
 
109
            self.assertEqual(result, 'A tree')
 
110
        finally:
 
111
            workingtree.format_registry.set_default_key(
 
112
                old_format.get_format_string())
 
113
        self.assertEqual(old_format, workingtree.format_registry.get_default())
83
114
 
84
115
    def test_open(self):
85
116
        tree = self.make_branch_and_tree('.')
96
127
        open_no_args, relpath = workingtree.WorkingTree.open_containing()
97
128
        self.assertEqual(tree.basedir, open_no_args.basedir)
98
129
        self.assertEqual('', relpath)
99
 
        open_subdir, relpath = workingtree.WorkingTree.open_containing('subdir')
 
130
        open_subdir, relpath = workingtree.WorkingTree.open_containing(
 
131
            'subdir')
100
132
        self.assertEqual(tree.basedir, open_subdir.basedir)
101
133
        self.assertEqual('subdir', relpath)
102
134
 
103
135
 
104
 
class SampleTreeFormat(workingtree.WorkingTreeFormat):
 
136
class SampleTreeFormat(bzrworkingtree.WorkingTreeFormatMetaDir):
105
137
    """A sample format
106
138
 
107
139
    this format is initializable, unsupported to aid in testing the
108
140
    open and open_downlevel routines.
109
141
    """
110
142
 
111
 
    def get_format_string(self):
 
143
    @classmethod
 
144
    def get_format_string(cls):
112
145
        """See WorkingTreeFormat.get_format_string()."""
113
 
        return "Sample tree format."
 
146
        return b"Sample tree format."
114
147
 
115
 
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
148
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
116
149
                   accelerator_tree=None, hardlink=False):
117
150
        """Sample branches cannot be created."""
118
 
        t = a_bzrdir.get_workingtree_transport(self)
 
151
        t = a_controldir.get_workingtree_transport(self)
119
152
        t.put_bytes('format', self.get_format_string())
120
153
        return 'A tree'
121
154
 
126
159
        return "opened tree."
127
160
 
128
161
 
 
162
class SampleExtraTreeFormat(workingtree.WorkingTreeFormat):
 
163
    """A sample format that does not support use in a metadir.
 
164
 
 
165
    """
 
166
 
 
167
    def get_format_string(self):
 
168
        # Not usable in a metadir, so no format string
 
169
        return None
 
170
 
 
171
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
 
172
                   accelerator_tree=None, hardlink=False):
 
173
        raise NotImplementedError(self.initialize)
 
174
 
 
175
    def is_supported(self):
 
176
        return False
 
177
 
 
178
    def open(self, transport, _found=False):
 
179
        raise NotImplementedError(self.open)
 
180
 
 
181
 
129
182
class TestWorkingTreeFormat(TestCaseWithTransport):
130
183
    """Tests for the WorkingTreeFormat facility."""
131
184
 
 
185
    def test_find_format_string(self):
 
186
        # is the right format object found for a working tree?
 
187
        branch = self.make_branch('branch')
 
188
        self.assertRaises(
 
189
            errors.NoWorkingTree,
 
190
            bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string,
 
191
            branch.controldir)
 
192
        transport = branch.controldir.get_workingtree_transport(None)
 
193
        transport.mkdir('.')
 
194
        transport.put_bytes("format", b"some format name")
 
195
        # The format does not have to be known by Bazaar,
 
196
        # find_format_string just retrieves the name
 
197
        self.assertEqual(
 
198
            b"some format name",
 
199
            bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string(
 
200
                branch.controldir))
 
201
 
132
202
    def test_find_format(self):
133
203
        # is the right format object found for a working tree?
134
204
        # create a branch with a few known format objects.
135
205
        self.build_tree(["foo/", "bar/"])
 
206
 
136
207
        def check_format(format, url):
137
 
            dir = format._matchingbzrdir.initialize(url)
 
208
            dir = format._matchingcontroldir.initialize(url)
138
209
            dir.create_repository()
139
210
            dir.create_branch()
140
211
            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")
 
212
            found_format = bzrworkingtree.WorkingTreeFormatMetaDir.find_format(
 
213
                dir)
 
214
            self.assertIsInstance(found_format, format.__class__)
 
215
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
145
216
 
146
217
    def test_find_format_no_tree(self):
147
218
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
148
219
        self.assertRaises(errors.NoWorkingTree,
149
 
                          workingtree.WorkingTreeFormat.find_format,
 
220
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
150
221
                          dir)
151
222
 
152
223
    def test_find_format_unknown_format(self):
155
226
        dir.create_branch()
156
227
        SampleTreeFormat().initialize(dir)
157
228
        self.assertRaises(errors.UnknownFormatError,
158
 
                          workingtree.WorkingTreeFormat.find_format,
 
229
                          bzrworkingtree.WorkingTreeFormatMetaDir.find_format,
159
230
                          dir)
160
231
 
 
232
    def test_find_format_with_features(self):
 
233
        tree = self.make_branch_and_tree('.', format='2a')
 
234
        tree.update_feature_flags({b"name": b"necessity"})
 
235
        found_format = bzrworkingtree.WorkingTreeFormatMetaDir.find_format(
 
236
            tree.controldir)
 
237
        self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
 
238
        self.assertEqual(found_format.features.get(b"name"), b"necessity")
 
239
        self.assertRaises(
 
240
            bzrdir.MissingFeature, found_format.check_support_status, True)
 
241
        self.addCleanup(
 
242
            bzrworkingtree.WorkingTreeFormatMetaDir.unregister_feature,
 
243
            b"name")
 
244
        bzrworkingtree.WorkingTreeFormatMetaDir.register_feature(b"name")
 
245
        found_format.check_support_status(True)
 
246
 
 
247
 
 
248
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
 
249
 
 
250
    def make_simple_tree(self):
 
251
        tree = self.make_branch_and_tree('tree', format='development-subtree')
 
252
        self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
 
253
        tree.set_root_id(b'root-id')
 
254
        tree.add(['a', 'a/b', 'a/b/c'], [b'a-id', b'b-id', b'c-id'])
 
255
        tree.commit('initial')
 
256
        return tree
 
257
 
 
258
    def test_just_directory(self):
 
259
        tree = self.make_simple_tree()
 
260
        self.assertEqual([('directory', b'root-id'),
 
261
                          ('directory', b'a-id'),
 
262
                          ('directory', b'b-id'),
 
263
                          ('file', b'c-id')],
 
264
                         [(ie.kind, ie.file_id)
 
265
                          for path, ie in tree.iter_entries_by_dir()])
 
266
        self.make_branch_and_tree('tree/a/b')
 
267
        self.assertEqual([('tree-reference', b'b-id')],
 
268
                         [(ie.kind, ie.file_id)
 
269
                          for path, ie in tree.iter_entries_by_dir(
 
270
                              specific_files=['a/b'])])
 
271
 
 
272
    def test_direct_subtree(self):
 
273
        tree = self.make_simple_tree()
 
274
        self.make_branch_and_tree('tree/a/b')
 
275
        self.assertEqual([('directory', b'root-id'),
 
276
                          ('directory', b'a-id'),
 
277
                          ('tree-reference', b'b-id')],
 
278
                         [(ie.kind, ie.file_id)
 
279
                          for path, ie in tree.iter_entries_by_dir()])
 
280
 
 
281
    def test_indirect_subtree(self):
 
282
        tree = self.make_simple_tree()
 
283
        self.make_branch_and_tree('tree/a')
 
284
        self.assertEqual([('directory', b'root-id'),
 
285
                          ('tree-reference', b'a-id')],
 
286
                         [(ie.kind, ie.file_id)
 
287
                          for path, ie in tree.iter_entries_by_dir()])
 
288
 
 
289
 
 
290
class TestWorkingTreeFormatRegistry(TestCase):
 
291
 
 
292
    def setUp(self):
 
293
        super(TestWorkingTreeFormatRegistry, self).setUp()
 
294
        self.registry = workingtree.WorkingTreeFormatRegistry()
 
295
 
161
296
    def test_register_unregister_format(self):
162
297
        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)
 
298
        self.registry.register(format)
 
299
        self.assertEqual(format, self.registry.get(b"Sample tree format."))
 
300
        self.registry.remove(format)
 
301
        self.assertRaises(KeyError, self.registry.get, b"Sample tree format.")
 
302
 
 
303
    def test_get_all(self):
 
304
        format = SampleTreeFormat()
 
305
        self.assertEqual([], self.registry._get_all())
 
306
        self.registry.register(format)
 
307
        self.assertEqual([format], self.registry._get_all())
 
308
 
 
309
    def test_register_extra(self):
 
310
        format = SampleExtraTreeFormat()
 
311
        self.assertEqual([], self.registry._get_all())
 
312
        self.registry.register_extra(format)
 
313
        self.assertEqual([format], self.registry._get_all())
 
314
 
 
315
    def test_register_extra_lazy(self):
 
316
        self.assertEqual([], self.registry._get_all())
 
317
        self.registry.register_extra_lazy("breezy.tests.test_workingtree",
 
318
                                          "SampleExtraTreeFormat")
 
319
        formats = self.registry._get_all()
 
320
        self.assertEqual(1, len(formats))
 
321
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
177
322
 
178
323
 
179
324
class TestWorkingTreeFormat3(TestCaseWithTransport):
183
328
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
184
329
        control.create_repository()
185
330
        control.create_branch()
186
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
331
        workingtree_3.WorkingTreeFormat3().initialize(control)
187
332
        # we want:
188
333
        # format 'Bazaar-NG Working Tree format 3'
189
334
        # inventory = blank inventory
191
336
        # stat-cache = ??
192
337
        # no inventory.basis yet
193
338
        t = control.get_workingtree_transport(None)
194
 
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
 
339
        self.assertEqualDiff(b'Bazaar-NG Working Tree format 3',
195
340
                             t.get('format').read())
196
341
        self.assertEqualDiff(t.get('inventory').read(),
197
 
                              '<inventory format="5">\n'
198
 
                              '</inventory>\n',
 
342
                             b'<inventory format="5">\n'
 
343
                             b'</inventory>\n',
199
344
                             )
200
 
        self.assertEqualDiff('### bzr hashcache v5\n',
 
345
        self.assertEqualDiff(b'### bzr hashcache v5\n',
201
346
                             t.get('stat-cache').read())
202
347
        self.assertFalse(t.has('inventory.basis'))
203
348
        # no last-revision file means 'None' or 'NULLREVISION'
214
359
        t = self.get_transport()
215
360
        url = self.get_url()
216
361
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
217
 
        repo = dir.create_repository()
218
 
        branch = dir.create_branch()
 
362
        dir.create_repository()
 
363
        dir.create_branch()
219
364
        try:
220
 
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
 
365
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
221
366
        except errors.NotLocalUrl:
222
367
            raise TestSkipped('Not a local URL')
223
368
        self.assertIsDirectory('.bzr', t)
224
369
        self.assertIsDirectory('.bzr/checkout', t)
225
370
        self.assertIsDirectory('.bzr/checkout/lock', t)
226
371
        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)
 
372
        self.assertEqual(our_lock.peek(), None)
 
373
        with tree.lock_write():
 
374
            self.assertTrue(our_lock.peek())
 
375
        self.assertEqual(our_lock.peek(), None)
232
376
 
233
377
    def test_missing_pending_merges(self):
234
378
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
235
379
        control.create_repository()
236
380
        control.create_branch()
237
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
381
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
238
382
        tree._transport.delete("pending-merges")
239
383
        self.assertEqual([], tree.get_parent_ids())
240
384
 
241
385
 
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
386
class TestRevert(TestCaseWithTransport):
319
387
 
320
388
    def test_revert_conflicts_recursive(self):
321
389
        this_tree = self.make_branch_and_tree('this-tree')
322
390
        self.build_tree_contents([('this-tree/foo/',),
323
 
                                  ('this-tree/foo/bar', 'bar')])
 
391
                                  ('this-tree/foo/bar', b'bar')])
324
392
        this_tree.add(['foo', 'foo/bar'])
325
393
        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')])
 
394
        other_tree = this_tree.controldir.sprout(
 
395
            'other-tree').open_workingtree()
 
396
        self.build_tree_contents([('other-tree/foo/bar', b'baz')])
328
397
        other_tree.commit('changed bar')
329
 
        self.build_tree_contents([('this-tree/foo/bar', 'qux')])
 
398
        self.build_tree_contents([('this-tree/foo/bar', b'qux')])
330
399
        this_tree.commit('changed qux')
331
400
        this_tree.merge_from_branch(other_tree.branch)
332
401
        self.assertEqual(1, len(this_tree.conflicts()))
338
407
 
339
408
    def test_auto_resolve(self):
340
409
        base = self.make_branch_and_tree('base')
341
 
        self.build_tree_contents([('base/hello', 'Hello')])
342
 
        base.add('hello', 'hello_id')
 
410
        self.build_tree_contents([('base/hello', b'Hello')])
 
411
        base.add('hello', b'hello_id')
343
412
        base.commit('Hello')
344
 
        other = base.bzrdir.sprout('other').open_workingtree()
345
 
        self.build_tree_contents([('other/hello', 'hELLO')])
 
413
        other = base.controldir.sprout('other').open_workingtree()
 
414
        self.build_tree_contents([('other/hello', b'hELLO')])
346
415
        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')])
 
416
        this = base.controldir.sprout('this').open_workingtree()
 
417
        self.assertPathExists('this/hello')
 
418
        self.build_tree_contents([('this/hello', b'Hello World')])
350
419
        this.commit('Add World')
351
420
        this.merge_from_branch(other.branch)
352
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
353
 
                         this.conflicts())
354
 
        this.auto_resolve()
355
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
356
 
                         this.conflicts())
357
 
        self.build_tree_contents([('this/hello', '<<<<<<<')])
358
 
        this.auto_resolve()
359
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
360
 
                         this.conflicts())
361
 
        self.build_tree_contents([('this/hello', '=======')])
362
 
        this.auto_resolve()
363
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
364
 
                         this.conflicts())
365
 
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
 
421
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
422
                         this.conflicts())
 
423
        this.auto_resolve()
 
424
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
425
                         this.conflicts())
 
426
        self.build_tree_contents([('this/hello', b'<<<<<<<')])
 
427
        this.auto_resolve()
 
428
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
429
                         this.conflicts())
 
430
        self.build_tree_contents([('this/hello', b'=======')])
 
431
        this.auto_resolve()
 
432
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
 
433
                         this.conflicts())
 
434
        self.build_tree_contents([('this/hello', b'\n>>>>>>>')])
366
435
        remaining, resolved = this.auto_resolve()
367
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
436
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
368
437
                         this.conflicts())
369
438
        self.assertEqual([], resolved)
370
 
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
 
439
        self.build_tree_contents([('this/hello', b'hELLO wORLD')])
371
440
        remaining, resolved = this.auto_resolve()
372
441
        self.assertEqual([], this.conflicts())
373
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
442
        self.assertEqual([conflicts.TextConflict('hello', b'hello_id')],
374
443
                         resolved)
375
 
        self.failIfExists('this/hello.BASE')
 
444
        self.assertPathDoesNotExist('this/hello.BASE')
376
445
 
377
446
    def test_auto_resolve_dir(self):
378
447
        tree = self.make_branch_and_tree('tree')
379
448
        self.build_tree(['tree/hello/'])
380
 
        tree.add('hello', 'hello-id')
381
 
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
 
449
        tree.add('hello', b'hello-id')
 
450
        file_conflict = conflicts.TextConflict('file', b'hello-id')
382
451
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
383
452
        tree.auto_resolve()
384
453
 
393
462
        self.make_branch('qux')
394
463
        trees = workingtree.WorkingTree.find_trees('.')
395
464
        self.assertEqual(2, len(list(trees)))
 
465
 
 
466
 
 
467
class TestStoredUncommitted(TestCaseWithTransport):
 
468
 
 
469
    def store_uncommitted(self):
 
470
        tree = self.make_branch_and_tree('tree')
 
471
        tree.commit('get root in there')
 
472
        self.build_tree_contents([('tree/file', b'content')])
 
473
        tree.add('file', b'file-id')
 
474
        tree.store_uncommitted()
 
475
        return tree
 
476
 
 
477
    def test_store_uncommitted(self):
 
478
        self.store_uncommitted()
 
479
        self.assertPathDoesNotExist('tree/file')
 
480
 
 
481
    def test_store_uncommitted_no_change(self):
 
482
        tree = self.make_branch_and_tree('tree')
 
483
        tree.commit('get root in there')
 
484
        tree.store_uncommitted()
 
485
        self.assertIs(None, tree.branch.get_unshelver(tree))
 
486
 
 
487
    def test_restore_uncommitted(self):
 
488
        with write_locked(self.store_uncommitted()) as tree:
 
489
            tree.restore_uncommitted()
 
490
            self.assertPathExists('tree/file')
 
491
            self.assertIs(None, tree.branch.get_unshelver(tree))
 
492
 
 
493
    def test_restore_uncommitted_none(self):
 
494
        tree = self.make_branch_and_tree('tree')
 
495
        tree.restore_uncommitted()