/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_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-19 13:16:11 UTC
  • mto: (6968.4.3 git-archive)
  • mto: This revision was merged to the branch mainline in revision 6972.
  • Revision ID: jelmer@jelmer.uk-20180519131611-l9h9ud41j7qg1m03
Move tar/zip to breezy.archive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
import errno
17
18
import os
18
 
from StringIO import StringIO
19
19
import sys
20
20
import time
21
21
 
22
 
from bzrlib import (
 
22
from .. import (
23
23
    bencode,
24
24
    errors,
25
25
    filters,
28
28
    revision as _mod_revision,
29
29
    rules,
30
30
    tests,
 
31
    trace,
 
32
    transform,
31
33
    urlutils,
32
34
    )
33
 
from bzrlib.bzrdir import BzrDir
34
 
from bzrlib.conflicts import (
 
35
from ..conflicts import (
35
36
    DeletingParent,
36
37
    DuplicateEntry,
37
38
    DuplicateID,
40
41
    ParentLoop,
41
42
    UnversionedParent,
42
43
)
43
 
from bzrlib.diff import show_diff_trees
44
 
from bzrlib.errors import (
 
44
from ..controldir import ControlDir
 
45
from ..diff import show_diff_trees
 
46
from ..errors import (
45
47
    DuplicateKey,
46
48
    ExistingLimbo,
47
49
    ExistingPendingDeletion,
49
51
    ImmortalPendingDeletion,
50
52
    LockError,
51
53
    MalformedTransform,
52
 
    NoSuchFile,
53
54
    ReusingTransform,
54
55
)
55
 
from bzrlib.osutils import (
 
56
from ..osutils import (
56
57
    file_kind,
57
58
    pathjoin,
58
59
)
59
 
from bzrlib.merge import Merge3Merger, Merger
60
 
from bzrlib.tests import (
 
60
from ..merge import Merge3Merger, Merger
 
61
from ..mutabletree import MutableTree
 
62
from ..sixish import (
 
63
    BytesIO,
 
64
    )
 
65
from . import (
 
66
    features,
 
67
    TestCaseInTempDir,
 
68
    TestSkipped,
 
69
    )
 
70
from .features import (
61
71
    HardlinkFeature,
62
72
    SymlinkFeature,
63
 
    TestCase,
64
 
    TestCaseInTempDir,
65
 
    TestSkipped,
66
 
)
67
 
from bzrlib.transform import (
 
73
    )
 
74
from ..transform import (
68
75
    build_tree,
69
76
    create_from_tree,
70
77
    cook_conflicts,
71
78
    _FileMover,
72
79
    FinalPaths,
73
 
    get_backup_name,
74
80
    resolve_conflicts,
75
81
    resolve_checkout,
76
82
    ROOT_PARENT,
83
89
 
84
90
    def setUp(self):
85
91
        super(TestTreeTransform, self).setUp()
86
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
92
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
87
93
        os.chdir('..')
88
94
 
89
95
    def get_transform(self):
91
97
        self.addCleanup(transform.finalize)
92
98
        return transform, transform.root
93
99
 
 
100
    def get_transform_for_sha1_test(self):
 
101
        trans, root = self.get_transform()
 
102
        self.wt.lock_tree_write()
 
103
        self.addCleanup(self.wt.unlock)
 
104
        contents = ['just some content\n']
 
105
        sha1 = osutils.sha_strings(contents)
 
106
        # Roll back the clock
 
107
        trans._creation_mtime = time.time() - 20.0
 
108
        return trans, root, contents, sha1
 
109
 
94
110
    def test_existing_limbo(self):
95
111
        transform, root = self.get_transform()
96
112
        limbo_name = transform._limbodir
123
139
        imaginary_id = transform.trans_id_tree_path('imaginary')
124
140
        imaginary_id2 = transform.trans_id_tree_path('imaginary/')
125
141
        self.assertEqual(imaginary_id, imaginary_id2)
126
 
        self.assertEqual(transform.get_tree_parent(imaginary_id), root)
127
 
        self.assertEqual(transform.final_kind(root), 'directory')
128
 
        self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
 
142
        self.assertEqual(root, transform.get_tree_parent(imaginary_id))
 
143
        self.assertEqual('directory', transform.final_kind(root))
 
144
        self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
129
145
        trans_id = transform.create_path('name', root)
130
146
        self.assertIs(transform.final_file_id(trans_id), None)
131
 
        self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
 
147
        self.assertIs(None, transform.final_kind(trans_id))
132
148
        transform.create_file('contents', trans_id)
133
149
        transform.set_executability(True, trans_id)
134
150
        transform.version_file('my_pretties', trans_id)
146
162
        transform.set_executability(False, trans_id2)
147
163
        transform.version_file('my_pretties2', trans_id2)
148
164
        modified_paths = transform.apply().modified_paths
149
 
        self.assertEqual('contents', self.wt.get_file_byname('name').read())
 
165
        self.assertEqual('contents', self.wt.get_file('name').read())
150
166
        self.assertEqual(self.wt.path2id('name'), 'my_pretties')
151
 
        self.assertIs(self.wt.is_executable('my_pretties'), True)
152
 
        self.assertIs(self.wt.is_executable('my_pretties2'), False)
 
167
        self.assertIs(self.wt.is_executable('name'), True)
 
168
        self.assertIs(self.wt.is_executable('name2'), False)
153
169
        self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
154
170
        self.assertEqual(len(modified_paths), 3)
155
 
        tree_mod_paths = [self.wt.id2abspath(f) for f in
 
171
        tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
156
172
                          ('ozzie', 'my_pretties', 'my_pretties2')]
157
173
        self.assertSubset(tree_mod_paths, modified_paths)
158
174
        # is it safe to finalize repeatedly?
159
175
        transform.finalize()
160
176
        transform.finalize()
161
177
 
 
178
    def test_apply_informs_tree_of_observed_sha1(self):
 
179
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
180
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
181
                                  sha1=sha1)
 
182
        calls = []
 
183
        orig = self.wt._observed_sha1
 
184
        def _observed_sha1(*args):
 
185
            calls.append(args)
 
186
            orig(*args)
 
187
        self.wt._observed_sha1 = _observed_sha1
 
188
        trans.apply()
 
189
        self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
 
190
                         calls)
 
191
 
 
192
    def test_create_file_caches_sha1(self):
 
193
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
194
        trans_id = trans.create_path('file1', root)
 
195
        trans.create_file(contents, trans_id, sha1=sha1)
 
196
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
197
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
198
        self.assertEqual(o_sha1, sha1)
 
199
        self.assertEqualStat(o_st_val, st_val)
 
200
 
 
201
    def test__apply_insertions_updates_sha1(self):
 
202
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
203
        trans_id = trans.create_path('file1', root)
 
204
        trans.create_file(contents, trans_id, sha1=sha1)
 
205
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
206
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
207
        self.assertEqual(o_sha1, sha1)
 
208
        self.assertEqualStat(o_st_val, st_val)
 
209
        creation_mtime = trans._creation_mtime + 10.0
 
210
        # We fake a time difference from when the file was created until now it
 
211
        # is being renamed by using os.utime. Note that the change we actually
 
212
        # want to see is the real ctime change from 'os.rename()', but as long
 
213
        # as we observe a new stat value, we should be fine.
 
214
        os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
 
215
        trans.apply()
 
216
        new_st_val = osutils.lstat(self.wt.abspath('file1'))
 
217
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
218
        self.assertEqual(o_sha1, sha1)
 
219
        self.assertEqualStat(o_st_val, new_st_val)
 
220
        self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
 
221
 
 
222
    def test_new_file_caches_sha1(self):
 
223
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
224
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
225
                                  sha1=sha1)
 
226
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
227
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
228
        self.assertEqual(o_sha1, sha1)
 
229
        self.assertEqualStat(o_st_val, st_val)
 
230
 
 
231
    def test_cancel_creation_removes_observed_sha1(self):
 
232
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
233
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
234
                                  sha1=sha1)
 
235
        self.assertTrue(trans_id in trans._observed_sha1s)
 
236
        trans.cancel_creation(trans_id)
 
237
        self.assertFalse(trans_id in trans._observed_sha1s)
 
238
 
162
239
    def test_create_files_same_timestamp(self):
163
240
        transform, root = self.get_transform()
164
241
        self.wt.lock_tree_write()
172
249
        transform.create_file('content-two',
173
250
                              transform.create_path('two', root))
174
251
        transform.apply()
175
 
        fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)
 
252
        fo, st1 = self.wt.get_file_with_stat('one', filtered=False)
176
253
        fo.close()
177
 
        fo, st2 = self.wt.get_file_with_stat(None, path='two', filtered=False)
 
254
        fo, st2 = self.wt.get_file_with_stat('two', filtered=False)
178
255
        fo.close()
179
256
        # We only guarantee 2s resolution
180
257
        self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
184
261
 
185
262
    def test_change_root_id(self):
186
263
        transform, root = self.get_transform()
187
 
        self.assertNotEqual('new-root-id', self.wt.get_root_id())
188
 
        transform.new_directory('', ROOT_PARENT, 'new-root-id')
 
264
        self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
 
265
        transform.new_directory('', ROOT_PARENT, b'new-root-id')
189
266
        transform.delete_contents(root)
190
267
        transform.unversion_file(root)
191
268
        transform.fixup_new_roots()
192
269
        transform.apply()
193
 
        self.assertEqual('new-root-id', self.wt.get_root_id())
 
270
        self.assertEqual(b'new-root-id', self.wt.get_root_id())
194
271
 
195
272
    def test_change_root_id_add_files(self):
196
273
        transform, root = self.get_transform()
197
 
        self.assertNotEqual('new-root-id', self.wt.get_root_id())
198
 
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
 
274
        self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
 
275
        new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
199
276
        transform.new_file('file', new_trans_id, ['new-contents\n'],
200
277
                           'new-file-id')
201
278
        transform.delete_contents(root)
202
279
        transform.unversion_file(root)
203
280
        transform.fixup_new_roots()
204
281
        transform.apply()
205
 
        self.assertEqual('new-root-id', self.wt.get_root_id())
206
 
        self.assertEqual('new-file-id', self.wt.path2id('file'))
 
282
        self.assertEqual(b'new-root-id', self.wt.get_root_id())
 
283
        self.assertEqual(b'new-file-id', self.wt.path2id('file'))
207
284
        self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
208
285
 
209
286
    def test_add_two_roots(self):
210
287
        transform, root = self.get_transform()
211
 
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
212
 
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
213
 
        self.assertRaises(ValueError, transform.fixup_new_roots)
 
288
        new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
 
289
        new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
 
290
        self.assertRaises(ValueError, transform.fixup_new_roots)
 
291
 
 
292
    def test_retain_existing_root(self):
 
293
        tt, root = self.get_transform()
 
294
        with tt:
 
295
            tt.new_directory('', ROOT_PARENT, b'new-root-id')
 
296
            tt.fixup_new_roots()
 
297
            self.assertNotEqual(b'new-root-id', tt.final_file_id(tt.root))
 
298
 
 
299
    def test_retain_existing_root_added_file(self):
 
300
        tt, root = self.get_transform()
 
301
        new_trans_id = tt.new_directory('', ROOT_PARENT, b'new-root-id')
 
302
        child = tt.new_directory('child', new_trans_id, b'child-id')
 
303
        tt.fixup_new_roots()
 
304
        self.assertEqual(tt.root, tt.final_parent(child))
 
305
 
 
306
    def test_add_unversioned_root(self):
 
307
        transform, root = self.get_transform()
 
308
        new_trans_id = transform.new_directory('', ROOT_PARENT, None)
 
309
        transform.delete_contents(transform.root)
 
310
        transform.fixup_new_roots()
 
311
        self.assertNotIn(transform.root, transform._new_id)
 
312
 
 
313
    def test_remove_root_fixup(self):
 
314
        transform, root = self.get_transform()
 
315
        old_root_id = self.wt.get_root_id()
 
316
        self.assertNotEqual(b'new-root-id', old_root_id)
 
317
        transform.delete_contents(root)
 
318
        transform.unversion_file(root)
 
319
        transform.fixup_new_roots()
 
320
        transform.apply()
 
321
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
322
 
 
323
        transform, root = self.get_transform()
 
324
        new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
 
325
        new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
 
326
        self.assertRaises(ValueError, transform.fixup_new_roots)
 
327
 
 
328
    def test_fixup_new_roots_permits_empty_tree(self):
 
329
        transform, root = self.get_transform()
 
330
        transform.delete_contents(root)
 
331
        transform.unversion_file(root)
 
332
        transform.fixup_new_roots()
 
333
        self.assertIs(None, transform.final_kind(root))
 
334
        self.assertIs(None, transform.final_file_id(root))
 
335
 
 
336
    def test_apply_retains_root_directory(self):
 
337
        # Do not attempt to delete the physical root directory, because that
 
338
        # is impossible.
 
339
        transform, root = self.get_transform()
 
340
        with transform:
 
341
            transform.delete_contents(root)
 
342
            e = self.assertRaises(AssertionError, self.assertRaises,
 
343
                                  errors.TransformRenameFailed,
 
344
                                  transform.apply)
 
345
        self.assertContainsRe('TransformRenameFailed not raised', str(e))
 
346
 
 
347
    def test_apply_retains_file_id(self):
 
348
        transform, root = self.get_transform()
 
349
        old_root_id = transform.tree_file_id(root)
 
350
        transform.unversion_file(root)
 
351
        transform.apply()
 
352
        self.assertEqual(old_root_id, self.wt.get_root_id())
214
353
 
215
354
    def test_hardlink(self):
216
355
        self.requireFeature(HardlinkFeature)
222
361
        trans_id = target_transform.create_path('file1', target_transform.root)
223
362
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
224
363
        target_transform.apply()
225
 
        self.failUnlessExists('target/file1')
 
364
        self.assertPathExists('target/file1')
226
365
        source_stat = os.stat(self.wt.abspath('file1'))
227
366
        target_stat = os.stat('target/file1')
228
367
        self.assertEqual(source_stat, target_stat)
243
382
        self.assertRaises(ReusingTransform, transform.find_conflicts)
244
383
        self.assertEqual('contents', file(self.wt.abspath('name')).read())
245
384
        self.assertEqual(self.wt.path2id('name'), 'my_pretties')
246
 
        self.assertIs(self.wt.is_executable('my_pretties'), True)
 
385
        self.assertIs(self.wt.is_executable('name'), True)
247
386
        self.assertEqual(self.wt.path2id('oz'), 'oz-id')
248
387
        self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
249
388
        self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
250
389
 
251
390
        self.assertEqual('toto-contents',
252
 
                         self.wt.get_file_byname('oz/dorothy/toto').read())
253
 
        self.assertIs(self.wt.is_executable('toto-id'), False)
 
391
                         self.wt.get_file('oz/dorothy/toto').read())
 
392
        self.assertIs(self.wt.is_executable('oz/dorothy/toto'), False)
254
393
 
255
394
    def test_tree_reference(self):
256
395
        transform, root = self.get_transform()
261
400
        tree.lock_read()
262
401
        self.addCleanup(tree.unlock)
263
402
        self.assertEqual('subtree-revision',
264
 
                         tree.inventory['subtree-id'].reference_revision)
 
403
                         tree.root_inventory.get_entry('subtree-id').reference_revision)
265
404
 
266
405
    def test_conflicts(self):
267
406
        transform, root = self.get_transform()
314
453
        self.assertEqual(self.wt.path2id('name'), 'my_pretties')
315
454
        self.assertEqual('contents', file(self.wt.abspath('name')).read())
316
455
        transform2, root = self.get_transform()
317
 
        oz_id = transform2.trans_id_tree_file_id('oz-id')
 
456
        oz_id = transform2.trans_id_tree_path('oz')
318
457
        newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
319
458
        result = transform2.find_conflicts()
320
459
        fp = FinalPaths(transform2)
321
 
        self.assert_('oz/tip' in transform2._tree_path_ids)
 
460
        self.assertTrue('oz/tip' in transform2._tree_path_ids)
322
461
        self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
323
462
        self.assertEqual(len(result), 2)
324
463
        self.assertEqual((result[0][0], result[0][1]),
328
467
        transform2.finalize()
329
468
        transform3 = TreeTransform(self.wt)
330
469
        self.addCleanup(transform3.finalize)
331
 
        oz_id = transform3.trans_id_tree_file_id('oz-id')
 
470
        oz_id = transform3.trans_id_tree_path('oz')
332
471
        transform3.delete_contents(oz_id)
333
472
        self.assertEqual(transform3.find_conflicts(),
334
473
                         [('missing parent', oz_id)])
335
474
        root_id = transform3.root
336
 
        tip_id = transform3.trans_id_tree_file_id('tip-id')
 
475
        tip_id = transform3.trans_id_tree_path('oz/tip')
337
476
        transform3.adjust_path('tip', root_id, tip_id)
338
477
        transform3.apply()
339
478
 
394
533
        transform.new_file('FiLe', transform.root, 'content')
395
534
        resolve_conflicts(transform)
396
535
        transform.apply()
397
 
        self.failUnlessExists('tree/file')
398
 
        self.failUnlessExists('tree/FiLe.moved')
 
536
        self.assertPathExists('tree/file')
 
537
        self.assertPathExists('tree/FiLe.moved')
399
538
 
400
539
    def test_resolve_checkout_case_conflict(self):
401
540
        tree = self.make_branch_and_tree('tree')
410
549
        resolve_conflicts(transform,
411
550
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
412
551
        transform.apply()
413
 
        self.failUnlessExists('tree/file')
414
 
        self.failUnlessExists('tree/FiLe.moved')
 
552
        self.assertPathExists('tree/file')
 
553
        self.assertPathExists('tree/FiLe.moved')
415
554
 
416
555
    def test_apply_case_conflict(self):
417
556
        """Ensure that a transform with case conflicts can always be applied"""
425
564
        transform.new_file('dirFiLe', dir, 'content')
426
565
        resolve_conflicts(transform)
427
566
        transform.apply()
428
 
        self.failUnlessExists('tree/file')
 
567
        self.assertPathExists('tree/file')
429
568
        if not os.path.exists('tree/FiLe.moved'):
430
 
            self.failUnlessExists('tree/FiLe')
431
 
        self.failUnlessExists('tree/dir/dirfile')
 
569
            self.assertPathExists('tree/FiLe')
 
570
        self.assertPathExists('tree/dir/dirfile')
432
571
        if not os.path.exists('tree/dir/dirFiLe.moved'):
433
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
572
            self.assertPathExists('tree/dir/dirFiLe')
434
573
 
435
574
    def test_case_insensitive_limbo(self):
436
575
        tree = self.make_branch_and_tree('tree')
462
601
        start.new_directory('a', root, 'a')
463
602
        start.apply()
464
603
        transform, root = self.get_transform()
465
 
        transform.delete_versioned(transform.trans_id_tree_file_id('a'))
 
604
        transform.delete_versioned(transform.trans_id_tree_path('a'))
466
605
        transform.new_directory('a', root, 'a')
467
606
        transform.apply()
468
607
 
469
608
    def test_unversioning(self):
470
609
        create_tree, root = self.get_transform()
471
 
        parent_id = create_tree.new_directory('parent', root, 'parent-id')
472
 
        create_tree.new_file('child', parent_id, 'child', 'child-id')
 
610
        parent_id = create_tree.new_directory('parent', root, b'parent-id')
 
611
        create_tree.new_file('child', parent_id, 'child', b'child-id')
473
612
        create_tree.apply()
474
613
        unversion = TreeTransform(self.wt)
475
614
        self.addCleanup(unversion.finalize)
477
616
        unversion.unversion_file(parent)
478
617
        self.assertEqual(unversion.find_conflicts(),
479
618
                         [('unversioned parent', parent_id)])
480
 
        file_id = unversion.trans_id_tree_file_id('child-id')
 
619
        file_id = unversion.trans_id_tree_path('parent/child')
481
620
        unversion.unversion_file(file_id)
482
621
        unversion.apply()
483
622
 
493
632
        create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
494
633
        create_tree.apply()
495
634
 
496
 
        mangle_tree,root = self.get_transform()
 
635
        mangle_tree, root = self.get_transform()
497
636
        root = mangle_tree.root
498
637
        #swap names
499
 
        name1 = mangle_tree.trans_id_tree_file_id('name1')
500
 
        name2 = mangle_tree.trans_id_tree_file_id('name2')
 
638
        name1 = mangle_tree.trans_id_tree_path('name1')
 
639
        name2 = mangle_tree.trans_id_tree_path('name2')
501
640
        mangle_tree.adjust_path('name2', root, name1)
502
641
        mangle_tree.adjust_path('name1', root, name2)
503
642
 
504
643
        #tests for deleting parent directories
505
 
        ddir = mangle_tree.trans_id_tree_file_id('ddir')
 
644
        ddir = mangle_tree.trans_id_tree_path('dying_directory')
506
645
        mangle_tree.delete_contents(ddir)
507
 
        dfile = mangle_tree.trans_id_tree_file_id('dfile')
 
646
        dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
508
647
        mangle_tree.delete_versioned(dfile)
509
648
        mangle_tree.unversion_file(dfile)
510
 
        mfile = mangle_tree.trans_id_tree_file_id('mfile')
 
649
        mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
511
650
        mangle_tree.adjust_path('mfile', root, mfile)
512
651
 
513
652
        #tests for adding parent directories
514
653
        newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
515
 
        mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
 
654
        mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
516
655
        mangle_tree.adjust_path('mfile2', newdir, mfile2)
517
656
        mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
518
657
        self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
521
660
        mangle_tree.apply()
522
661
        self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
523
662
        self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
524
 
        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
 
663
        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
525
664
        self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
526
665
        self.assertEqual(file(mfile2_path).read(), 'later2')
527
 
        self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
528
 
        self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
529
 
        newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
 
666
        self.assertEqual(self.wt.id2path(b'mfile2'), 'new_directory/mfile2')
 
667
        self.assertEqual(self.wt.path2id('new_directory/mfile2'), b'mfile2')
 
668
        newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
530
669
        self.assertEqual(file(newfile_path).read(), 'hello3')
531
 
        self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
 
670
        self.assertEqual(self.wt.path2id('dying_directory'), b'ddir')
532
671
        self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
533
 
        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
 
672
        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
534
673
 
535
674
    def test_both_rename(self):
536
 
        create_tree,root = self.get_transform()
 
675
        create_tree, root = self.get_transform()
537
676
        newdir = create_tree.new_directory('selftest', root, 'selftest-id')
538
677
        create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
539
678
        create_tree.apply()
540
 
        mangle_tree,root = self.get_transform()
541
 
        selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
542
 
        blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
 
679
        mangle_tree, root = self.get_transform()
 
680
        selftest = mangle_tree.trans_id_tree_path('selftest')
 
681
        blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
543
682
        mangle_tree.adjust_path('test', root, selftest)
544
683
        mangle_tree.adjust_path('test_too_much', root, selftest)
545
684
        mangle_tree.set_executability(True, blackbox)
546
685
        mangle_tree.apply()
547
686
 
548
687
    def test_both_rename2(self):
549
 
        create_tree,root = self.get_transform()
550
 
        bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
551
 
        tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
 
688
        create_tree, root = self.get_transform()
 
689
        breezy = create_tree.new_directory('breezy', root, 'breezy-id')
 
690
        tests = create_tree.new_directory('tests', breezy, 'tests-id')
552
691
        blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
553
692
        create_tree.new_file('test_too_much.py', blackbox, 'hello1',
554
693
                             'test_too_much-id')
555
694
        create_tree.apply()
556
 
        mangle_tree,root = self.get_transform()
557
 
        bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
558
 
        tests = mangle_tree.trans_id_tree_file_id('tests-id')
559
 
        test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
560
 
        mangle_tree.adjust_path('selftest', bzrlib, tests)
 
695
        mangle_tree, root = self.get_transform()
 
696
        breezy = mangle_tree.trans_id_tree_path('breezy')
 
697
        tests = mangle_tree.trans_id_tree_path('breezy/tests')
 
698
        test_too_much = mangle_tree.trans_id_tree_path('breezy/tests/blackbox/test_too_much.py')
 
699
        mangle_tree.adjust_path('selftest', breezy, tests)
561
700
        mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
562
701
        mangle_tree.set_executability(True, test_too_much)
563
702
        mangle_tree.apply()
564
703
 
565
704
    def test_both_rename3(self):
566
 
        create_tree,root = self.get_transform()
 
705
        create_tree, root = self.get_transform()
567
706
        tests = create_tree.new_directory('tests', root, 'tests-id')
568
707
        create_tree.new_file('test_too_much.py', tests, 'hello1',
569
708
                             'test_too_much-id')
570
709
        create_tree.apply()
571
 
        mangle_tree,root = self.get_transform()
572
 
        tests = mangle_tree.trans_id_tree_file_id('tests-id')
573
 
        test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
 
710
        mangle_tree, root = self.get_transform()
 
711
        tests = mangle_tree.trans_id_tree_path('tests')
 
712
        test_too_much = mangle_tree.trans_id_tree_path('tests/test_too_much.py')
574
713
        mangle_tree.adjust_path('selftest', root, tests)
575
714
        mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
576
715
        mangle_tree.set_executability(True, test_too_much)
583
722
        create_tree.new_file('name1', root, 'hello1', 'name1')
584
723
        create_tree.apply()
585
724
        delete_contents, root = self.get_transform()
586
 
        file = delete_contents.trans_id_tree_file_id('name1')
 
725
        file = delete_contents.trans_id_tree_path('name1')
587
726
        delete_contents.delete_contents(file)
588
727
        delete_contents.apply()
589
728
        move_id, root = self.get_transform()
590
 
        name1 = move_id.trans_id_tree_file_id('name1')
 
729
        name1 = move_id.trans_id_tree_path('name1')
591
730
        newdir = move_id.new_directory('dir', root, 'newdir')
592
731
        move_id.adjust_path('name2', newdir, name1)
593
732
        move_id.apply()
600
739
        create_tree.apply()
601
740
        delete_contents = TreeTransform(self.wt)
602
741
        self.addCleanup(delete_contents.finalize)
603
 
        file = delete_contents.trans_id_tree_file_id('name1')
 
742
        file = delete_contents.trans_id_tree_path('name1')
604
743
        delete_contents.delete_contents(file)
605
744
        delete_contents.apply()
606
745
        delete_contents.finalize()
608
747
        self.addCleanup(replace.finalize)
609
748
        name2 = replace.new_file('name2', root, 'hello2', 'name1')
610
749
        conflicts = replace.find_conflicts()
611
 
        name1 = replace.trans_id_tree_file_id('name1')
 
750
        name1 = replace.trans_id_tree_path('name1')
612
751
        self.assertEqual(conflicts, [('duplicate id', name1, name2)])
613
752
        resolve_conflicts(replace)
614
753
        replace.apply()
615
754
 
616
 
    def _test_symlinks(self, link_name1,link_target1,
 
755
    def _test_symlinks(self, link_name1, link_target1,
617
756
                       link_name2, link_target2):
618
757
 
619
758
        def ozpath(p): return 'oz/' + p
644
783
                            'wizard2', 'behind_curtain')
645
784
 
646
785
    def test_symlinks_unicode(self):
647
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
786
        self.requireFeature(features.UnicodeFilenameFeature)
648
787
        self._test_symlinks(u'\N{Euro Sign}wizard',
649
788
                            u'wizard-targ\N{Euro Sign}t',
650
789
                            u'\N{Euro Sign}wizard2',
663
802
        os.symlink = None
664
803
        try:
665
804
            err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
666
 
            self.assertEquals(
 
805
            self.assertEqual(
667
806
                "Unable to create symlink 'foo' on this platform",
668
807
                str(err))
669
808
        finally:
671
810
                os.symlink = os_symlink
672
811
 
673
812
    def get_conflicted(self):
674
 
        create,root = self.get_transform()
 
813
        create, root = self.get_transform()
675
814
        create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
676
815
        oz = create.new_directory('oz', root, 'oz-id')
677
816
        create.new_directory('emeraldcity', oz, 'emerald-id')
678
817
        create.apply()
679
 
        conflicts,root = self.get_transform()
 
818
        conflicts, root = self.get_transform()
680
819
        # set up duplicate entry, duplicate id
681
820
        new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
682
821
                                         'dorothy-id')
683
 
        old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
684
 
        oz = conflicts.trans_id_tree_file_id('oz-id')
 
822
        old_dorothy = conflicts.trans_id_tree_path('dorothy')
 
823
        oz = conflicts.trans_id_tree_path('oz')
685
824
        # set up DeletedParent parent conflict
686
825
        conflicts.delete_versioned(oz)
687
 
        emerald = conflicts.trans_id_tree_file_id('emerald-id')
 
826
        emerald = conflicts.trans_id_tree_path('oz/emeraldcity')
688
827
        # set up MissingParent conflict
689
828
        munchkincity = conflicts.trans_id_file_id('munchkincity-id')
690
829
        conflicts.adjust_path('munchkincity', root, munchkincity)
738
877
        raw_conflicts = resolve_conflicts(tt)
739
878
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
740
879
        tt.finalize()
741
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
880
        conflicts_s = [unicode(c) for c in cooked_conflicts]
742
881
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
743
882
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
744
883
                                         'Moved existing file to '
761
900
 
762
901
    def prepare_wrong_parent_kind(self):
763
902
        tt, root = self.get_transform()
764
 
        tt.new_file('parent', root, 'contents', 'parent-id')
 
903
        tt.new_file('parent', root, 'contents', b'parent-id')
765
904
        tt.apply()
766
905
        tt, root = self.get_transform()
767
906
        parent_id = tt.trans_id_file_id('parent-id')
768
 
        tt.new_file('child,', parent_id, 'contents2', 'file-id')
 
907
        tt.new_file('child,', parent_id, 'contents2', b'file-id')
769
908
        return tt
770
909
 
771
910
    def test_find_conflicts_wrong_parent_kind(self):
775
914
    def test_resolve_conflicts_wrong_existing_parent_kind(self):
776
915
        tt = self.prepare_wrong_parent_kind()
777
916
        raw_conflicts = resolve_conflicts(tt)
778
 
        self.assertEqual(set([('non-directory parent', 'Created directory',
779
 
                         'new-3')]), raw_conflicts)
 
917
        self.assertEqual({('non-directory parent', 'Created directory',
 
918
                         'new-3')}, raw_conflicts)
780
919
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
781
920
        self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
782
 
        'parent-id')], cooked_conflicts)
 
921
        b'parent-id')], cooked_conflicts)
783
922
        tt.apply()
784
 
        self.assertEqual(None, self.wt.path2id('parent'))
 
923
        self.assertFalse(self.wt.is_versioned('parent'))
785
924
        self.assertEqual('parent-id', self.wt.path2id('parent.new'))
786
925
 
787
926
    def test_resolve_conflicts_wrong_new_parent_kind(self):
788
927
        tt, root = self.get_transform()
789
 
        parent_id = tt.new_directory('parent', root, 'parent-id')
790
 
        tt.new_file('child,', parent_id, 'contents2', 'file-id')
 
928
        parent_id = tt.new_directory('parent', root, b'parent-id')
 
929
        tt.new_file('child,', parent_id, 'contents2', b'file-id')
791
930
        tt.apply()
792
931
        tt, root = self.get_transform()
793
932
        parent_id = tt.trans_id_file_id('parent-id')
794
933
        tt.delete_contents(parent_id)
795
934
        tt.create_file('contents', parent_id)
796
935
        raw_conflicts = resolve_conflicts(tt)
797
 
        self.assertEqual(set([('non-directory parent', 'Created directory',
798
 
                         'new-3')]), raw_conflicts)
 
936
        self.assertEqual({('non-directory parent', 'Created directory',
 
937
                         'new-3')}, raw_conflicts)
799
938
        tt.apply()
800
 
        self.assertEqual(None, self.wt.path2id('parent'))
 
939
        self.assertFalse(self.wt.is_versioned('parent'))
801
940
        self.assertEqual('parent-id', self.wt.path2id('parent.new'))
802
941
 
803
942
    def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
811
950
        tt.create_file('contents', parent_id)
812
951
        resolve_conflicts(tt)
813
952
        tt.apply()
814
 
        self.assertIs(None, self.wt.path2id('parent'))
815
 
        self.assertIs(None, self.wt.path2id('parent.new'))
 
953
        self.assertFalse(self.wt.is_versioned('parent'))
 
954
        self.assertFalse(self.wt.is_versioned('parent.new'))
 
955
 
 
956
    def test_resolve_conflicts_missing_parent(self):
 
957
        wt = self.make_branch_and_tree('.')
 
958
        tt = TreeTransform(wt)
 
959
        self.addCleanup(tt.finalize)
 
960
        parent = tt.trans_id_file_id('parent-id')
 
961
        tt.new_file('file', parent, 'Contents')
 
962
        raw_conflicts = resolve_conflicts(tt)
 
963
        # Since the directory doesn't exist it's seen as 'missing'.  So
 
964
        # 'resolve_conflicts' create a conflict asking for it to be created.
 
965
        self.assertLength(1, raw_conflicts)
 
966
        self.assertEqual(('missing parent', 'Created directory', 'new-1'),
 
967
                         raw_conflicts.pop())
 
968
        # apply fail since the missing directory doesn't exist
 
969
        self.assertRaises(errors.NoFinalPath, tt.apply)
816
970
 
817
971
    def test_moving_versioned_directories(self):
818
972
        create, root = self.get_transform()
821
975
        create.new_directory('oz', root, 'oz-id')
822
976
        create.apply()
823
977
        cyclone, root = self.get_transform()
824
 
        oz = cyclone.trans_id_tree_file_id('oz-id')
825
 
        house = cyclone.trans_id_tree_file_id('house-id')
 
978
        oz = cyclone.trans_id_tree_path('oz')
 
979
        house = cyclone.trans_id_tree_path('house')
826
980
        cyclone.adjust_path('house', oz, house)
827
981
        cyclone.apply()
828
982
 
852
1006
        rename.set_executability(True, myfile)
853
1007
        rename.apply()
854
1008
 
 
1009
    def test_rename_fails(self):
 
1010
        self.requireFeature(features.not_running_as_root)
 
1011
        # see https://bugs.launchpad.net/bzr/+bug/491763
 
1012
        create, root_id = self.get_transform()
 
1013
        first_dir = create.new_directory('first-dir', root_id, 'first-id')
 
1014
        myfile = create.new_file('myfile', root_id, 'myfile-text',
 
1015
                                 'myfile-id')
 
1016
        create.apply()
 
1017
        if os.name == "posix" and sys.platform != "cygwin":
 
1018
            # posix filesystems fail on renaming if the readonly bit is set
 
1019
            osutils.make_readonly(self.wt.abspath('first-dir'))
 
1020
        elif os.name == "nt":
 
1021
            # windows filesystems fail on renaming open files
 
1022
            self.addCleanup(file(self.wt.abspath('myfile')).close)
 
1023
        else:
 
1024
            self.skipTest("Can't force a permissions error on rename")
 
1025
        # now transform to rename
 
1026
        rename_transform, root_id = self.get_transform()
 
1027
        file_trans_id = rename_transform.trans_id_file_id('myfile-id')
 
1028
        dir_id = rename_transform.trans_id_file_id('first-id')
 
1029
        rename_transform.adjust_path('newname', dir_id, file_trans_id)
 
1030
        e = self.assertRaises(errors.TransformRenameFailed,
 
1031
            rename_transform.apply)
 
1032
        # On nix looks like: 
 
1033
        # "Failed to rename .../work/.bzr/checkout/limbo/new-1
 
1034
        # to .../first-dir/newname: [Errno 13] Permission denied"
 
1035
        # On windows looks like:
 
1036
        # "Failed to rename .../work/myfile to 
 
1037
        # .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
 
1038
        # This test isn't concerned with exactly what the error looks like,
 
1039
        # and the strerror will vary across OS and locales, but the assert
 
1040
        # that the exeception attributes are what we expect
 
1041
        self.assertEqual(e.errno, errno.EACCES)
 
1042
        if os.name == "posix":
 
1043
            self.assertEndsWith(e.to_path, "/first-dir/newname")
 
1044
        else:
 
1045
            self.assertEqual(os.path.basename(e.from_path), "myfile")
 
1046
 
855
1047
    def test_set_executability_order(self):
856
1048
        """Ensure that executability behaves the same, no matter what order.
857
1049
 
874
1066
                                 'uws')
875
1067
        self.assertRaises(KeyError, transform.set_executability, None, uws)
876
1068
        transform.apply()
877
 
        self.assertTrue(wt.is_executable('soc'))
878
 
        self.assertTrue(wt.is_executable('sac'))
 
1069
        self.assertTrue(wt.is_executable('set_on_creation'))
 
1070
        self.assertTrue(wt.is_executable('set_after_creation'))
879
1071
 
880
1072
    def test_preserve_mode(self):
881
1073
        """File mode is preserved when replacing content"""
886
1078
        transform.apply()
887
1079
        self.wt.lock_write()
888
1080
        self.addCleanup(self.wt.unlock)
889
 
        self.assertTrue(self.wt.is_executable('file1-id'))
 
1081
        self.assertTrue(self.wt.is_executable('file1'))
890
1082
        transform, root = self.get_transform()
891
 
        file1_id = transform.trans_id_tree_file_id('file1-id')
 
1083
        file1_id = transform.trans_id_tree_path('file1')
892
1084
        transform.delete_contents(file1_id)
893
1085
        transform.create_file('contents2', file1_id)
894
1086
        transform.apply()
895
 
        self.assertTrue(self.wt.is_executable('file1-id'))
 
1087
        self.assertTrue(self.wt.is_executable('file1'))
896
1088
 
897
1089
    def test__set_mode_stats_correctly(self):
898
1090
        """_set_mode stats to determine file mode."""
925
1117
        self.assertEqual([bar1_abspath], stat_paths)
926
1118
 
927
1119
    def test_iter_changes(self):
928
 
        self.wt.set_root_id('eert_toor')
 
1120
        self.wt.set_root_id(b'eert_toor')
929
1121
        transform, root = self.get_transform()
930
1122
        transform.new_file('old', root, 'blah', 'id-1', True)
931
1123
        transform.apply()
932
1124
        transform, root = self.get_transform()
933
1125
        try:
934
1126
            self.assertEqual([], list(transform.iter_changes()))
935
 
            old = transform.trans_id_tree_file_id('id-1')
 
1127
            old = transform.trans_id_tree_path('old')
936
1128
            transform.unversion_file(old)
937
1129
            self.assertEqual([('id-1', ('old', None), False, (True, False),
938
1130
                ('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
946
1138
            transform.finalize()
947
1139
 
948
1140
    def test_iter_changes_new(self):
949
 
        self.wt.set_root_id('eert_toor')
 
1141
        self.wt.set_root_id(b'eert_toor')
950
1142
        transform, root = self.get_transform()
951
1143
        transform.new_file('old', root, 'blah')
952
1144
        transform.apply()
961
1153
            transform.finalize()
962
1154
 
963
1155
    def test_iter_changes_modifications(self):
964
 
        self.wt.set_root_id('eert_toor')
 
1156
        self.wt.set_root_id(b'eert_toor')
965
1157
        transform, root = self.get_transform()
966
1158
        transform.new_file('old', root, 'blah', 'id-1')
967
1159
        transform.new_file('new', root, 'blah')
970
1162
        transform, root = self.get_transform()
971
1163
        try:
972
1164
            old = transform.trans_id_tree_path('old')
973
 
            subdir = transform.trans_id_tree_file_id('subdir-id')
 
1165
            subdir = transform.trans_id_tree_path('subdir')
974
1166
            new = transform.trans_id_tree_path('new')
975
1167
            self.assertEqual([], list(transform.iter_changes()))
976
1168
 
1033
1225
            transform.finalize()
1034
1226
 
1035
1227
    def test_iter_changes_modified_bleed(self):
1036
 
        self.wt.set_root_id('eert_toor')
 
1228
        self.wt.set_root_id(b'eert_toor')
1037
1229
        """Modified flag should not bleed from one change to another"""
1038
1230
        # unfortunately, we have no guarantee that file1 (which is modified)
1039
1231
        # will be applied before file2.  And if it's applied after file2, it
1060
1252
 
1061
1253
    def test_iter_changes_move_missing(self):
1062
1254
        """Test moving ids with no files around"""
1063
 
        self.wt.set_root_id('toor_eert')
 
1255
        self.wt.set_root_id(b'toor_eert')
1064
1256
        # Need two steps because versioning a non-existant file is a conflict.
1065
1257
        transform, root = self.get_transform()
1066
1258
        transform.new_directory('floater', root, 'floater-id')
1080
1272
 
1081
1273
    def test_iter_changes_pointless(self):
1082
1274
        """Ensure that no-ops are not treated as modifications"""
1083
 
        self.wt.set_root_id('eert_toor')
 
1275
        self.wt.set_root_id(b'eert_toor')
1084
1276
        transform, root = self.get_transform()
1085
1277
        transform.new_file('old', root, 'blah', 'id-1')
1086
1278
        transform.new_directory('subdir', root, 'subdir-id')
1088
1280
        transform, root = self.get_transform()
1089
1281
        try:
1090
1282
            old = transform.trans_id_tree_path('old')
1091
 
            subdir = transform.trans_id_tree_file_id('subdir-id')
 
1283
            subdir = transform.trans_id_tree_path('subdir')
1092
1284
            self.assertEqual([], list(transform.iter_changes()))
1093
1285
            transform.delete_contents(subdir)
1094
1286
            transform.create_directory(subdir)
1129
1321
        parent2 = transform.new_directory('parent2', root)
1130
1322
        transform.adjust_path('child1', parent2, child1)
1131
1323
        transform.apply()
1132
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1133
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1324
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1325
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1134
1326
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1135
1327
        # no rename for child1 (counting only renames during apply)
1136
 
        self.failUnlessEqual(2, transform.rename_count)
 
1328
        self.assertEqual(2, transform.rename_count)
1137
1329
 
1138
1330
    def test_cancel_parent(self):
1139
1331
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1162
1354
        parent2 = transform.new_directory('parent2', root)
1163
1355
        transform.adjust_path('child1', parent2, child1)
1164
1356
        transform.apply()
1165
 
        self.failIfExists(self.wt.abspath('parent1'))
1166
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1357
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1358
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1167
1359
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1168
 
        self.failUnlessEqual(2, transform.rename_count)
 
1360
        self.assertEqual(2, transform.rename_count)
1169
1361
 
1170
1362
    def test_adjust_and_cancel(self):
1171
1363
        """Make sure adjust_path keeps track of limbo children properly"""
1204
1396
        child = transform.new_directory('child', parent)
1205
1397
        transform.adjust_path('parent', root, parent)
1206
1398
        transform.apply()
1207
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1399
        self.assertPathExists(self.wt.abspath('parent/child'))
1208
1400
        self.assertEqual(1, transform.rename_count)
1209
1401
 
1210
1402
    def test_reuse_name(self):
1286
1478
        # The rename will fail because the target directory is not empty (but
1287
1479
        # raises FileExists anyway).
1288
1480
        err = self.assertRaises(errors.FileExists, tt_helper)
1289
 
        self.assertContainsRe(str(err),
1290
 
            "^File exists: .+/baz")
 
1481
        self.assertEndsWith(err.path, "/baz")
1291
1482
 
1292
1483
    def test_two_directories_clash(self):
1293
1484
        def tt_helper():
1305
1496
                wt.unlock()
1306
1497
                raise
1307
1498
        err = self.assertRaises(errors.FileExists, tt_helper)
1308
 
        self.assertContainsRe(str(err),
1309
 
            "^File exists: .+/foo")
 
1499
        self.assertEndsWith(err.path, "/foo")
1310
1500
 
1311
1501
    def test_two_directories_clash_finalize(self):
1312
1502
        def tt_helper():
1324
1514
                tt.finalize()
1325
1515
                raise
1326
1516
        err = self.assertRaises(errors.FileExists, tt_helper)
1327
 
        self.assertContainsRe(str(err),
1328
 
            "^File exists: .+/foo")
 
1517
        self.assertEndsWith(err.path, "/foo")
1329
1518
 
1330
1519
    def test_file_to_directory(self):
1331
1520
        wt = self.make_branch_and_tree('.')
1341
1530
        tt.create_file(["aa\n"], bar_trans_id)
1342
1531
        tt.version_file("bar-1", bar_trans_id)
1343
1532
        tt.apply()
1344
 
        self.failUnlessExists("foo/bar")
 
1533
        self.assertPathExists("foo/bar")
1345
1534
        wt.lock_read()
1346
1535
        try:
1347
 
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1348
 
                    "directory")
 
1536
            self.assertEqual(wt.kind("foo"), "directory")
1349
1537
        finally:
1350
1538
            wt.unlock()
1351
1539
        wt.commit("two")
1364
1552
        tt.delete_contents(foo_trans_id)
1365
1553
        tt.create_symlink("bar", foo_trans_id)
1366
1554
        tt.apply()
1367
 
        self.failUnlessExists("foo")
 
1555
        self.assertPathExists("foo")
1368
1556
        wt.lock_read()
1369
1557
        self.addCleanup(wt.unlock)
1370
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1371
 
                "symlink")
 
1558
        self.assertEqual(wt.kind("foo"), "symlink")
1372
1559
 
1373
1560
    def test_dir_to_file(self):
1374
1561
        wt = self.make_branch_and_tree('.')
1383
1570
        tt.delete_versioned(bar_trans_id)
1384
1571
        tt.create_file(["aa\n"], foo_trans_id)
1385
1572
        tt.apply()
1386
 
        self.failUnlessExists("foo")
 
1573
        self.assertPathExists("foo")
1387
1574
        wt.lock_read()
1388
1575
        self.addCleanup(wt.unlock)
1389
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1390
 
                "file")
 
1576
        self.assertEqual(wt.kind("foo"), "file")
1391
1577
 
1392
1578
    def test_dir_to_hardlink(self):
1393
1579
        self.requireFeature(HardlinkFeature)
1404
1590
        self.build_tree(['baz'])
1405
1591
        tt.create_hardlink("baz", foo_trans_id)
1406
1592
        tt.apply()
1407
 
        self.failUnlessExists("foo")
1408
 
        self.failUnlessExists("baz")
 
1593
        self.assertPathExists("foo")
 
1594
        self.assertPathExists("baz")
1409
1595
        wt.lock_read()
1410
1596
        self.addCleanup(wt.unlock)
1411
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1412
 
                "file")
 
1597
        self.assertEqual(wt.kind("foo"), "file")
1413
1598
 
1414
1599
    def test_no_final_path(self):
1415
1600
        transform, root = self.get_transform()
1420
1605
 
1421
1606
    def test_create_from_tree(self):
1422
1607
        tree1 = self.make_branch_and_tree('tree1')
1423
 
        self.build_tree_contents([('tree1/foo/',), ('tree1/bar', 'baz')])
1424
 
        tree1.add(['foo', 'bar'], ['foo-id', 'bar-id'])
 
1608
        self.build_tree_contents([('tree1/foo/',), ('tree1/bar', b'baz')])
 
1609
        tree1.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
1425
1610
        tree2 = self.make_branch_and_tree('tree2')
1426
1611
        tt = TreeTransform(tree2)
1427
1612
        foo_trans_id = tt.create_path('foo', tt.root)
1428
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
 
1613
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1429
1614
        bar_trans_id = tt.create_path('bar', tt.root)
1430
 
        create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
 
1615
        create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id='bbar-id')
1431
1616
        tt.apply()
1432
1617
        self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1433
1618
        self.assertFileEqual('baz', 'tree2/bar')
1436
1621
        """Provided lines are used instead of tree content."""
1437
1622
        tree1 = self.make_branch_and_tree('tree1')
1438
1623
        self.build_tree_contents([('tree1/foo', 'bar'),])
1439
 
        tree1.add('foo', 'foo-id')
 
1624
        tree1.add('foo', b'foo-id')
1440
1625
        tree2 = self.make_branch_and_tree('tree2')
1441
1626
        tt = TreeTransform(tree2)
1442
1627
        foo_trans_id = tt.create_path('foo', tt.root)
1443
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
 
1628
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id',
 
1629
                         bytes='qux')
1444
1630
        tt.apply()
1445
1631
        self.assertFileEqual('qux', 'tree2/foo')
1446
1632
 
1448
1634
        self.requireFeature(SymlinkFeature)
1449
1635
        tree1 = self.make_branch_and_tree('tree1')
1450
1636
        os.symlink('bar', 'tree1/foo')
1451
 
        tree1.add('foo', 'foo-id')
 
1637
        tree1.add('foo', b'foo-id')
1452
1638
        tt = TreeTransform(self.make_branch_and_tree('tree2'))
1453
1639
        foo_trans_id = tt.create_path('foo', tt.root)
1454
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
 
1640
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1455
1641
        tt.apply()
1456
1642
        self.assertEqual('bar', os.readlink('tree2/foo'))
1457
1643
 
1461
1647
    def __init__(self, dirname, root_id):
1462
1648
        self.name = dirname
1463
1649
        os.mkdir(dirname)
1464
 
        self.wt = BzrDir.create_standalone_workingtree(dirname)
 
1650
        self.wt = ControlDir.create_standalone_workingtree(dirname)
1465
1651
        self.wt.set_root_id(root_id)
1466
1652
        self.b = self.wt.branch
1467
1653
        self.tt = TreeTransform(self.wt)
1468
 
        self.root = self.tt.trans_id_tree_file_id(self.wt.get_root_id())
 
1654
        self.root = self.tt.trans_id_tree_path('')
1469
1655
 
1470
1656
 
1471
1657
def conflict_text(tree, merge):
1473
1659
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1474
1660
 
1475
1661
 
 
1662
class TestInventoryAltered(tests.TestCaseWithTransport):
 
1663
 
 
1664
    def test_inventory_altered_unchanged(self):
 
1665
        tree = self.make_branch_and_tree('tree')
 
1666
        self.build_tree(['tree/foo'])
 
1667
        tree.add('foo', b'foo-id')
 
1668
        with TransformPreview(tree) as tt:
 
1669
            self.assertEqual([], tt._inventory_altered())
 
1670
 
 
1671
    def test_inventory_altered_changed_parent_id(self):
 
1672
        tree = self.make_branch_and_tree('tree')
 
1673
        self.build_tree(['tree/foo'])
 
1674
        tree.add('foo', b'foo-id')
 
1675
        with TransformPreview(tree) as tt:
 
1676
            tt.unversion_file(tt.root)
 
1677
            tt.version_file(b'new-id', tt.root)
 
1678
            foo_trans_id = tt.trans_id_tree_path('foo')
 
1679
            foo_tuple = ('foo', foo_trans_id)
 
1680
            root_tuple = ('', tt.root)
 
1681
            self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
 
1682
 
 
1683
    def test_inventory_altered_noop_changed_parent_id(self):
 
1684
        tree = self.make_branch_and_tree('tree')
 
1685
        self.build_tree(['tree/foo'])
 
1686
        tree.add('foo', b'foo-id')
 
1687
        with TransformPreview(tree) as tt:
 
1688
            tt.unversion_file(tt.root)
 
1689
            tt.version_file(tree.get_root_id(), tt.root)
 
1690
            foo_trans_id = tt.trans_id_tree_path('foo')
 
1691
            self.assertEqual([], tt._inventory_altered())
 
1692
 
 
1693
 
1476
1694
class TestTransformMerge(TestCaseInTempDir):
1477
1695
 
1478
1696
    def test_text_merge(self):
1512
1730
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1513
1731
 
1514
1732
        # textual merge
1515
 
        self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
 
1733
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'a')).read(), 'y\nb\nc\nd\bz\n')
1516
1734
        # three-way text conflict
1517
 
        self.assertEqual(this.wt.get_file('b').read(),
 
1735
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'b')).read(),
1518
1736
                         conflict_text('b', 'b2'))
1519
1737
        # OTHER wins
1520
 
        self.assertEqual(this.wt.get_file('c').read(), 'c2')
 
1738
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), 'c2')
1521
1739
        # THIS wins
1522
 
        self.assertEqual(this.wt.get_file('d').read(), 'd2')
 
1740
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), 'd2')
1523
1741
        # Ambigious clean merge
1524
 
        self.assertEqual(this.wt.get_file('e').read(), 'e2')
 
1742
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), 'e2')
1525
1743
        # No change
1526
 
        self.assertEqual(this.wt.get_file('f').read(), 'f')
 
1744
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), 'f')
1527
1745
        # Correct correct results when THIS == OTHER
1528
 
        self.assertEqual(this.wt.get_file('g').read(), 'g')
 
1746
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), 'g')
1529
1747
        # Text conflict when THIS & OTHER are text and BASE is dir
1530
 
        self.assertEqual(this.wt.get_file('h').read(),
 
1748
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1531
1749
                         conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1532
 
        self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
 
1750
        self.assertEqual(this.wt.get_file('h.THIS').read(),
1533
1751
                         '1\n2\n3\n4\n')
1534
 
        self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
 
1752
        self.assertEqual(this.wt.get_file('h.OTHER').read(),
1535
1753
                         'h\ni\nj\nk\n')
1536
1754
        self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1537
 
        self.assertEqual(this.wt.get_file('i').read(),
 
1755
        self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1538
1756
                         conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1539
 
        self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
 
1757
        self.assertEqual(this.wt.get_file('i.THIS').read(),
1540
1758
                         '1\n2\n3\n4\n')
1541
 
        self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
 
1759
        self.assertEqual(this.wt.get_file('i.OTHER').read(),
1542
1760
                         'h\ni\nj\nk\n')
1543
1761
        self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1544
1762
        modified = ['a', 'b', 'c', 'h', 'i']
1545
1763
        merge_modified = this.wt.merge_modified()
1546
1764
        self.assertSubset(merge_modified, modified)
1547
1765
        self.assertEqual(len(merge_modified), len(modified))
1548
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1766
        with file(this.wt.abspath(this.wt.id2path('a')), 'wb') as f: f.write('booga')
1549
1767
        modified.pop(0)
1550
1768
        merge_modified = this.wt.merge_modified()
1551
1769
        self.assertSubset(merge_modified, modified)
1582
1800
        for suffix in ('THIS', 'BASE', 'OTHER'):
1583
1801
            self.assertEqual(os.readlink(this.wt.abspath('d.'+suffix)), suffix)
1584
1802
        self.assertIs(os.path.lexists(this.wt.abspath('d')), False)
1585
 
        self.assertEqual(this.wt.id2path('d'), 'd.OTHER')
1586
 
        self.assertEqual(this.wt.id2path('f'), 'f.THIS')
 
1803
        self.assertEqual(this.wt.id2path(b'd'), 'd.OTHER')
 
1804
        self.assertEqual(this.wt.id2path(b'f'), 'f.THIS')
1587
1805
        self.assertEqual(os.readlink(this.wt.abspath('e')), 'other-e')
1588
1806
        self.assertIs(os.path.lexists(this.wt.abspath('e.THIS')), False)
1589
1807
        self.assertIs(os.path.lexists(this.wt.abspath('e.OTHER')), False)
1623
1841
        for tg in [this, base, other]:
1624
1842
            tg.tt.apply()
1625
1843
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1626
 
        self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
1627
 
        self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
1628
 
        self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
1629
 
        self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
 
1844
        self.assertEqual(this.wt.id2path(b'c'), pathjoin('b/c1'))
 
1845
        self.assertEqual(this.wt.id2path(b'd'), pathjoin('b/d1'))
 
1846
        self.assertEqual(this.wt.id2path(b'e'), pathjoin('b/e1'))
 
1847
        self.assertEqual(this.wt.id2path(b'f'), pathjoin('b/f1'))
1630
1848
 
1631
1849
    def test_filename_merge_conflicts(self):
1632
1850
        root_id = generate_ids.gen_root_id()
1651
1869
            tg.tt.apply()
1652
1870
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1653
1871
 
1654
 
        self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
 
1872
        self.assertEqual(this.wt.id2path(b'g'), pathjoin('b/g1.OTHER'))
1655
1873
        self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1656
1874
        self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1657
 
        self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
 
1875
        self.assertEqual(this.wt.id2path(b'h'), pathjoin('b/h1.THIS'))
1658
1876
        self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1659
1877
        self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1660
 
        self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
 
1878
        self.assertEqual(this.wt.id2path(b'i'), pathjoin('b/i1.OTHER'))
1661
1879
 
1662
1880
 
1663
1881
class TestBuildTree(tests.TestCaseWithTransport):
1665
1883
    def test_build_tree_with_symlinks(self):
1666
1884
        self.requireFeature(SymlinkFeature)
1667
1885
        os.mkdir('a')
1668
 
        a = BzrDir.create_standalone_workingtree('a')
 
1886
        a = ControlDir.create_standalone_workingtree('a')
1669
1887
        os.mkdir('a/foo')
1670
 
        file('a/foo/bar', 'wb').write('contents')
 
1888
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1671
1889
        os.symlink('a/foo/bar', 'a/foo/baz')
1672
1890
        a.add(['foo', 'foo/bar', 'foo/baz'])
1673
1891
        a.commit('initial commit')
1674
 
        b = BzrDir.create_standalone_workingtree('b')
 
1892
        b = ControlDir.create_standalone_workingtree('b')
1675
1893
        basis = a.basis_tree()
1676
1894
        basis.lock_read()
1677
1895
        self.addCleanup(basis.unlock)
1682
1900
 
1683
1901
    def test_build_with_references(self):
1684
1902
        tree = self.make_branch_and_tree('source',
1685
 
            format='dirstate-with-subtree')
 
1903
            format='development-subtree')
1686
1904
        subtree = self.make_branch_and_tree('source/subtree',
1687
 
            format='dirstate-with-subtree')
 
1905
            format='development-subtree')
1688
1906
        tree.add_reference(subtree)
1689
1907
        tree.commit('a revision')
1690
1908
        tree.branch.create_checkout('target')
1691
 
        self.failUnlessExists('target')
1692
 
        self.failUnlessExists('target/subtree')
 
1909
        self.assertPathExists('target')
 
1910
        self.assertPathExists('target/subtree')
1693
1911
 
1694
1912
    def test_file_conflict_handling(self):
1695
1913
        """Ensure that when building trees, conflict handling is done"""
1742
1960
        source.commit('added file')
1743
1961
        build_tree(source.basis_tree(), target)
1744
1962
        self.assertEqual([], target.conflicts())
1745
 
        self.failUnlessExists('target/dir1/file')
 
1963
        self.assertPathExists('target/dir1/file')
1746
1964
 
1747
1965
        # Ensure contents are merged
1748
1966
        target = self.make_branch_and_tree('target2')
1749
1967
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1750
1968
        build_tree(source.basis_tree(), target)
1751
1969
        self.assertEqual([], target.conflicts())
1752
 
        self.failUnlessExists('target2/dir1/file2')
1753
 
        self.failUnlessExists('target2/dir1/file')
 
1970
        self.assertPathExists('target2/dir1/file2')
 
1971
        self.assertPathExists('target2/dir1/file')
1754
1972
 
1755
1973
        # Ensure new contents are suppressed for existing branches
1756
1974
        target = self.make_branch_and_tree('target3')
1757
1975
        self.make_branch('target3/dir1')
1758
1976
        self.build_tree(['target3/dir1/file2'])
1759
1977
        build_tree(source.basis_tree(), target)
1760
 
        self.failIfExists('target3/dir1/file')
1761
 
        self.failUnlessExists('target3/dir1/file2')
1762
 
        self.failUnlessExists('target3/dir1.diverted/file')
 
1978
        self.assertPathDoesNotExist('target3/dir1/file')
 
1979
        self.assertPathExists('target3/dir1/file2')
 
1980
        self.assertPathExists('target3/dir1.diverted/file')
1763
1981
        self.assertEqual([DuplicateEntry('Diverted to',
1764
1982
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1765
1983
            target.conflicts())
1768
1986
        self.build_tree(['target4/dir1/'])
1769
1987
        self.make_branch('target4/dir1/file')
1770
1988
        build_tree(source.basis_tree(), target)
1771
 
        self.failUnlessExists('target4/dir1/file')
 
1989
        self.assertPathExists('target4/dir1/file')
1772
1990
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1773
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1991
        self.assertPathExists('target4/dir1/file.diverted')
1774
1992
        self.assertEqual([DuplicateEntry('Diverted to',
1775
1993
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1776
1994
            target.conflicts())
1817
2035
    def create_ab_tree(self):
1818
2036
        """Create a committed test tree with two files"""
1819
2037
        source = self.make_branch_and_tree('source')
1820
 
        self.build_tree_contents([('source/file1', 'A')])
1821
 
        self.build_tree_contents([('source/file2', 'B')])
1822
 
        source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
 
2038
        self.build_tree_contents([('source/file1', b'A')])
 
2039
        self.build_tree_contents([('source/file2', b'B')])
 
2040
        source.add(['file1', 'file2'], [b'file1-id', b'file2-id'])
1823
2041
        source.commit('commit files')
1824
2042
        source.lock_write()
1825
2043
        self.addCleanup(source.unlock)
1827
2045
 
1828
2046
    def test_build_tree_accelerator_tree(self):
1829
2047
        source = self.create_ab_tree()
1830
 
        self.build_tree_contents([('source/file2', 'C')])
 
2048
        self.build_tree_contents([('source/file2', b'C')])
1831
2049
        calls = []
1832
2050
        real_source_get_file = source.get_file
1833
 
        def get_file(file_id, path=None):
 
2051
        def get_file(path, file_id=None):
1834
2052
            calls.append(file_id)
1835
 
            return real_source_get_file(file_id, path)
 
2053
            return real_source_get_file(path, file_id)
1836
2054
        source.get_file = get_file
1837
2055
        target = self.make_branch_and_tree('target')
1838
2056
        revision_tree = source.basis_tree()
1844
2062
        self.addCleanup(target.unlock)
1845
2063
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1846
2064
 
 
2065
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
2066
        source = self.create_ab_tree()
 
2067
        sha1 = osutils.sha_string('A')
 
2068
        target = self.make_branch_and_tree('target')
 
2069
        target.lock_write()
 
2070
        self.addCleanup(target.unlock)
 
2071
        state = target.current_dirstate()
 
2072
        state._cutoff_time = time.time() + 60
 
2073
        build_tree(source.basis_tree(), target, source)
 
2074
        entry = state._get_entry(0, path_utf8='file1')
 
2075
        self.assertEqual(sha1, entry[1][0][1])
 
2076
 
1847
2077
    def test_build_tree_accelerator_tree_missing_file(self):
1848
2078
        source = self.create_ab_tree()
1849
2079
        os.unlink('source/file1')
1860
2090
    def test_build_tree_accelerator_wrong_kind(self):
1861
2091
        self.requireFeature(SymlinkFeature)
1862
2092
        source = self.make_branch_and_tree('source')
1863
 
        self.build_tree_contents([('source/file1', '')])
1864
 
        self.build_tree_contents([('source/file2', '')])
1865
 
        source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
 
2093
        self.build_tree_contents([('source/file1', b'')])
 
2094
        self.build_tree_contents([('source/file2', b'')])
 
2095
        source.add(['file1', 'file2'], [b'file1-id', b'file2-id'])
1866
2096
        source.commit('commit files')
1867
2097
        os.unlink('source/file2')
1868
 
        self.build_tree_contents([('source/file2/', 'C')])
 
2098
        self.build_tree_contents([('source/file2/', b'C')])
1869
2099
        os.unlink('source/file1')
1870
2100
        os.symlink('file2', 'source/file1')
1871
2101
        calls = []
1872
2102
        real_source_get_file = source.get_file
1873
 
        def get_file(file_id, path=None):
 
2103
        def get_file(path, file_id=None):
1874
2104
            calls.append(file_id)
1875
 
            return real_source_get_file(file_id, path)
 
2105
            return real_source_get_file(path, file_id)
1876
2106
        source.get_file = get_file
1877
2107
        target = self.make_branch_and_tree('target')
1878
2108
        revision_tree = source.basis_tree()
1911
2141
 
1912
2142
    def test_build_tree_accelerator_tree_moved(self):
1913
2143
        source = self.make_branch_and_tree('source')
1914
 
        self.build_tree_contents([('source/file1', 'A')])
1915
 
        source.add(['file1'], ['file1-id'])
 
2144
        self.build_tree_contents([('source/file1', b'A')])
 
2145
        source.add(['file1'], [b'file1-id'])
1916
2146
        source.commit('commit files')
1917
2147
        source.rename_one('file1', 'file2')
1918
2148
        source.lock_read()
1930
2160
        self.requireFeature(HardlinkFeature)
1931
2161
        source = self.create_ab_tree()
1932
2162
        tt = TreeTransform(source)
1933
 
        trans_id = tt.trans_id_tree_file_id('file1-id')
 
2163
        trans_id = tt.trans_id_tree_path('file1')
1934
2164
        tt.set_executability(True, trans_id)
1935
2165
        tt.apply()
1936
 
        self.assertTrue(source.is_executable('file1-id'))
 
2166
        self.assertTrue(source.is_executable('file1'))
1937
2167
        target = self.make_branch_and_tree('target')
1938
2168
        revision_tree = source.basis_tree()
1939
2169
        revision_tree.lock_read()
1942
2172
        target.lock_read()
1943
2173
        self.addCleanup(target.unlock)
1944
2174
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1945
 
        self.assertTrue(source.is_executable('file1-id'))
 
2175
        self.assertTrue(source.is_executable('file1'))
1946
2176
 
1947
2177
    def install_rot13_content_filter(self, pattern):
1948
2178
        # We could use
1956
2186
        def rot13(chunks, context=None):
1957
2187
            return [''.join(chunks).encode('rot13')]
1958
2188
        rot13filter = filters.ContentFilter(rot13, rot13)
1959
 
        filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
 
2189
        filters.filter_stacks_registry.register(
 
2190
            'rot13', {'yes': [rot13filter]}.get)
1960
2191
        os.mkdir(self.test_home_dir + '/.bazaar')
1961
2192
        rules_filename = self.test_home_dir + '/.bazaar/rules'
1962
2193
        f = open(rules_filename, 'wb')
1992
2223
        self.assertEqualStat(source_stat, target_stat)
1993
2224
 
1994
2225
    def test_case_insensitive_build_tree_inventory(self):
1995
 
        if (tests.CaseInsensitiveFilesystemFeature.available()
1996
 
            or tests.CaseInsCasePresFilenameFeature.available()):
 
2226
        if (features.CaseInsensitiveFilesystemFeature.available()
 
2227
            or features.CaseInsCasePresFilenameFeature.available()):
1997
2228
            raise tests.UnavailableFeature('Fully case sensitive filesystem')
1998
2229
        source = self.make_branch_and_tree('source')
1999
2230
        self.build_tree(['source/file', 'source/FILE'])
2000
 
        source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
 
2231
        source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
2001
2232
        source.commit('added files')
2002
2233
        # Don't try this at home, kids!
2003
2234
        # Force the tree to report that it is case insensitive
2004
2235
        target = self.make_branch_and_tree('target')
2005
2236
        target.case_sensitive = False
2006
2237
        build_tree(source.basis_tree(), target, source, delta_from_tree=True)
2007
 
        self.assertEqual('file.moved', target.id2path('lower-id'))
2008
 
        self.assertEqual('FILE', target.id2path('upper-id'))
 
2238
        self.assertEqual('file.moved', target.id2path(b'lower-id'))
 
2239
        self.assertEqual('FILE', target.id2path(b'upper-id'))
 
2240
 
 
2241
    def test_build_tree_observes_sha(self):
 
2242
        source = self.make_branch_and_tree('source')
 
2243
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2244
        source.add(['file1', 'dir', 'dir/file2'],
 
2245
                   [b'file1-id', b'dir-id', b'file2-id'])
 
2246
        source.commit('new files')
 
2247
        target = self.make_branch_and_tree('target')
 
2248
        target.lock_write()
 
2249
        self.addCleanup(target.unlock)
 
2250
        # We make use of the fact that DirState caches its cutoff time. So we
 
2251
        # set the 'safe' time to one minute in the future.
 
2252
        state = target.current_dirstate()
 
2253
        state._cutoff_time = time.time() + 60
 
2254
        build_tree(source.basis_tree(), target)
 
2255
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2256
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2257
        # entry[1] is the state information, entry[1][0] is the state of the
 
2258
        # working tree, entry[1][0][1] is the sha value for the current working
 
2259
        # tree
 
2260
        entry1 = state._get_entry(0, path_utf8='file1')
 
2261
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2262
        # The 'size' field must also be set.
 
2263
        self.assertEqual(25, entry1[1][0][2])
 
2264
        entry1_state = entry1[1][0]
 
2265
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2266
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2267
        self.assertEqual(29, entry2[1][0][2])
 
2268
        entry2_state = entry2[1][0]
 
2269
        # Now, make sure that we don't have to re-read the content. The
 
2270
        # packed_stat should match exactly.
 
2271
        self.assertEqual(entry1_sha, target.get_file_sha1('file1', b'file1-id'))
 
2272
        self.assertEqual(entry2_sha,
 
2273
                         target.get_file_sha1('dir/file2', b'file2-id'))
 
2274
        self.assertEqual(entry1_state, entry1[1][0])
 
2275
        self.assertEqual(entry2_state, entry2[1][0])
2009
2276
 
2010
2277
 
2011
2278
class TestCommitTransform(tests.TestCaseWithTransport):
2072
2339
 
2073
2340
    def test_add_files(self):
2074
2341
        branch, tt = self.get_branch_and_transform()
2075
 
        tt.new_file('file', tt.root, 'contents', 'file-id')
 
2342
        tt.new_file('file', tt.root, 'contents', b'file-id')
2076
2343
        trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2077
2344
        if SymlinkFeature.available():
2078
2345
            tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2079
2346
        rev = tt.commit(branch, 'message')
2080
2347
        tree = branch.basis_tree()
2081
 
        self.assertEqual('file', tree.id2path('file-id'))
2082
 
        self.assertEqual('contents', tree.get_file_text('file-id'))
2083
 
        self.assertEqual('dir', tree.id2path('dir-id'))
 
2348
        self.assertEqual('file', tree.id2path(b'file-id'))
 
2349
        self.assertEqual('contents', tree.get_file_text('file', b'file-id'))
 
2350
        self.assertEqual('dir', tree.id2path(b'dir-id'))
2084
2351
        if SymlinkFeature.available():
2085
 
            self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2086
 
            self.assertEqual('target', tree.get_symlink_target('symlink-id'))
 
2352
            self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
 
2353
            self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2087
2354
 
2088
2355
    def test_add_unversioned(self):
2089
2356
        branch, tt = self.get_branch_and_transform()
2093
2360
 
2094
2361
    def test_modify_strict(self):
2095
2362
        branch, tt = self.get_branch_and_transform()
2096
 
        tt.new_file('file', tt.root, 'contents', 'file-id')
 
2363
        tt.new_file('file', tt.root, 'contents', b'file-id')
2097
2364
        tt.commit(branch, 'message', strict=True)
2098
2365
        tt = TransformPreview(branch.basis_tree())
2099
2366
        self.addCleanup(tt.finalize)
2109
2376
        """
2110
2377
        branch, tt = self.get_branch_and_transform()
2111
2378
        parent_id = tt.trans_id_file_id('parent-id')
2112
 
        tt.new_file('file', parent_id, 'contents', 'file-id')
 
2379
        tt.new_file('file', parent_id, 'contents', b'file-id')
2113
2380
        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2114
2381
                          'message')
2115
2382
 
2146
2413
        self.assertEqual('tree', revision.properties['branch-nick'])
2147
2414
 
2148
2415
 
2149
 
class MockTransform(object):
2150
 
 
2151
 
    def has_named_child(self, by_parent, parent_id, name):
2152
 
        for child_id in by_parent[parent_id]:
2153
 
            if child_id == '0':
2154
 
                if name == "name~":
2155
 
                    return True
2156
 
            elif name == "name.~%s~" % child_id:
2157
 
                return True
2158
 
        return False
2159
 
 
2160
 
 
2161
 
class MockEntry(object):
2162
 
    def __init__(self):
2163
 
        object.__init__(self)
2164
 
        self.name = "name"
2165
 
 
2166
 
 
2167
 
class TestGetBackupName(TestCase):
2168
 
    def test_get_backup_name(self):
2169
 
        tt = MockTransform()
2170
 
        name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2171
 
        self.assertEqual(name, 'name.~1~')
2172
 
        name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2173
 
        self.assertEqual(name, 'name.~2~')
2174
 
        name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2175
 
        self.assertEqual(name, 'name.~1~')
2176
 
        name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2177
 
        self.assertEqual(name, 'name.~1~')
2178
 
        name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2179
 
        self.assertEqual(name, 'name.~4~')
2180
 
 
2181
 
 
2182
2416
class TestFileMover(tests.TestCaseWithTransport):
2183
2417
 
2184
2418
    def test_file_mover(self):
2185
2419
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2186
2420
        mover = _FileMover()
2187
2421
        mover.rename('a', 'q')
2188
 
        self.failUnlessExists('q')
2189
 
        self.failIfExists('a')
2190
 
        self.failUnlessExists('q/b')
2191
 
        self.failUnlessExists('c')
2192
 
        self.failUnlessExists('c/d')
 
2422
        self.assertPathExists('q')
 
2423
        self.assertPathDoesNotExist('a')
 
2424
        self.assertPathExists('q/b')
 
2425
        self.assertPathExists('c')
 
2426
        self.assertPathExists('c/d')
2193
2427
 
2194
2428
    def test_pre_delete_rollback(self):
2195
2429
        self.build_tree(['a/'])
2196
2430
        mover = _FileMover()
2197
2431
        mover.pre_delete('a', 'q')
2198
 
        self.failUnlessExists('q')
2199
 
        self.failIfExists('a')
 
2432
        self.assertPathExists('q')
 
2433
        self.assertPathDoesNotExist('a')
2200
2434
        mover.rollback()
2201
 
        self.failIfExists('q')
2202
 
        self.failUnlessExists('a')
 
2435
        self.assertPathDoesNotExist('q')
 
2436
        self.assertPathExists('a')
2203
2437
 
2204
2438
    def test_apply_deletions(self):
2205
2439
        self.build_tree(['a/', 'b/'])
2206
2440
        mover = _FileMover()
2207
2441
        mover.pre_delete('a', 'q')
2208
2442
        mover.pre_delete('b', 'r')
2209
 
        self.failUnlessExists('q')
2210
 
        self.failUnlessExists('r')
2211
 
        self.failIfExists('a')
2212
 
        self.failIfExists('b')
 
2443
        self.assertPathExists('q')
 
2444
        self.assertPathExists('r')
 
2445
        self.assertPathDoesNotExist('a')
 
2446
        self.assertPathDoesNotExist('b')
2213
2447
        mover.apply_deletions()
2214
 
        self.failIfExists('q')
2215
 
        self.failIfExists('r')
2216
 
        self.failIfExists('a')
2217
 
        self.failIfExists('b')
 
2448
        self.assertPathDoesNotExist('q')
 
2449
        self.assertPathDoesNotExist('r')
 
2450
        self.assertPathDoesNotExist('a')
 
2451
        self.assertPathDoesNotExist('b')
2218
2452
 
2219
2453
    def test_file_mover_rollback(self):
2220
2454
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2223
2457
        mover.rename('c/e', 'c/d')
2224
2458
        try:
2225
2459
            mover.rename('a', 'c')
2226
 
        except errors.FileExists, e:
 
2460
        except errors.FileExists as e:
2227
2461
            mover.rollback()
2228
 
        self.failUnlessExists('a')
2229
 
        self.failUnlessExists('c/d')
 
2462
        self.assertPathExists('a')
 
2463
        self.assertPathExists('c/d')
2230
2464
 
2231
2465
 
2232
2466
class Bogus(Exception):
2262
2496
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2263
2497
        self.assertRaises(Bogus, tt.apply,
2264
2498
                          _mover=self.ExceptionFileMover(bad_source='a'))
2265
 
        self.failUnlessExists('a')
2266
 
        self.failUnlessExists('a/b')
 
2499
        self.assertPathExists('a')
 
2500
        self.assertPathExists('a/b')
2267
2501
        tt.apply()
2268
 
        self.failUnlessExists('c')
2269
 
        self.failUnlessExists('c/d')
 
2502
        self.assertPathExists('c')
 
2503
        self.assertPathExists('c/d')
2270
2504
 
2271
2505
    def test_rollback_rename_into_place(self):
2272
2506
        tree = self.make_branch_and_tree('.')
2278
2512
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2279
2513
        self.assertRaises(Bogus, tt.apply,
2280
2514
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2281
 
        self.failUnlessExists('a')
2282
 
        self.failUnlessExists('a/b')
 
2515
        self.assertPathExists('a')
 
2516
        self.assertPathExists('a/b')
2283
2517
        tt.apply()
2284
 
        self.failUnlessExists('c')
2285
 
        self.failUnlessExists('c/d')
 
2518
        self.assertPathExists('c')
 
2519
        self.assertPathExists('c/d')
2286
2520
 
2287
2521
    def test_rollback_deletion(self):
2288
2522
        tree = self.make_branch_and_tree('.')
2294
2528
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2295
2529
        self.assertRaises(Bogus, tt.apply,
2296
2530
                          _mover=self.ExceptionFileMover(bad_target='d'))
2297
 
        self.failUnlessExists('a')
2298
 
        self.failUnlessExists('a/b')
2299
 
 
2300
 
    def test_resolve_no_parent(self):
 
2531
        self.assertPathExists('a')
 
2532
        self.assertPathExists('a/b')
 
2533
 
 
2534
 
 
2535
class TestFinalizeRobustness(tests.TestCaseWithTransport):
 
2536
    """Ensure treetransform creation errors can be safely cleaned up after"""
 
2537
 
 
2538
    def _override_globals_in_method(self, instance, method_name, globals):
 
2539
        """Replace method on instance with one with updated globals"""
 
2540
        import types
 
2541
        func = getattr(instance, method_name).__func__
 
2542
        new_globals = dict(func.__globals__)
 
2543
        new_globals.update(globals)
 
2544
        new_func = types.FunctionType(func.__code__, new_globals,
 
2545
            func.__name__, func.__defaults__)
 
2546
        setattr(instance, method_name,
 
2547
            types.MethodType(new_func, instance, instance.__class__))
 
2548
        self.addCleanup(delattr, instance, method_name)
 
2549
 
 
2550
    @staticmethod
 
2551
    def _fake_open_raises_before(name, mode):
 
2552
        """Like open() but raises before doing anything"""
 
2553
        raise RuntimeError
 
2554
 
 
2555
    @staticmethod
 
2556
    def _fake_open_raises_after(name, mode):
 
2557
        """Like open() but raises after creating file without returning"""
 
2558
        open(name, mode).close()
 
2559
        raise RuntimeError
 
2560
 
 
2561
    def create_transform_and_root_trans_id(self):
 
2562
        """Setup a transform creating a file in limbo"""
 
2563
        tree = self.make_branch_and_tree('.')
 
2564
        tt = TreeTransform(tree)
 
2565
        return tt, tt.create_path("a", tt.root)
 
2566
 
 
2567
    def create_transform_and_subdir_trans_id(self):
 
2568
        """Setup a transform creating a directory containing a file in limbo"""
 
2569
        tree = self.make_branch_and_tree('.')
 
2570
        tt = TreeTransform(tree)
 
2571
        d_trans_id = tt.create_path("d", tt.root)
 
2572
        tt.create_directory(d_trans_id)
 
2573
        f_trans_id = tt.create_path("a", d_trans_id)
 
2574
        tt.adjust_path("a", d_trans_id, f_trans_id)
 
2575
        return tt, f_trans_id
 
2576
 
 
2577
    def test_root_create_file_open_raises_before_creation(self):
 
2578
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2579
        self._override_globals_in_method(tt, "create_file",
 
2580
            {"open": self._fake_open_raises_before})
 
2581
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2582
        path = tt._limbo_name(trans_id)
 
2583
        self.assertPathDoesNotExist(path)
 
2584
        tt.finalize()
 
2585
        self.assertPathDoesNotExist(tt._limbodir)
 
2586
 
 
2587
    def test_root_create_file_open_raises_after_creation(self):
 
2588
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2589
        self._override_globals_in_method(tt, "create_file",
 
2590
            {"open": self._fake_open_raises_after})
 
2591
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2592
        path = tt._limbo_name(trans_id)
 
2593
        self.assertPathExists(path)
 
2594
        tt.finalize()
 
2595
        self.assertPathDoesNotExist(path)
 
2596
        self.assertPathDoesNotExist(tt._limbodir)
 
2597
 
 
2598
    def test_subdir_create_file_open_raises_before_creation(self):
 
2599
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2600
        self._override_globals_in_method(tt, "create_file",
 
2601
            {"open": self._fake_open_raises_before})
 
2602
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2603
        path = tt._limbo_name(trans_id)
 
2604
        self.assertPathDoesNotExist(path)
 
2605
        tt.finalize()
 
2606
        self.assertPathDoesNotExist(tt._limbodir)
 
2607
 
 
2608
    def test_subdir_create_file_open_raises_after_creation(self):
 
2609
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2610
        self._override_globals_in_method(tt, "create_file",
 
2611
            {"open": self._fake_open_raises_after})
 
2612
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2613
        path = tt._limbo_name(trans_id)
 
2614
        self.assertPathExists(path)
 
2615
        tt.finalize()
 
2616
        self.assertPathDoesNotExist(path)
 
2617
        self.assertPathDoesNotExist(tt._limbodir)
 
2618
 
 
2619
    def test_rename_in_limbo_rename_raises_after_rename(self):
 
2620
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2621
        parent1 = tt.new_directory('parent1', tt.root)
 
2622
        child1 = tt.new_file('child1', parent1, 'contents')
 
2623
        parent2 = tt.new_directory('parent2', tt.root)
 
2624
 
 
2625
        class FakeOSModule(object):
 
2626
            def rename(self, old, new):
 
2627
                os.rename(old, new)
 
2628
                raise RuntimeError
 
2629
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2630
            {"os": FakeOSModule()})
 
2631
        self.assertRaises(
 
2632
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2633
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
 
2634
        self.assertPathExists(path)
 
2635
        tt.finalize()
 
2636
        self.assertPathDoesNotExist(path)
 
2637
        self.assertPathDoesNotExist(tt._limbodir)
 
2638
 
 
2639
    def test_rename_in_limbo_rename_raises_before_rename(self):
 
2640
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2641
        parent1 = tt.new_directory('parent1', tt.root)
 
2642
        child1 = tt.new_file('child1', parent1, 'contents')
 
2643
        parent2 = tt.new_directory('parent2', tt.root)
 
2644
 
 
2645
        class FakeOSModule(object):
 
2646
            def rename(self, old, new):
 
2647
                raise RuntimeError
 
2648
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2649
            {"os": FakeOSModule()})
 
2650
        self.assertRaises(
 
2651
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2652
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
 
2653
        self.assertPathExists(path)
 
2654
        tt.finalize()
 
2655
        self.assertPathDoesNotExist(path)
 
2656
        self.assertPathDoesNotExist(tt._limbodir)
 
2657
 
 
2658
 
 
2659
class TestTransformMissingParent(tests.TestCaseWithTransport):
 
2660
 
 
2661
    def make_tt_with_versioned_dir(self):
2301
2662
        wt = self.make_branch_and_tree('.')
 
2663
        self.build_tree(['dir/',])
 
2664
        wt.add(['dir'], [b'dir-id'])
 
2665
        wt.commit('Create dir')
2302
2666
        tt = TreeTransform(wt)
2303
2667
        self.addCleanup(tt.finalize)
2304
 
        parent = tt.trans_id_file_id('parent-id')
2305
 
        tt.new_file('file', parent, 'Contents')
2306
 
        resolve_conflicts(tt)
 
2668
        return wt, tt
 
2669
 
 
2670
    def test_resolve_create_parent_for_versioned_file(self):
 
2671
        wt, tt = self.make_tt_with_versioned_dir()
 
2672
        dir_tid = tt.trans_id_tree_path('dir')
 
2673
        file_tid = tt.new_file('file', dir_tid, 'Contents', file_id=b'file-id')
 
2674
        tt.delete_contents(dir_tid)
 
2675
        tt.unversion_file(dir_tid)
 
2676
        conflicts = resolve_conflicts(tt)
 
2677
        # one conflict for the missing directory, one for the unversioned
 
2678
        # parent
 
2679
        self.assertLength(2, conflicts)
 
2680
 
 
2681
    def test_non_versioned_file_create_conflict(self):
 
2682
        wt, tt = self.make_tt_with_versioned_dir()
 
2683
        dir_tid = tt.trans_id_tree_path('dir')
 
2684
        tt.new_file('file', dir_tid, 'Contents')
 
2685
        tt.delete_contents(dir_tid)
 
2686
        tt.unversion_file(dir_tid)
 
2687
        conflicts = resolve_conflicts(tt)
 
2688
        # no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
 
2689
        self.assertLength(1, conflicts)
 
2690
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
2691
                         conflicts.pop())
2307
2692
 
2308
2693
 
2309
2694
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2310
2695
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2311
2696
                  (False, False))
2312
2697
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2313
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2698
              ('', ''), ('directory', 'directory'), (False, False))
2314
2699
 
2315
2700
 
2316
2701
class TestTransformPreview(tests.TestCaseWithTransport):
2317
2702
 
2318
2703
    def create_tree(self):
2319
2704
        tree = self.make_branch_and_tree('.')
2320
 
        self.build_tree_contents([('a', 'content 1')])
2321
 
        tree.set_root_id('TREE_ROOT')
2322
 
        tree.add('a', 'a-id')
2323
 
        tree.commit('rev1', rev_id='rev1')
 
2705
        self.build_tree_contents([('a', b'content 1')])
 
2706
        tree.set_root_id(b'TREE_ROOT')
 
2707
        tree.add('a', b'a-id')
 
2708
        tree.commit('rev1', rev_id=b'rev1')
2324
2709
        return tree.branch.repository.revision_tree('rev1')
2325
2710
 
2326
2711
    def get_empty_preview(self):
2347
2732
        self.addCleanup(preview.finalize)
2348
2733
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2349
2734
        preview_tree = preview.get_preview_tree()
2350
 
        self.assertEqual(preview_tree.kind('file2-id'), 'file')
 
2735
        self.assertEqual(preview_tree.kind('file2'), 'file')
2351
2736
        self.assertEqual(
2352
 
            preview_tree.get_file('file2-id').read(), 'content B\n')
 
2737
            preview_tree.get_file('file2', 'file2-id').read(), 'content B\n')
2353
2738
 
2354
2739
    def test_diff_preview_tree(self):
2355
2740
        revision_tree = self.create_tree()
2357
2742
        self.addCleanup(preview.finalize)
2358
2743
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2359
2744
        preview_tree = preview.get_preview_tree()
2360
 
        out = StringIO()
 
2745
        out = BytesIO()
2361
2746
        show_diff_trees(revision_tree, preview_tree, out)
2362
2747
        lines = out.getvalue().splitlines()
2363
2748
        self.assertEqual(lines[0], "=== added file 'file2'")
2385
2770
 
2386
2771
    def test_iter_changes(self):
2387
2772
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2388
 
        root = revision_tree.inventory.root.file_id
 
2773
        root = revision_tree.get_root_id()
2389
2774
        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2390
2775
                          (root, root), ('a', 'a'), ('file', 'file'),
2391
2776
                          (False, False))],
2395
2780
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2396
2781
        changes = preview_tree.iter_changes(revision_tree,
2397
2782
                                            include_unchanged=True)
2398
 
        root = revision_tree.inventory.root.file_id
 
2783
        root = revision_tree.get_root_id()
2399
2784
 
2400
2785
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2401
2786
 
2403
2788
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2404
2789
        changes = preview_tree.iter_changes(revision_tree,
2405
2790
                                            specific_files=[''])
2406
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2791
        self.assertEqual([A_ENTRY], list(changes))
2407
2792
 
2408
2793
    def test_want_unversioned(self):
2409
2794
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2410
2795
        changes = preview_tree.iter_changes(revision_tree,
2411
2796
                                            want_unversioned=True)
2412
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2797
        self.assertEqual([A_ENTRY], list(changes))
2413
2798
 
2414
2799
    def test_ignore_extra_trees_no_specific_files(self):
2415
2800
        # extra_trees is harmless without specific_files, so we'll silently
2431
2816
        revision_tree = self.create_tree()
2432
2817
        preview = TransformPreview(revision_tree)
2433
2818
        self.addCleanup(preview.finalize)
2434
 
        preview.new_file('file', preview.root, 'contents', 'file-id')
 
2819
        preview.new_file('file', preview.root, 'contents', b'file-id')
2435
2820
        preview.new_directory('directory', preview.root, 'dir-id')
2436
2821
        preview_tree = preview.get_preview_tree()
2437
 
        self.assertEqual('file', preview_tree.kind('file-id'))
2438
 
        self.assertEqual('directory', preview_tree.kind('dir-id'))
 
2822
        self.assertEqual('file', preview_tree.kind('file'))
 
2823
        self.assertEqual('directory', preview_tree.kind('directory'))
2439
2824
 
2440
2825
    def test_get_file_mtime(self):
2441
2826
        preview = self.get_empty_preview()
2442
2827
        file_trans_id = preview.new_file('file', preview.root, 'contents',
2443
 
                                         'file-id')
 
2828
                                         b'file-id')
2444
2829
        limbo_path = preview._limbo_name(file_trans_id)
2445
2830
        preview_tree = preview.get_preview_tree()
2446
2831
        self.assertEqual(os.stat(limbo_path).st_mtime,
2447
 
                         preview_tree.get_file_mtime('file-id'))
 
2832
                         preview_tree.get_file_mtime('file', b'file-id'))
2448
2833
 
2449
2834
    def test_get_file_mtime_renamed(self):
2450
2835
        work_tree = self.make_branch_and_tree('tree')
2451
2836
        self.build_tree(['tree/file'])
2452
 
        work_tree.add('file', 'file-id')
 
2837
        work_tree.add('file', b'file-id')
2453
2838
        preview = TransformPreview(work_tree)
2454
2839
        self.addCleanup(preview.finalize)
2455
 
        file_trans_id = preview.trans_id_tree_file_id('file-id')
 
2840
        file_trans_id = preview.trans_id_tree_path('file')
2456
2841
        preview.adjust_path('renamed', preview.root, file_trans_id)
2457
2842
        preview_tree = preview.get_preview_tree()
2458
 
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2459
 
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
 
2843
        preview_mtime = preview_tree.get_file_mtime('renamed', b'file-id')
 
2844
        work_mtime = work_tree.get_file_mtime('file', b'file-id')
 
2845
 
 
2846
    def test_get_file_size(self):
 
2847
        work_tree = self.make_branch_and_tree('tree')
 
2848
        self.build_tree_contents([('tree/old', b'old')])
 
2849
        work_tree.add('old', b'old-id')
 
2850
        preview = TransformPreview(work_tree)
 
2851
        self.addCleanup(preview.finalize)
 
2852
        new_id = preview.new_file('name', preview.root, 'contents', b'new-id',
 
2853
                                  'executable')
 
2854
        tree = preview.get_preview_tree()
 
2855
        self.assertEqual(len('old'), tree.get_file_size('old'))
 
2856
        self.assertEqual(len('contents'), tree.get_file_size('name'))
2460
2857
 
2461
2858
    def test_get_file(self):
2462
2859
        preview = self.get_empty_preview()
2463
 
        preview.new_file('file', preview.root, 'contents', 'file-id')
 
2860
        preview.new_file('file', preview.root, 'contents', b'file-id')
2464
2861
        preview_tree = preview.get_preview_tree()
2465
 
        tree_file = preview_tree.get_file('file-id')
 
2862
        tree_file = preview_tree.get_file('file')
2466
2863
        try:
2467
2864
            self.assertEqual('contents', tree_file.read())
2468
2865
        finally:
2474
2871
        preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2475
2872
        preview_tree = preview.get_preview_tree()
2476
2873
        self.assertEqual('target',
2477
 
                         preview_tree.get_symlink_target('symlink-id'))
 
2874
                         preview_tree.get_symlink_target('symlink'))
2478
2875
 
2479
2876
    def test_all_file_ids(self):
2480
2877
        tree = self.make_branch_and_tree('tree')
2481
2878
        self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2482
 
        tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
 
2879
        tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2483
2880
        preview = TransformPreview(tree)
2484
2881
        self.addCleanup(preview.finalize)
2485
 
        preview.unversion_file(preview.trans_id_file_id('b-id'))
2486
 
        c_trans_id = preview.trans_id_file_id('c-id')
 
2882
        preview.unversion_file(preview.trans_id_file_id(b'b-id'))
 
2883
        c_trans_id = preview.trans_id_file_id(b'c-id')
2487
2884
        preview.unversion_file(c_trans_id)
2488
 
        preview.version_file('c-id', c_trans_id)
 
2885
        preview.version_file(b'c-id', c_trans_id)
2489
2886
        preview_tree = preview.get_preview_tree()
2490
 
        self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
 
2887
        self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
2491
2888
                         preview_tree.all_file_ids())
2492
2889
 
2493
2890
    def test_path2id_deleted_unchanged(self):
2494
2891
        tree = self.make_branch_and_tree('tree')
2495
2892
        self.build_tree(['tree/unchanged', 'tree/deleted'])
2496
 
        tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
 
2893
        tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2497
2894
        preview = TransformPreview(tree)
2498
2895
        self.addCleanup(preview.finalize)
2499
 
        preview.unversion_file(preview.trans_id_file_id('deleted-id'))
 
2896
        preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2500
2897
        preview_tree = preview.get_preview_tree()
2501
 
        self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2502
 
        self.assertIs(None, preview_tree.path2id('deleted'))
 
2898
        self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
 
2899
        self.assertFalse(preview_tree.is_versioned('deleted'))
2503
2900
 
2504
2901
    def test_path2id_created(self):
2505
2902
        tree = self.make_branch_and_tree('tree')
2506
2903
        self.build_tree(['tree/unchanged'])
2507
 
        tree.add(['unchanged'], ['unchanged-id'])
 
2904
        tree.add(['unchanged'], [b'unchanged-id'])
2508
2905
        preview = TransformPreview(tree)
2509
2906
        self.addCleanup(preview.finalize)
2510
 
        preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
 
2907
        preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2511
2908
            'contents', 'new-id')
2512
2909
        preview_tree = preview.get_preview_tree()
2513
 
        self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
 
2910
        self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2514
2911
 
2515
2912
    def test_path2id_moved(self):
2516
2913
        tree = self.make_branch_and_tree('tree')
2517
2914
        self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2518
2915
        tree.add(['old_parent', 'old_parent/child'],
2519
 
                 ['old_parent-id', 'child-id'])
 
2916
                 [b'old_parent-id', b'child-id'])
2520
2917
        preview = TransformPreview(tree)
2521
2918
        self.addCleanup(preview.finalize)
2522
2919
        new_parent = preview.new_directory('new_parent', preview.root,
2523
 
                                           'new_parent-id')
 
2920
                                           b'new_parent-id')
2524
2921
        preview.adjust_path('child', new_parent,
2525
 
                            preview.trans_id_file_id('child-id'))
 
2922
                            preview.trans_id_file_id(b'child-id'))
2526
2923
        preview_tree = preview.get_preview_tree()
2527
 
        self.assertIs(None, preview_tree.path2id('old_parent/child'))
2528
 
        self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
 
2924
        self.assertFalse(preview_tree.is_versioned('old_parent/child'))
 
2925
        self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2529
2926
 
2530
2927
    def test_path2id_renamed_parent(self):
2531
2928
        tree = self.make_branch_and_tree('tree')
2532
2929
        self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2533
2930
        tree.add(['old_name', 'old_name/child'],
2534
 
                 ['parent-id', 'child-id'])
 
2931
                 [b'parent-id', b'child-id'])
2535
2932
        preview = TransformPreview(tree)
2536
2933
        self.addCleanup(preview.finalize)
2537
2934
        preview.adjust_path('new_name', preview.root,
2538
 
                            preview.trans_id_file_id('parent-id'))
 
2935
                            preview.trans_id_file_id(b'parent-id'))
2539
2936
        preview_tree = preview.get_preview_tree()
2540
 
        self.assertIs(None, preview_tree.path2id('old_name/child'))
2541
 
        self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
 
2937
        self.assertFalse(preview_tree.is_versioned('old_name/child'))
 
2938
        self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2542
2939
 
2543
 
    def assertMatchingIterEntries(self, tt, specific_file_ids=None):
 
2940
    def assertMatchingIterEntries(self, tt, specific_files=None):
2544
2941
        preview_tree = tt.get_preview_tree()
2545
2942
        preview_result = list(preview_tree.iter_entries_by_dir(
2546
 
                              specific_file_ids))
 
2943
                              specific_files=specific_files))
2547
2944
        tree = tt._tree
2548
2945
        tt.apply()
2549
 
        actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
 
2946
        actual_result = list(tree.iter_entries_by_dir(
 
2947
            specific_files=specific_files))
2550
2948
        self.assertEqual(actual_result, preview_result)
2551
2949
 
2552
2950
    def test_iter_entries_by_dir_new(self):
2553
2951
        tree = self.make_branch_and_tree('tree')
2554
2952
        tt = TreeTransform(tree)
2555
 
        tt.new_file('new', tt.root, 'contents', 'new-id')
 
2953
        tt.new_file('new', tt.root, 'contents', b'new-id')
2556
2954
        self.assertMatchingIterEntries(tt)
2557
2955
 
2558
2956
    def test_iter_entries_by_dir_deleted(self):
2559
2957
        tree = self.make_branch_and_tree('tree')
2560
2958
        self.build_tree(['tree/deleted'])
2561
 
        tree.add('deleted', 'deleted-id')
 
2959
        tree.add('deleted', b'deleted-id')
2562
2960
        tt = TreeTransform(tree)
2563
 
        tt.delete_contents(tt.trans_id_file_id('deleted-id'))
 
2961
        tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2564
2962
        self.assertMatchingIterEntries(tt)
2565
2963
 
2566
2964
    def test_iter_entries_by_dir_unversioned(self):
2567
2965
        tree = self.make_branch_and_tree('tree')
2568
2966
        self.build_tree(['tree/removed'])
2569
 
        tree.add('removed', 'removed-id')
 
2967
        tree.add('removed', b'removed-id')
2570
2968
        tt = TreeTransform(tree)
2571
 
        tt.unversion_file(tt.trans_id_file_id('removed-id'))
 
2969
        tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2572
2970
        self.assertMatchingIterEntries(tt)
2573
2971
 
2574
2972
    def test_iter_entries_by_dir_moved(self):
2575
2973
        tree = self.make_branch_and_tree('tree')
2576
2974
        self.build_tree(['tree/moved', 'tree/new_parent/'])
2577
 
        tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
 
2975
        tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2578
2976
        tt = TreeTransform(tree)
2579
 
        tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2580
 
                       tt.trans_id_file_id('moved-id'))
 
2977
        tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
 
2978
                       tt.trans_id_file_id(b'moved-id'))
2581
2979
        self.assertMatchingIterEntries(tt)
2582
2980
 
2583
 
    def test_iter_entries_by_dir_specific_file_ids(self):
 
2981
    def test_iter_entries_by_dir_specific_files(self):
2584
2982
        tree = self.make_branch_and_tree('tree')
2585
 
        tree.set_root_id('tree-root-id')
 
2983
        tree.set_root_id(b'tree-root-id')
2586
2984
        self.build_tree(['tree/parent/', 'tree/parent/child'])
2587
 
        tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
 
2985
        tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2588
2986
        tt = TreeTransform(tree)
2589
 
        self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
 
2987
        self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2590
2988
 
2591
2989
    def test_symlink_content_summary(self):
2592
2990
        self.requireFeature(SymlinkFeature)
2593
2991
        preview = self.get_empty_preview()
2594
 
        preview.new_symlink('path', preview.root, 'target', 'path-id')
 
2992
        preview.new_symlink('path', preview.root, 'target', b'path-id')
2595
2993
        summary = preview.get_preview_tree().path_content_summary('path')
2596
2994
        self.assertEqual(('symlink', None, None, 'target'), summary)
2597
2995
 
2664
3062
 
2665
3063
    def test_annotate(self):
2666
3064
        tree = self.make_branch_and_tree('tree')
2667
 
        self.build_tree_contents([('tree/file', 'a\n')])
2668
 
        tree.add('file', 'file-id')
2669
 
        tree.commit('a', rev_id='one')
2670
 
        self.build_tree_contents([('tree/file', 'a\nb\n')])
 
3065
        self.build_tree_contents([('tree/file', b'a\n')])
 
3066
        tree.add('file', b'file-id')
 
3067
        tree.commit('a', rev_id=b'one')
 
3068
        self.build_tree_contents([('tree/file', b'a\nb\n')])
2671
3069
        preview = TransformPreview(tree)
2672
3070
        self.addCleanup(preview.finalize)
2673
 
        file_trans_id = preview.trans_id_file_id('file-id')
 
3071
        file_trans_id = preview.trans_id_file_id(b'file-id')
2674
3072
        preview.delete_contents(file_trans_id)
2675
3073
        preview.create_file('a\nb\nc\n', file_trans_id)
2676
3074
        preview_tree = preview.get_preview_tree()
2679
3077
            ('me:', 'b\n'),
2680
3078
            ('me:', 'c\n'),
2681
3079
        ]
2682
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3080
        annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2683
3081
        self.assertEqual(expected, annotation)
2684
3082
 
2685
3083
    def test_annotate_missing(self):
2686
3084
        preview = self.get_empty_preview()
2687
 
        preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
 
3085
        preview.new_file('file', preview.root, 'a\nb\nc\n', b'file-id')
2688
3086
        preview_tree = preview.get_preview_tree()
2689
3087
        expected = [
2690
3088
            ('me:', 'a\n'),
2691
3089
            ('me:', 'b\n'),
2692
3090
            ('me:', 'c\n'),
2693
3091
         ]
2694
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3092
        annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2695
3093
        self.assertEqual(expected, annotation)
2696
3094
 
2697
3095
    def test_annotate_rename(self):
2698
3096
        tree = self.make_branch_and_tree('tree')
2699
 
        self.build_tree_contents([('tree/file', 'a\n')])
2700
 
        tree.add('file', 'file-id')
2701
 
        tree.commit('a', rev_id='one')
 
3097
        self.build_tree_contents([('tree/file', b'a\n')])
 
3098
        tree.add('file', b'file-id')
 
3099
        tree.commit('a', rev_id=b'one')
2702
3100
        preview = TransformPreview(tree)
2703
3101
        self.addCleanup(preview.finalize)
2704
 
        file_trans_id = preview.trans_id_file_id('file-id')
 
3102
        file_trans_id = preview.trans_id_file_id(b'file-id')
2705
3103
        preview.adjust_path('newname', preview.root, file_trans_id)
2706
3104
        preview_tree = preview.get_preview_tree()
2707
3105
        expected = [
2708
3106
            ('one', 'a\n'),
2709
3107
        ]
2710
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3108
        annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2711
3109
        self.assertEqual(expected, annotation)
2712
3110
 
2713
3111
    def test_annotate_deleted(self):
2714
3112
        tree = self.make_branch_and_tree('tree')
2715
 
        self.build_tree_contents([('tree/file', 'a\n')])
2716
 
        tree.add('file', 'file-id')
2717
 
        tree.commit('a', rev_id='one')
2718
 
        self.build_tree_contents([('tree/file', 'a\nb\n')])
 
3113
        self.build_tree_contents([('tree/file', b'a\n')])
 
3114
        tree.add('file', b'file-id')
 
3115
        tree.commit('a', rev_id=b'one')
 
3116
        self.build_tree_contents([('tree/file', b'a\nb\n')])
2719
3117
        preview = TransformPreview(tree)
2720
3118
        self.addCleanup(preview.finalize)
2721
 
        file_trans_id = preview.trans_id_file_id('file-id')
 
3119
        file_trans_id = preview.trans_id_file_id(b'file-id')
2722
3120
        preview.delete_contents(file_trans_id)
2723
3121
        preview_tree = preview.get_preview_tree()
2724
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3122
        annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2725
3123
        self.assertIs(None, annotation)
2726
3124
 
2727
3125
    def test_stored_kind(self):
2728
3126
        preview = self.get_empty_preview()
2729
 
        preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
 
3127
        preview.new_file('file', preview.root, 'a\nb\nc\n', b'file-id')
2730
3128
        preview_tree = preview.get_preview_tree()
2731
 
        self.assertEqual('file', preview_tree.stored_kind('file-id'))
 
3129
        self.assertEqual('file', preview_tree.stored_kind('file'))
2732
3130
 
2733
3131
    def test_is_executable(self):
2734
3132
        preview = self.get_empty_preview()
2735
 
        preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
2736
 
        preview.set_executability(True, preview.trans_id_file_id('file-id'))
 
3133
        preview.new_file('file', preview.root, 'a\nb\nc\n', b'file-id')
 
3134
        preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2737
3135
        preview_tree = preview.get_preview_tree()
2738
 
        self.assertEqual(True, preview_tree.is_executable('file-id'))
 
3136
        self.assertEqual(True, preview_tree.is_executable('file'))
2739
3137
 
2740
3138
    def test_get_set_parent_ids(self):
2741
3139
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2742
3140
        self.assertEqual([], preview_tree.get_parent_ids())
2743
 
        preview_tree.set_parent_ids(['rev-1'])
2744
 
        self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
 
3141
        preview_tree.set_parent_ids([b'rev-1'])
 
3142
        self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2745
3143
 
2746
3144
    def test_plan_file_merge(self):
2747
3145
        work_a = self.make_branch_and_tree('wta')
2748
 
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2749
 
        work_a.add('file', 'file-id')
 
3146
        self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
 
3147
        work_a.add('file', b'file-id')
2750
3148
        base_id = work_a.commit('base version')
2751
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3149
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2752
3150
        preview = TransformPreview(work_a)
2753
3151
        self.addCleanup(preview.finalize)
2754
 
        trans_id = preview.trans_id_file_id('file-id')
 
3152
        trans_id = preview.trans_id_file_id(b'file-id')
2755
3153
        preview.delete_contents(trans_id)
2756
3154
        preview.create_file('b\nc\nd\ne\n', trans_id)
2757
 
        self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
 
3155
        self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2758
3156
        tree_a = preview.get_preview_tree()
2759
3157
        tree_a.set_parent_ids([base_id])
2760
3158
        self.assertEqual([
2764
3162
            ('unchanged', 'd\n'),
2765
3163
            ('new-a', 'e\n'),
2766
3164
            ('new-b', 'f\n'),
2767
 
        ], list(tree_a.plan_file_merge('file-id', tree_b)))
 
3165
        ], list(tree_a.plan_file_merge(b'file-id', tree_b)))
2768
3166
 
2769
3167
    def test_plan_file_merge_revision_tree(self):
2770
3168
        work_a = self.make_branch_and_tree('wta')
2771
 
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2772
 
        work_a.add('file', 'file-id')
 
3169
        self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
 
3170
        work_a.add('file', b'file-id')
2773
3171
        base_id = work_a.commit('base version')
2774
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3172
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2775
3173
        preview = TransformPreview(work_a.basis_tree())
2776
3174
        self.addCleanup(preview.finalize)
2777
 
        trans_id = preview.trans_id_file_id('file-id')
 
3175
        trans_id = preview.trans_id_file_id(b'file-id')
2778
3176
        preview.delete_contents(trans_id)
2779
3177
        preview.create_file('b\nc\nd\ne\n', trans_id)
2780
 
        self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
 
3178
        self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2781
3179
        tree_a = preview.get_preview_tree()
2782
3180
        tree_a.set_parent_ids([base_id])
2783
3181
        self.assertEqual([
2787
3185
            ('unchanged', 'd\n'),
2788
3186
            ('new-a', 'e\n'),
2789
3187
            ('new-b', 'f\n'),
2790
 
        ], list(tree_a.plan_file_merge('file-id', tree_b)))
 
3188
        ], list(tree_a.plan_file_merge(b'file-id', tree_b)))
2791
3189
 
2792
3190
    def test_walkdirs(self):
2793
3191
        preview = self.get_empty_preview()
2796
3194
        preview.fixup_new_roots()
2797
3195
        preview_tree = preview.get_preview_tree()
2798
3196
        file_trans_id = preview.new_file('a', preview.root, 'contents',
2799
 
                                         'a-id')
2800
 
        expected = [(('', 'tree-root'),
2801
 
                    [('a', 'a', 'file', None, 'a-id', 'file')])]
 
3197
                                         b'a-id')
 
3198
        expected = [(('', b'tree-root'),
 
3199
                    [('a', 'a', 'file', None, b'a-id', 'file')])]
2802
3200
        self.assertEqual(expected, list(preview_tree.walkdirs()))
2803
3201
 
2804
3202
    def test_extras(self):
2810
3208
        self.addCleanup(preview.finalize)
2811
3209
        preview.new_file('new-file', preview.root, 'contents')
2812
3210
        preview.new_file('new-versioned-file', preview.root, 'contents',
2813
 
                         'new-versioned-id')
 
3211
                         b'new-versioned-id')
2814
3212
        tree = preview.get_preview_tree()
2815
3213
        preview.unversion_file(preview.trans_id_tree_path('removed-file'))
2816
 
        self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
 
3214
        self.assertEqual({'new-file', 'removed-file', 'existing-file'},
2817
3215
                         set(tree.extras()))
2818
3216
 
2819
3217
    def test_merge_into_preview(self):
2820
3218
        work_tree = self.make_branch_and_tree('tree')
2821
 
        self.build_tree_contents([('tree/file','b\n')])
2822
 
        work_tree.add('file', 'file-id')
 
3219
        self.build_tree_contents([('tree/file', b'b\n')])
 
3220
        work_tree.add('file', b'file-id')
2823
3221
        work_tree.commit('first commit')
2824
 
        child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
2825
 
        self.build_tree_contents([('child/file','b\nc\n')])
 
3222
        child_tree = work_tree.controldir.sprout('child').open_workingtree()
 
3223
        self.build_tree_contents([('child/file', b'b\nc\n')])
2826
3224
        child_tree.commit('child commit')
2827
3225
        child_tree.lock_write()
2828
3226
        self.addCleanup(child_tree.unlock)
2830
3228
        self.addCleanup(work_tree.unlock)
2831
3229
        preview = TransformPreview(work_tree)
2832
3230
        self.addCleanup(preview.finalize)
2833
 
        file_trans_id = preview.trans_id_file_id('file-id')
 
3231
        file_trans_id = preview.trans_id_file_id(b'file-id')
2834
3232
        preview.delete_contents(file_trans_id)
2835
3233
        preview.create_file('a\nb\n', file_trans_id)
2836
3234
        preview_tree = preview.get_preview_tree()
2837
 
        merger = Merger.from_revision_ids(None, preview_tree,
 
3235
        merger = Merger.from_revision_ids(preview_tree,
2838
3236
                                          child_tree.branch.last_revision(),
2839
3237
                                          other_branch=child_tree.branch,
2840
3238
                                          tree_branch=work_tree.branch)
2842
3240
        tt = merger.make_merger().make_preview_transform()
2843
3241
        self.addCleanup(tt.finalize)
2844
3242
        final_tree = tt.get_preview_tree()
2845
 
        self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
 
3243
        self.assertEqual(
 
3244
                'a\nb\nc\n',
 
3245
                final_tree.get_file_text(final_tree.id2path(b'file-id')))
2846
3246
 
2847
3247
    def test_merge_preview_into_workingtree(self):
2848
3248
        tree = self.make_branch_and_tree('tree')
2849
 
        tree.set_root_id('TREE_ROOT')
 
3249
        tree.set_root_id(b'TREE_ROOT')
2850
3250
        tt = TransformPreview(tree)
2851
3251
        self.addCleanup(tt.finalize)
2852
 
        tt.new_file('name', tt.root, 'content', 'file-id')
 
3252
        tt.new_file('name', tt.root, 'content', b'file-id')
2853
3253
        tree2 = self.make_branch_and_tree('tree2')
2854
 
        tree2.set_root_id('TREE_ROOT')
 
3254
        tree2.set_root_id(b'TREE_ROOT')
2855
3255
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2856
 
                                         None, tree.basis_tree())
 
3256
                                         tree.basis_tree())
2857
3257
        merger.merge_type = Merge3Merger
2858
3258
        merger.do_merge()
2859
3259
 
2860
3260
    def test_merge_preview_into_workingtree_handles_conflicts(self):
2861
3261
        tree = self.make_branch_and_tree('tree')
2862
 
        self.build_tree_contents([('tree/foo', 'bar')])
2863
 
        tree.add('foo', 'foo-id')
 
3262
        self.build_tree_contents([('tree/foo', b'bar')])
 
3263
        tree.add('foo', b'foo-id')
2864
3264
        tree.commit('foo')
2865
3265
        tt = TransformPreview(tree)
2866
3266
        self.addCleanup(tt.finalize)
2867
 
        trans_id = tt.trans_id_file_id('foo-id')
 
3267
        trans_id = tt.trans_id_file_id(b'foo-id')
2868
3268
        tt.delete_contents(trans_id)
2869
3269
        tt.create_file('baz', trans_id)
2870
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2871
 
        self.build_tree_contents([('tree2/foo', 'qux')])
2872
 
        pb = None
 
3270
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
3271
        self.build_tree_contents([('tree2/foo', b'qux')])
2873
3272
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2874
 
                                         pb, tree.basis_tree())
 
3273
                                         tree.basis_tree())
2875
3274
        merger.merge_type = Merge3Merger
2876
3275
        merger.do_merge()
2877
3276
 
 
3277
    def test_has_filename(self):
 
3278
        wt = self.make_branch_and_tree('tree')
 
3279
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3280
        tt = TransformPreview(wt)
 
3281
        removed_id = tt.trans_id_tree_path('removed')
 
3282
        tt.delete_contents(removed_id)
 
3283
        tt.new_file('new', tt.root, 'contents')
 
3284
        modified_id = tt.trans_id_tree_path('modified')
 
3285
        tt.delete_contents(modified_id)
 
3286
        tt.create_file('modified-contents', modified_id)
 
3287
        self.addCleanup(tt.finalize)
 
3288
        tree = tt.get_preview_tree()
 
3289
        self.assertTrue(tree.has_filename('unmodified'))
 
3290
        self.assertFalse(tree.has_filename('not-present'))
 
3291
        self.assertFalse(tree.has_filename('removed'))
 
3292
        self.assertTrue(tree.has_filename('new'))
 
3293
        self.assertTrue(tree.has_filename('modified'))
 
3294
 
2878
3295
    def test_is_executable(self):
2879
3296
        tree = self.make_branch_and_tree('tree')
2880
3297
        preview = TransformPreview(tree)
2881
3298
        self.addCleanup(preview.finalize)
2882
3299
        preview.new_file('foo', preview.root, 'bar', 'baz-id')
2883
3300
        preview_tree = preview.get_preview_tree()
2884
 
        self.assertEqual(False, preview_tree.is_executable('baz-id',
2885
 
                                                           'tree/foo'))
2886
 
        self.assertEqual(False, preview_tree.is_executable('baz-id'))
 
3301
        self.assertEqual(False, preview_tree.is_executable('tree/foo', 'baz-id'))
 
3302
        self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2887
3303
 
2888
3304
    def test_commit_preview_tree(self):
2889
3305
        tree = self.make_branch_and_tree('tree')
2900
3316
        builder.finish_inventory()
2901
3317
        rev2_id = builder.commit('rev2')
2902
3318
        rev2_tree = tree.branch.repository.revision_tree(rev2_id)
2903
 
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
 
3319
        self.assertEqual('contents', rev2_tree.get_file_text('file'))
2904
3320
 
2905
3321
    def test_ascii_limbo_paths(self):
2906
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
3322
        self.requireFeature(features.UnicodeFilenameFeature)
2907
3323
        branch = self.make_branch('any')
2908
3324
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
2909
3325
        tt = TransformPreview(tree)
2926
3342
 
2927
3343
class TestSerializeTransform(tests.TestCaseWithTransport):
2928
3344
 
2929
 
    _test_needs_features = [tests.UnicodeFilenameFeature]
 
3345
    _test_needs_features = [features.UnicodeFilenameFeature]
2930
3346
 
2931
3347
    def get_preview(self, tree=None):
2932
3348
        if tree is None:
3007
3423
        return self.make_records(attribs, contents)
3008
3424
 
3009
3425
    def test_serialize_symlink_creation(self):
3010
 
        self.requireFeature(tests.SymlinkFeature)
 
3426
        self.requireFeature(features.SymlinkFeature)
3011
3427
        tt = self.get_preview()
3012
3428
        tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3013
3429
        self.assertSerializesTo(self.symlink_creation_records(), tt)
3014
3430
 
3015
3431
    def test_deserialize_symlink_creation(self):
3016
 
        self.requireFeature(tests.SymlinkFeature)
 
3432
        self.requireFeature(features.SymlinkFeature)
3017
3433
        tt = self.get_preview()
3018
3434
        tt.deserialize(iter(self.symlink_creation_records()))
3019
3435
        abspath = tt._limbo_name('new-1')
3023
3439
    def make_destruction_preview(self):
3024
3440
        tree = self.make_branch_and_tree('.')
3025
3441
        self.build_tree([u'foo\u1234', 'bar'])
3026
 
        tree.add([u'foo\u1234', 'bar'], ['foo-id', 'bar-id'])
 
3442
        tree.add([u'foo\u1234', 'bar'], [b'foo-id', b'bar-id'])
3027
3443
        return self.get_preview(tree)
3028
3444
 
3029
3445
    def destruction_records(self):
3040
3456
 
3041
3457
    def test_serialize_destruction(self):
3042
3458
        tt = self.make_destruction_preview()
3043
 
        foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
3459
        foo_trans_id = tt.trans_id_tree_path(u'foo\u1234')
3044
3460
        tt.unversion_file(foo_trans_id)
3045
 
        bar_trans_id = tt.trans_id_tree_file_id('bar-id')
 
3461
        bar_trans_id = tt.trans_id_tree_path('bar')
3046
3462
        tt.delete_contents(bar_trans_id)
3047
3463
        self.assertSerializesTo(self.destruction_records(), tt)
3048
3464
 
3055
3471
        self.assertEqual({'new-1': u'foo\u1234',
3056
3472
                          'new-2': 'bar',
3057
3473
                          tt.root: ''}, tt._tree_id_paths)
3058
 
        self.assertEqual(set(['new-1']), tt._removed_id)
3059
 
        self.assertEqual(set(['new-2']), tt._removed_contents)
 
3474
        self.assertEqual({'new-1'}, tt._removed_id)
 
3475
        self.assertEqual({'new-2'}, tt._removed_contents)
3060
3476
 
3061
3477
    def missing_records(self):
3062
3478
        attribs = self.default_attribs()
3076
3492
        self.assertEqual({'boo': 'new-1'}, tt._non_present_ids)
3077
3493
 
3078
3494
    def make_modification_preview(self):
3079
 
        LINES_ONE = 'aa\nbb\ncc\ndd\n'
3080
 
        LINES_TWO = 'z\nbb\nx\ndd\n'
 
3495
        LINES_ONE = b'aa\nbb\ncc\ndd\n'
 
3496
        LINES_TWO = b'z\nbb\nx\ndd\n'
3081
3497
        tree = self.make_branch_and_tree('tree')
3082
3498
        self.build_tree_contents([('tree/file', LINES_ONE)])
3083
 
        tree.add('file', 'file-id')
 
3499
        tree.add('file', b'file-id')
3084
3500
        return self.get_preview(tree), LINES_TWO
3085
3501
 
3086
3502
    def modification_records(self):
3110
3526
        LINES = 'a\nb\nc\nd\n'
3111
3527
        tree = self.make_branch_and_tree('tree')
3112
3528
        self.build_tree(['tree/foo/'])
3113
 
        tree.add('foo', 'foo-id')
 
3529
        tree.add('foo', b'foo-id')
3114
3530
        return self.get_preview(tree), LINES
3115
3531
 
3116
3532
    def kind_change_records(self):
3126
3542
 
3127
3543
    def test_serialize_kind_change(self):
3128
3544
        tt, LINES = self.make_kind_change_preview()
3129
 
        trans_id = tt.trans_id_file_id('foo-id')
 
3545
        trans_id = tt.trans_id_file_id(b'foo-id')
3130
3546
        tt.delete_contents(trans_id)
3131
3547
        tt.create_file(LINES, trans_id)
3132
3548
        self.assertSerializesTo(self.kind_change_records(), tt)
3166
3582
        self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3167
3583
 
3168
3584
    def test_get_parents_lines(self):
3169
 
        LINES_ONE = 'aa\nbb\ncc\ndd\n'
3170
 
        LINES_TWO = 'z\nbb\nx\ndd\n'
 
3585
        LINES_ONE = b'aa\nbb\ncc\ndd\n'
 
3586
        LINES_TWO = b'z\nbb\nx\ndd\n'
3171
3587
        tree = self.make_branch_and_tree('tree')
3172
3588
        self.build_tree_contents([('tree/file', LINES_ONE)])
3173
 
        tree.add('file', 'file-id')
 
3589
        tree.add('file', b'file-id')
3174
3590
        tt = self.get_preview(tree)
3175
3591
        trans_id = tt.trans_id_tree_path('file')
3176
3592
        self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3177
3593
            tt._get_parents_lines(trans_id))
3178
3594
 
3179
3595
    def test_get_parents_texts(self):
3180
 
        LINES_ONE = 'aa\nbb\ncc\ndd\n'
3181
 
        LINES_TWO = 'z\nbb\nx\ndd\n'
 
3596
        LINES_ONE = b'aa\nbb\ncc\ndd\n'
 
3597
        LINES_TWO = b'z\nbb\nx\ndd\n'
3182
3598
        tree = self.make_branch_and_tree('tree')
3183
3599
        self.build_tree_contents([('tree/file', LINES_ONE)])
3184
 
        tree.add('file', 'file-id')
 
3600
        tree.add('file', b'file-id')
3185
3601
        tt = self.get_preview(tree)
3186
3602
        trans_id = tt.trans_id_tree_path('file')
3187
3603
        self.assertEqual((LINES_ONE,),
3188
3604
            tt._get_parents_texts(trans_id))
 
3605
 
 
3606
 
 
3607
class TestOrphan(tests.TestCaseWithTransport):
 
3608
 
 
3609
    def test_no_orphan_for_transform_preview(self):
 
3610
        tree = self.make_branch_and_tree('tree')
 
3611
        tt = transform.TransformPreview(tree)
 
3612
        self.addCleanup(tt.finalize)
 
3613
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
3614
 
 
3615
    def _set_orphan_policy(self, wt, policy):
 
3616
        wt.branch.get_config_stack().set('transform.orphan_policy',
 
3617
                                               policy)
 
3618
 
 
3619
    def _prepare_orphan(self, wt):
 
3620
        self.build_tree(['dir/', 'dir/file', 'dir/foo'])
 
3621
        wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
 
3622
        wt.commit('add dir and file ignoring foo')
 
3623
        tt = transform.TreeTransform(wt)
 
3624
        self.addCleanup(tt.finalize)
 
3625
        # dir and bar are deleted
 
3626
        dir_tid = tt.trans_id_tree_path('dir')
 
3627
        file_tid = tt.trans_id_tree_path('dir/file')
 
3628
        orphan_tid = tt.trans_id_tree_path('dir/foo')
 
3629
        tt.delete_contents(file_tid)
 
3630
        tt.unversion_file(file_tid)
 
3631
        tt.delete_contents(dir_tid)
 
3632
        tt.unversion_file(dir_tid)
 
3633
        # There should be a conflict because dir still contain foo
 
3634
        raw_conflicts = tt.find_conflicts()
 
3635
        self.assertLength(1, raw_conflicts)
 
3636
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
 
3637
        return tt, orphan_tid
 
3638
 
 
3639
    def test_new_orphan_created(self):
 
3640
        wt = self.make_branch_and_tree('.')
 
3641
        self._set_orphan_policy(wt, 'move')
 
3642
        tt, orphan_tid = self._prepare_orphan(wt)
 
3643
        warnings = []
 
3644
        def warning(*args):
 
3645
            warnings.append(args[0] % args[1:])
 
3646
        self.overrideAttr(trace, 'warning', warning)
 
3647
        remaining_conflicts = resolve_conflicts(tt)
 
3648
        self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
 
3649
                          warnings)
 
3650
        # Yeah for resolved conflicts !
 
3651
        self.assertLength(0, remaining_conflicts)
 
3652
        # We have a new orphan
 
3653
        self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
 
3654
        self.assertEqual('brz-orphans',
 
3655
                          tt.final_name(tt.final_parent(orphan_tid)))
 
3656
 
 
3657
    def test_never_orphan(self):
 
3658
        wt = self.make_branch_and_tree('.')
 
3659
        self._set_orphan_policy(wt, 'conflict')
 
3660
        tt, orphan_tid = self._prepare_orphan(wt)
 
3661
        remaining_conflicts = resolve_conflicts(tt)
 
3662
        self.assertLength(1, remaining_conflicts)
 
3663
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3664
                         remaining_conflicts.pop())
 
3665
 
 
3666
    def test_orphan_error(self):
 
3667
        def bogus_orphan(tt, orphan_id, parent_id):
 
3668
            raise transform.OrphaningError(tt.final_name(orphan_id),
 
3669
                                           tt.final_name(parent_id))
 
3670
        transform.orphaning_registry.register('bogus', bogus_orphan,
 
3671
                                              'Raise an error when orphaning')
 
3672
        wt = self.make_branch_and_tree('.')
 
3673
        self._set_orphan_policy(wt, 'bogus')
 
3674
        tt, orphan_tid = self._prepare_orphan(wt)
 
3675
        remaining_conflicts = resolve_conflicts(tt)
 
3676
        self.assertLength(1, remaining_conflicts)
 
3677
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3678
                         remaining_conflicts.pop())
 
3679
 
 
3680
    def test_unknown_orphan_policy(self):
 
3681
        wt = self.make_branch_and_tree('.')
 
3682
        # Set a fictional policy nobody ever implemented
 
3683
        self._set_orphan_policy(wt, 'donttouchmypreciouuus')
 
3684
        tt, orphan_tid = self._prepare_orphan(wt)
 
3685
        warnings = []
 
3686
        def warning(*args):
 
3687
            warnings.append(args[0] % args[1:])
 
3688
        self.overrideAttr(trace, 'warning', warning)
 
3689
        remaining_conflicts = resolve_conflicts(tt)
 
3690
        # We fallback to the default policy which create a conflict
 
3691
        self.assertLength(1, remaining_conflicts)
 
3692
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3693
                         remaining_conflicts.pop())
 
3694
        self.assertLength(1, warnings)
 
3695
        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
 
3696
 
 
3697
 
 
3698
class TestTransformHooks(tests.TestCaseWithTransport):
 
3699
 
 
3700
    def setUp(self):
 
3701
        super(TestTransformHooks, self).setUp()
 
3702
        self.wt = self.make_branch_and_tree('.')
 
3703
        os.chdir('..')
 
3704
 
 
3705
    def get_transform(self):
 
3706
        transform = TreeTransform(self.wt)
 
3707
        self.addCleanup(transform.finalize)
 
3708
        return transform, transform.root
 
3709
 
 
3710
    def test_pre_commit_hooks(self):
 
3711
        calls = []
 
3712
        def record_pre_transform(tree, tt):
 
3713
            calls.append((tree, tt))
 
3714
        MutableTree.hooks.install_named_hook('pre_transform',
 
3715
            record_pre_transform, "Pre transform")
 
3716
        transform, root = self.get_transform()
 
3717
        old_root_id = transform.tree_file_id(root)
 
3718
        transform.apply()
 
3719
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3720
        self.assertEqual([(self.wt, transform)], calls)
 
3721
 
 
3722
    def test_post_commit_hooks(self):
 
3723
        calls = []
 
3724
        def record_post_transform(tree, tt):
 
3725
            calls.append((tree, tt))
 
3726
        MutableTree.hooks.install_named_hook('post_transform',
 
3727
            record_post_transform, "Post transform")
 
3728
        transform, root = self.get_transform()
 
3729
        old_root_id = transform.tree_file_id(root)
 
3730
        transform.apply()
 
3731
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3732
        self.assertEqual([(self.wt, transform)], calls)
 
3733
 
 
3734
 
 
3735
class TestLinkTree(tests.TestCaseWithTransport):
 
3736
 
 
3737
    _test_needs_features = [HardlinkFeature]
 
3738
 
 
3739
    def setUp(self):
 
3740
        tests.TestCaseWithTransport.setUp(self)
 
3741
        self.parent_tree = self.make_branch_and_tree('parent')
 
3742
        self.parent_tree.lock_write()
 
3743
        self.addCleanup(self.parent_tree.unlock)
 
3744
        self.build_tree_contents([('parent/foo', b'bar')])
 
3745
        self.parent_tree.add('foo')
 
3746
        self.parent_tree.commit('added foo')
 
3747
        child_controldir = self.parent_tree.controldir.sprout('child')
 
3748
        self.child_tree = child_controldir.open_workingtree()
 
3749
 
 
3750
    def hardlinked(self):
 
3751
        parent_stat = os.lstat(self.parent_tree.abspath('foo'))
 
3752
        child_stat = os.lstat(self.child_tree.abspath('foo'))
 
3753
        return parent_stat.st_ino == child_stat.st_ino
 
3754
 
 
3755
    def test_link_fails_if_modified(self):
 
3756
        """If the file to be linked has modified text, don't link."""
 
3757
        self.build_tree_contents([('child/foo', b'baz')])
 
3758
        transform.link_tree(self.child_tree, self.parent_tree)
 
3759
        self.assertFalse(self.hardlinked())
 
3760
 
 
3761
    def test_link_fails_if_execute_bit_changed(self):
 
3762
        """If the file to be linked has modified execute bit, don't link."""
 
3763
        tt = TreeTransform(self.child_tree)
 
3764
        try:
 
3765
            trans_id = tt.trans_id_tree_path('foo')
 
3766
            tt.set_executability(True, trans_id)
 
3767
            tt.apply()
 
3768
        finally:
 
3769
            tt.finalize()
 
3770
        transform.link_tree(self.child_tree, self.parent_tree)
 
3771
        self.assertFalse(self.hardlinked())
 
3772
 
 
3773
    def test_link_succeeds_if_unmodified(self):
 
3774
        """If the file to be linked is unmodified, link"""
 
3775
        transform.link_tree(self.child_tree, self.parent_tree)
 
3776
        self.assertTrue(self.hardlinked())