/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: 2017-11-21 20:14:44 UTC
  • mfrom: (6821.1.1 ignore-warnings)
  • Revision ID: jelmer@jelmer.uk-20171121201444-dvb7yjku3zwjev83
Merge lp:~jelmer/brz/ignore-warnings.

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,
26
26
    generate_ids,
27
27
    osutils,
28
 
    progress,
29
28
    revision as _mod_revision,
30
29
    rules,
31
30
    tests,
 
31
    trace,
 
32
    transform,
32
33
    urlutils,
33
34
    )
34
 
from bzrlib.bzrdir import BzrDir
35
 
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
36
 
                              UnversionedParent, ParentLoop, DeletingParent,
37
 
                              NonDirectoryParent)
38
 
from bzrlib.diff import show_diff_trees
39
 
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
40
 
                           ReusingTransform, CantMoveRoot,
41
 
                           PathsNotVersionedError, ExistingLimbo,
42
 
                           ExistingPendingDeletion, ImmortalLimbo,
43
 
                           ImmortalPendingDeletion, LockError)
44
 
from bzrlib.osutils import file_kind, pathjoin
45
 
from bzrlib.merge import Merge3Merger, Merger
46
 
from bzrlib.tests import (
 
35
from ..conflicts import (
 
36
    DeletingParent,
 
37
    DuplicateEntry,
 
38
    DuplicateID,
 
39
    MissingParent,
 
40
    NonDirectoryParent,
 
41
    ParentLoop,
 
42
    UnversionedParent,
 
43
)
 
44
from ..controldir import ControlDir
 
45
from ..diff import show_diff_trees
 
46
from ..errors import (
 
47
    DuplicateKey,
 
48
    ExistingLimbo,
 
49
    ExistingPendingDeletion,
 
50
    ImmortalLimbo,
 
51
    ImmortalPendingDeletion,
 
52
    LockError,
 
53
    MalformedTransform,
 
54
    ReusingTransform,
 
55
)
 
56
from ..osutils import (
 
57
    file_kind,
 
58
    pathjoin,
 
59
)
 
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 (
47
71
    HardlinkFeature,
48
72
    SymlinkFeature,
49
 
    TestCase,
50
 
    TestCaseInTempDir,
51
 
    TestSkipped,
52
73
    )
53
 
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
54
 
                              resolve_conflicts, cook_conflicts,
55
 
                              build_tree, get_backup_name,
56
 
                              _FileMover, resolve_checkout,
57
 
                              TransformPreview, create_from_tree)
 
74
from ..transform import (
 
75
    build_tree,
 
76
    create_from_tree,
 
77
    cook_conflicts,
 
78
    _FileMover,
 
79
    FinalPaths,
 
80
    resolve_conflicts,
 
81
    resolve_checkout,
 
82
    ROOT_PARENT,
 
83
    TransformPreview,
 
84
    TreeTransform,
 
85
)
58
86
 
59
87
 
60
88
class TestTreeTransform(tests.TestCaseWithTransport):
61
89
 
62
90
    def setUp(self):
63
91
        super(TestTreeTransform, self).setUp()
64
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
92
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
65
93
        os.chdir('..')
66
94
 
67
95
    def get_transform(self):
69
97
        self.addCleanup(transform.finalize)
70
98
        return transform, transform.root
71
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
 
72
110
    def test_existing_limbo(self):
73
111
        transform, root = self.get_transform()
74
112
        limbo_name = transform._limbodir
101
139
        imaginary_id = transform.trans_id_tree_path('imaginary')
102
140
        imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
141
        self.assertEqual(imaginary_id, imaginary_id2)
104
 
        self.assertEqual(transform.get_tree_parent(imaginary_id), root)
105
 
        self.assertEqual(transform.final_kind(root), 'directory')
106
 
        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))
107
145
        trans_id = transform.create_path('name', root)
108
146
        self.assertIs(transform.final_file_id(trans_id), None)
109
 
        self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
 
147
        self.assertIs(None, transform.final_kind(trans_id))
110
148
        transform.create_file('contents', trans_id)
111
149
        transform.set_executability(True, trans_id)
112
150
        transform.version_file('my_pretties', trans_id)
124
162
        transform.set_executability(False, trans_id2)
125
163
        transform.version_file('my_pretties2', trans_id2)
126
164
        modified_paths = transform.apply().modified_paths
127
 
        self.assertEqual('contents', self.wt.get_file_byname('name').read())
 
165
        self.assertEqual('contents', self.wt.get_file('name').read())
128
166
        self.assertEqual(self.wt.path2id('name'), 'my_pretties')
129
 
        self.assertIs(self.wt.is_executable('my_pretties'), True)
130
 
        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)
131
169
        self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
132
170
        self.assertEqual(len(modified_paths), 3)
133
171
        tree_mod_paths = [self.wt.id2abspath(f) for f in
137
175
        transform.finalize()
138
176
        transform.finalize()
139
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
 
140
239
    def test_create_files_same_timestamp(self):
141
240
        transform, root = self.get_transform()
142
241
        self.wt.lock_tree_write()
150
249
        transform.create_file('content-two',
151
250
                              transform.create_path('two', root))
152
251
        transform.apply()
153
 
        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)
154
253
        fo.close()
155
 
        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)
156
255
        fo.close()
157
256
        # We only guarantee 2s resolution
158
257
        self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
190
289
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
191
290
        self.assertRaises(ValueError, transform.fixup_new_roots)
192
291
 
 
292
    def test_retain_existing_root(self):
 
293
        tt, root = self.get_transform()
 
294
        with tt:
 
295
            tt.new_directory('', ROOT_PARENT, 'new-root-id')
 
296
            tt.fixup_new_roots()
 
297
            self.assertNotEqual('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, 'new-root-id')
 
302
        child = tt.new_directory('child', new_trans_id, '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('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, 'new-root-id')
 
325
        new_trans_id = transform.new_directory('', ROOT_PARENT, '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())
 
353
 
193
354
    def test_hardlink(self):
194
355
        self.requireFeature(HardlinkFeature)
195
356
        transform, root = self.get_transform()
200
361
        trans_id = target_transform.create_path('file1', target_transform.root)
201
362
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
363
        target_transform.apply()
203
 
        self.failUnlessExists('target/file1')
 
364
        self.assertPathExists('target/file1')
204
365
        source_stat = os.stat(self.wt.abspath('file1'))
205
366
        target_stat = os.stat('target/file1')
206
367
        self.assertEqual(source_stat, target_stat)
221
382
        self.assertRaises(ReusingTransform, transform.find_conflicts)
222
383
        self.assertEqual('contents', file(self.wt.abspath('name')).read())
223
384
        self.assertEqual(self.wt.path2id('name'), 'my_pretties')
224
 
        self.assertIs(self.wt.is_executable('my_pretties'), True)
 
385
        self.assertIs(self.wt.is_executable('name'), True)
225
386
        self.assertEqual(self.wt.path2id('oz'), 'oz-id')
226
387
        self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
227
388
        self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
228
389
 
229
390
        self.assertEqual('toto-contents',
230
 
                         self.wt.get_file_byname('oz/dorothy/toto').read())
231
 
        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)
232
393
 
233
394
    def test_tree_reference(self):
234
395
        transform, root = self.get_transform()
239
400
        tree.lock_read()
240
401
        self.addCleanup(tree.unlock)
241
402
        self.assertEqual('subtree-revision',
242
 
                         tree.inventory['subtree-id'].reference_revision)
 
403
                         tree.root_inventory['subtree-id'].reference_revision)
243
404
 
244
405
    def test_conflicts(self):
245
406
        transform, root = self.get_transform()
296
457
        newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
297
458
        result = transform2.find_conflicts()
298
459
        fp = FinalPaths(transform2)
299
 
        self.assert_('oz/tip' in transform2._tree_path_ids)
 
460
        self.assertTrue('oz/tip' in transform2._tree_path_ids)
300
461
        self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
301
462
        self.assertEqual(len(result), 2)
302
463
        self.assertEqual((result[0][0], result[0][1]),
372
533
        transform.new_file('FiLe', transform.root, 'content')
373
534
        resolve_conflicts(transform)
374
535
        transform.apply()
375
 
        self.failUnlessExists('tree/file')
376
 
        self.failUnlessExists('tree/FiLe.moved')
 
536
        self.assertPathExists('tree/file')
 
537
        self.assertPathExists('tree/FiLe.moved')
377
538
 
378
539
    def test_resolve_checkout_case_conflict(self):
379
540
        tree = self.make_branch_and_tree('tree')
388
549
        resolve_conflicts(transform,
389
550
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
390
551
        transform.apply()
391
 
        self.failUnlessExists('tree/file')
392
 
        self.failUnlessExists('tree/FiLe.moved')
 
552
        self.assertPathExists('tree/file')
 
553
        self.assertPathExists('tree/FiLe.moved')
393
554
 
394
555
    def test_apply_case_conflict(self):
395
556
        """Ensure that a transform with case conflicts can always be applied"""
403
564
        transform.new_file('dirFiLe', dir, 'content')
404
565
        resolve_conflicts(transform)
405
566
        transform.apply()
406
 
        self.failUnlessExists('tree/file')
 
567
        self.assertPathExists('tree/file')
407
568
        if not os.path.exists('tree/FiLe.moved'):
408
 
            self.failUnlessExists('tree/FiLe')
409
 
        self.failUnlessExists('tree/dir/dirfile')
 
569
            self.assertPathExists('tree/FiLe')
 
570
        self.assertPathExists('tree/dir/dirfile')
410
571
        if not os.path.exists('tree/dir/dirFiLe.moved'):
411
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
572
            self.assertPathExists('tree/dir/dirFiLe')
412
573
 
413
574
    def test_case_insensitive_limbo(self):
414
575
        tree = self.make_branch_and_tree('tree')
471
632
        create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
472
633
        create_tree.apply()
473
634
 
474
 
        mangle_tree,root = self.get_transform()
 
635
        mangle_tree, root = self.get_transform()
475
636
        root = mangle_tree.root
476
637
        #swap names
477
638
        name1 = mangle_tree.trans_id_tree_file_id('name1')
499
660
        mangle_tree.apply()
500
661
        self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
501
662
        self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
502
 
        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
 
663
        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
503
664
        self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
504
665
        self.assertEqual(file(mfile2_path).read(), 'later2')
505
666
        self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
506
667
        self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
507
 
        newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
 
668
        newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
508
669
        self.assertEqual(file(newfile_path).read(), 'hello3')
509
670
        self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
510
671
        self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
511
 
        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
 
672
        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
512
673
 
513
674
    def test_both_rename(self):
514
 
        create_tree,root = self.get_transform()
 
675
        create_tree, root = self.get_transform()
515
676
        newdir = create_tree.new_directory('selftest', root, 'selftest-id')
516
677
        create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
517
678
        create_tree.apply()
518
 
        mangle_tree,root = self.get_transform()
 
679
        mangle_tree, root = self.get_transform()
519
680
        selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
520
681
        blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
521
682
        mangle_tree.adjust_path('test', root, selftest)
524
685
        mangle_tree.apply()
525
686
 
526
687
    def test_both_rename2(self):
527
 
        create_tree,root = self.get_transform()
528
 
        bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
529
 
        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')
530
691
        blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
531
692
        create_tree.new_file('test_too_much.py', blackbox, 'hello1',
532
693
                             'test_too_much-id')
533
694
        create_tree.apply()
534
 
        mangle_tree,root = self.get_transform()
535
 
        bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
 
695
        mangle_tree, root = self.get_transform()
 
696
        breezy = mangle_tree.trans_id_tree_file_id('breezy-id')
536
697
        tests = mangle_tree.trans_id_tree_file_id('tests-id')
537
698
        test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
538
 
        mangle_tree.adjust_path('selftest', bzrlib, tests)
 
699
        mangle_tree.adjust_path('selftest', breezy, tests)
539
700
        mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
540
701
        mangle_tree.set_executability(True, test_too_much)
541
702
        mangle_tree.apply()
542
703
 
543
704
    def test_both_rename3(self):
544
 
        create_tree,root = self.get_transform()
 
705
        create_tree, root = self.get_transform()
545
706
        tests = create_tree.new_directory('tests', root, 'tests-id')
546
707
        create_tree.new_file('test_too_much.py', tests, 'hello1',
547
708
                             'test_too_much-id')
548
709
        create_tree.apply()
549
 
        mangle_tree,root = self.get_transform()
 
710
        mangle_tree, root = self.get_transform()
550
711
        tests = mangle_tree.trans_id_tree_file_id('tests-id')
551
712
        test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
552
713
        mangle_tree.adjust_path('selftest', root, tests)
591
752
        resolve_conflicts(replace)
592
753
        replace.apply()
593
754
 
594
 
    def _test_symlinks(self, link_name1,link_target1,
 
755
    def _test_symlinks(self, link_name1, link_target1,
595
756
                       link_name2, link_target2):
596
757
 
597
758
        def ozpath(p): return 'oz/' + p
622
783
                            'wizard2', 'behind_curtain')
623
784
 
624
785
    def test_symlinks_unicode(self):
625
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
786
        self.requireFeature(features.UnicodeFilenameFeature)
626
787
        self._test_symlinks(u'\N{Euro Sign}wizard',
627
788
                            u'wizard-targ\N{Euro Sign}t',
628
789
                            u'\N{Euro Sign}wizard2',
641
802
        os.symlink = None
642
803
        try:
643
804
            err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
644
 
            self.assertEquals(
 
805
            self.assertEqual(
645
806
                "Unable to create symlink 'foo' on this platform",
646
807
                str(err))
647
808
        finally:
649
810
                os.symlink = os_symlink
650
811
 
651
812
    def get_conflicted(self):
652
 
        create,root = self.get_transform()
 
813
        create, root = self.get_transform()
653
814
        create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
654
815
        oz = create.new_directory('oz', root, 'oz-id')
655
816
        create.new_directory('emeraldcity', oz, 'emerald-id')
656
817
        create.apply()
657
 
        conflicts,root = self.get_transform()
 
818
        conflicts, root = self.get_transform()
658
819
        # set up duplicate entry, duplicate id
659
820
        new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
660
821
                                         'dorothy-id')
716
877
        raw_conflicts = resolve_conflicts(tt)
717
878
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
718
879
        tt.finalize()
719
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
880
        conflicts_s = [unicode(c) for c in cooked_conflicts]
720
881
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
721
882
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
722
883
                                         'Moved existing file to '
753
914
    def test_resolve_conflicts_wrong_existing_parent_kind(self):
754
915
        tt = self.prepare_wrong_parent_kind()
755
916
        raw_conflicts = resolve_conflicts(tt)
756
 
        self.assertEqual(set([('non-directory parent', 'Created directory',
757
 
                         'new-3')]), raw_conflicts)
 
917
        self.assertEqual({('non-directory parent', 'Created directory',
 
918
                         'new-3')}, raw_conflicts)
758
919
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
759
920
        self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
760
921
        'parent-id')], cooked_conflicts)
772
933
        tt.delete_contents(parent_id)
773
934
        tt.create_file('contents', parent_id)
774
935
        raw_conflicts = resolve_conflicts(tt)
775
 
        self.assertEqual(set([('non-directory parent', 'Created directory',
776
 
                         'new-3')]), raw_conflicts)
 
936
        self.assertEqual({('non-directory parent', 'Created directory',
 
937
                         'new-3')}, raw_conflicts)
777
938
        tt.apply()
778
939
        self.assertEqual(None, self.wt.path2id('parent'))
779
940
        self.assertEqual('parent-id', self.wt.path2id('parent.new'))
792
953
        self.assertIs(None, self.wt.path2id('parent'))
793
954
        self.assertIs(None, self.wt.path2id('parent.new'))
794
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)
 
970
 
795
971
    def test_moving_versioned_directories(self):
796
972
        create, root = self.get_transform()
797
973
        kansas = create.new_directory('kansas', root, 'kansas-id')
830
1006
        rename.set_executability(True, myfile)
831
1007
        rename.apply()
832
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
 
833
1047
    def test_set_executability_order(self):
834
1048
        """Ensure that executability behaves the same, no matter what order.
835
1049
 
852
1066
                                 'uws')
853
1067
        self.assertRaises(KeyError, transform.set_executability, None, uws)
854
1068
        transform.apply()
855
 
        self.assertTrue(wt.is_executable('soc'))
856
 
        self.assertTrue(wt.is_executable('sac'))
 
1069
        self.assertTrue(wt.is_executable('set_on_creation'))
 
1070
        self.assertTrue(wt.is_executable('set_after_creation'))
857
1071
 
858
1072
    def test_preserve_mode(self):
859
1073
        """File mode is preserved when replacing content"""
864
1078
        transform.apply()
865
1079
        self.wt.lock_write()
866
1080
        self.addCleanup(self.wt.unlock)
867
 
        self.assertTrue(self.wt.is_executable('file1-id'))
 
1081
        self.assertTrue(self.wt.is_executable('file1'))
868
1082
        transform, root = self.get_transform()
869
1083
        file1_id = transform.trans_id_tree_file_id('file1-id')
870
1084
        transform.delete_contents(file1_id)
871
1085
        transform.create_file('contents2', file1_id)
872
1086
        transform.apply()
873
 
        self.assertTrue(self.wt.is_executable('file1-id'))
 
1087
        self.assertTrue(self.wt.is_executable('file1'))
874
1088
 
875
1089
    def test__set_mode_stats_correctly(self):
876
1090
        """_set_mode stats to determine file mode."""
1107
1321
        parent2 = transform.new_directory('parent2', root)
1108
1322
        transform.adjust_path('child1', parent2, child1)
1109
1323
        transform.apply()
1110
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1111
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1324
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1325
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1112
1326
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1113
1327
        # no rename for child1 (counting only renames during apply)
1114
 
        self.failUnlessEqual(2, transform.rename_count)
 
1328
        self.assertEqual(2, transform.rename_count)
1115
1329
 
1116
1330
    def test_cancel_parent(self):
1117
1331
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1140
1354
        parent2 = transform.new_directory('parent2', root)
1141
1355
        transform.adjust_path('child1', parent2, child1)
1142
1356
        transform.apply()
1143
 
        self.failIfExists(self.wt.abspath('parent1'))
1144
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1357
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1358
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1145
1359
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1146
 
        self.failUnlessEqual(2, transform.rename_count)
 
1360
        self.assertEqual(2, transform.rename_count)
1147
1361
 
1148
1362
    def test_adjust_and_cancel(self):
1149
1363
        """Make sure adjust_path keeps track of limbo children properly"""
1182
1396
        child = transform.new_directory('child', parent)
1183
1397
        transform.adjust_path('parent', root, parent)
1184
1398
        transform.apply()
1185
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1399
        self.assertPathExists(self.wt.abspath('parent/child'))
1186
1400
        self.assertEqual(1, transform.rename_count)
1187
1401
 
1188
1402
    def test_reuse_name(self):
1264
1478
        # The rename will fail because the target directory is not empty (but
1265
1479
        # raises FileExists anyway).
1266
1480
        err = self.assertRaises(errors.FileExists, tt_helper)
1267
 
        self.assertContainsRe(str(err),
1268
 
            "^File exists: .+/baz")
 
1481
        self.assertEndsWith(err.path, "/baz")
1269
1482
 
1270
1483
    def test_two_directories_clash(self):
1271
1484
        def tt_helper():
1283
1496
                wt.unlock()
1284
1497
                raise
1285
1498
        err = self.assertRaises(errors.FileExists, tt_helper)
1286
 
        self.assertContainsRe(str(err),
1287
 
            "^File exists: .+/foo")
 
1499
        self.assertEndsWith(err.path, "/foo")
1288
1500
 
1289
1501
    def test_two_directories_clash_finalize(self):
1290
1502
        def tt_helper():
1302
1514
                tt.finalize()
1303
1515
                raise
1304
1516
        err = self.assertRaises(errors.FileExists, tt_helper)
1305
 
        self.assertContainsRe(str(err),
1306
 
            "^File exists: .+/foo")
 
1517
        self.assertEndsWith(err.path, "/foo")
1307
1518
 
1308
1519
    def test_file_to_directory(self):
1309
1520
        wt = self.make_branch_and_tree('.')
1319
1530
        tt.create_file(["aa\n"], bar_trans_id)
1320
1531
        tt.version_file("bar-1", bar_trans_id)
1321
1532
        tt.apply()
1322
 
        self.failUnlessExists("foo/bar")
 
1533
        self.assertPathExists("foo/bar")
1323
1534
        wt.lock_read()
1324
1535
        try:
1325
 
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1326
 
                    "directory")
 
1536
            self.assertEqual(wt.kind("foo"), "directory")
1327
1537
        finally:
1328
1538
            wt.unlock()
1329
1539
        wt.commit("two")
1342
1552
        tt.delete_contents(foo_trans_id)
1343
1553
        tt.create_symlink("bar", foo_trans_id)
1344
1554
        tt.apply()
1345
 
        self.failUnlessExists("foo")
 
1555
        self.assertPathExists("foo")
1346
1556
        wt.lock_read()
1347
1557
        self.addCleanup(wt.unlock)
1348
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1349
 
                "symlink")
 
1558
        self.assertEqual(wt.kind("foo"), "symlink")
1350
1559
 
1351
1560
    def test_dir_to_file(self):
1352
1561
        wt = self.make_branch_and_tree('.')
1361
1570
        tt.delete_versioned(bar_trans_id)
1362
1571
        tt.create_file(["aa\n"], foo_trans_id)
1363
1572
        tt.apply()
1364
 
        self.failUnlessExists("foo")
 
1573
        self.assertPathExists("foo")
1365
1574
        wt.lock_read()
1366
1575
        self.addCleanup(wt.unlock)
1367
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1368
 
                "file")
 
1576
        self.assertEqual(wt.kind("foo"), "file")
1369
1577
 
1370
1578
    def test_dir_to_hardlink(self):
1371
1579
        self.requireFeature(HardlinkFeature)
1382
1590
        self.build_tree(['baz'])
1383
1591
        tt.create_hardlink("baz", foo_trans_id)
1384
1592
        tt.apply()
1385
 
        self.failUnlessExists("foo")
1386
 
        self.failUnlessExists("baz")
 
1593
        self.assertPathExists("foo")
 
1594
        self.assertPathExists("baz")
1387
1595
        wt.lock_read()
1388
1596
        self.addCleanup(wt.unlock)
1389
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1390
 
                "file")
 
1597
        self.assertEqual(wt.kind("foo"), "file")
1391
1598
 
1392
1599
    def test_no_final_path(self):
1393
1600
        transform, root = self.get_transform()
1403
1610
        tree2 = self.make_branch_and_tree('tree2')
1404
1611
        tt = TreeTransform(tree2)
1405
1612
        foo_trans_id = tt.create_path('foo', tt.root)
1406
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
 
1613
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id='foo-id')
1407
1614
        bar_trans_id = tt.create_path('bar', tt.root)
1408
 
        create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
 
1615
        create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id='bar-id')
1409
1616
        tt.apply()
1410
1617
        self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1411
1618
        self.assertFileEqual('baz', 'tree2/bar')
1418
1625
        tree2 = self.make_branch_and_tree('tree2')
1419
1626
        tt = TreeTransform(tree2)
1420
1627
        foo_trans_id = tt.create_path('foo', tt.root)
1421
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
 
1628
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id='foo-id',
 
1629
                         bytes='qux')
1422
1630
        tt.apply()
1423
1631
        self.assertFileEqual('qux', 'tree2/foo')
1424
1632
 
1429
1637
        tree1.add('foo', 'foo-id')
1430
1638
        tt = TreeTransform(self.make_branch_and_tree('tree2'))
1431
1639
        foo_trans_id = tt.create_path('foo', tt.root)
1432
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
 
1640
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id='foo-id')
1433
1641
        tt.apply()
1434
1642
        self.assertEqual('bar', os.readlink('tree2/foo'))
1435
1643
 
1439
1647
    def __init__(self, dirname, root_id):
1440
1648
        self.name = dirname
1441
1649
        os.mkdir(dirname)
1442
 
        self.wt = BzrDir.create_standalone_workingtree(dirname)
 
1650
        self.wt = ControlDir.create_standalone_workingtree(dirname)
1443
1651
        self.wt.set_root_id(root_id)
1444
1652
        self.b = self.wt.branch
1445
1653
        self.tt = TreeTransform(self.wt)
1451
1659
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1452
1660
 
1453
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', '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', 'foo-id')
 
1675
        with TransformPreview(tree) as tt:
 
1676
            tt.unversion_file(tt.root)
 
1677
            tt.version_file('new-id', tt.root)
 
1678
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
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', '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_file_id('foo-id')
 
1691
            self.assertEqual([], tt._inventory_altered())
 
1692
 
 
1693
 
1454
1694
class TestTransformMerge(TestCaseInTempDir):
1455
1695
 
1456
1696
    def test_text_merge(self):
1490
1730
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1491
1731
 
1492
1732
        # textual merge
1493
 
        self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
 
1733
        self.assertEqual(this.wt.get_file(this.wt.id2path('a')).read(), 'y\nb\nc\nd\bz\n')
1494
1734
        # three-way text conflict
1495
 
        self.assertEqual(this.wt.get_file('b').read(),
 
1735
        self.assertEqual(this.wt.get_file(this.wt.id2path('b')).read(),
1496
1736
                         conflict_text('b', 'b2'))
1497
1737
        # OTHER wins
1498
 
        self.assertEqual(this.wt.get_file('c').read(), 'c2')
 
1738
        self.assertEqual(this.wt.get_file(this.wt.id2path('c')).read(), 'c2')
1499
1739
        # THIS wins
1500
 
        self.assertEqual(this.wt.get_file('d').read(), 'd2')
 
1740
        self.assertEqual(this.wt.get_file(this.wt.id2path('d')).read(), 'd2')
1501
1741
        # Ambigious clean merge
1502
 
        self.assertEqual(this.wt.get_file('e').read(), 'e2')
 
1742
        self.assertEqual(this.wt.get_file(this.wt.id2path('e')).read(), 'e2')
1503
1743
        # No change
1504
 
        self.assertEqual(this.wt.get_file('f').read(), 'f')
 
1744
        self.assertEqual(this.wt.get_file(this.wt.id2path('f')).read(), 'f')
1505
1745
        # Correct correct results when THIS == OTHER
1506
 
        self.assertEqual(this.wt.get_file('g').read(), 'g')
 
1746
        self.assertEqual(this.wt.get_file(this.wt.id2path('g')).read(), 'g')
1507
1747
        # Text conflict when THIS & OTHER are text and BASE is dir
1508
 
        self.assertEqual(this.wt.get_file('h').read(),
 
1748
        self.assertEqual(this.wt.get_file(this.wt.id2path('h')).read(),
1509
1749
                         conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1510
 
        self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
 
1750
        self.assertEqual(this.wt.get_file('h.THIS').read(),
1511
1751
                         '1\n2\n3\n4\n')
1512
 
        self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
 
1752
        self.assertEqual(this.wt.get_file('h.OTHER').read(),
1513
1753
                         'h\ni\nj\nk\n')
1514
1754
        self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1515
 
        self.assertEqual(this.wt.get_file('i').read(),
 
1755
        self.assertEqual(this.wt.get_file(this.wt.id2path('i')).read(),
1516
1756
                         conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1517
 
        self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
 
1757
        self.assertEqual(this.wt.get_file('i.THIS').read(),
1518
1758
                         '1\n2\n3\n4\n')
1519
 
        self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
 
1759
        self.assertEqual(this.wt.get_file('i.OTHER').read(),
1520
1760
                         'h\ni\nj\nk\n')
1521
1761
        self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1522
1762
        modified = ['a', 'b', 'c', 'h', 'i']
1523
1763
        merge_modified = this.wt.merge_modified()
1524
1764
        self.assertSubset(merge_modified, modified)
1525
1765
        self.assertEqual(len(merge_modified), len(modified))
1526
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1766
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
1527
1767
        modified.pop(0)
1528
1768
        merge_modified = this.wt.merge_modified()
1529
1769
        self.assertSubset(merge_modified, modified)
1643
1883
    def test_build_tree_with_symlinks(self):
1644
1884
        self.requireFeature(SymlinkFeature)
1645
1885
        os.mkdir('a')
1646
 
        a = BzrDir.create_standalone_workingtree('a')
 
1886
        a = ControlDir.create_standalone_workingtree('a')
1647
1887
        os.mkdir('a/foo')
1648
 
        file('a/foo/bar', 'wb').write('contents')
 
1888
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1649
1889
        os.symlink('a/foo/bar', 'a/foo/baz')
1650
1890
        a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1891
        a.commit('initial commit')
1652
 
        b = BzrDir.create_standalone_workingtree('b')
 
1892
        b = ControlDir.create_standalone_workingtree('b')
1653
1893
        basis = a.basis_tree()
1654
1894
        basis.lock_read()
1655
1895
        self.addCleanup(basis.unlock)
1660
1900
 
1661
1901
    def test_build_with_references(self):
1662
1902
        tree = self.make_branch_and_tree('source',
1663
 
            format='dirstate-with-subtree')
 
1903
            format='development-subtree')
1664
1904
        subtree = self.make_branch_and_tree('source/subtree',
1665
 
            format='dirstate-with-subtree')
 
1905
            format='development-subtree')
1666
1906
        tree.add_reference(subtree)
1667
1907
        tree.commit('a revision')
1668
1908
        tree.branch.create_checkout('target')
1669
 
        self.failUnlessExists('target')
1670
 
        self.failUnlessExists('target/subtree')
 
1909
        self.assertPathExists('target')
 
1910
        self.assertPathExists('target/subtree')
1671
1911
 
1672
1912
    def test_file_conflict_handling(self):
1673
1913
        """Ensure that when building trees, conflict handling is done"""
1720
1960
        source.commit('added file')
1721
1961
        build_tree(source.basis_tree(), target)
1722
1962
        self.assertEqual([], target.conflicts())
1723
 
        self.failUnlessExists('target/dir1/file')
 
1963
        self.assertPathExists('target/dir1/file')
1724
1964
 
1725
1965
        # Ensure contents are merged
1726
1966
        target = self.make_branch_and_tree('target2')
1727
1967
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1728
1968
        build_tree(source.basis_tree(), target)
1729
1969
        self.assertEqual([], target.conflicts())
1730
 
        self.failUnlessExists('target2/dir1/file2')
1731
 
        self.failUnlessExists('target2/dir1/file')
 
1970
        self.assertPathExists('target2/dir1/file2')
 
1971
        self.assertPathExists('target2/dir1/file')
1732
1972
 
1733
1973
        # Ensure new contents are suppressed for existing branches
1734
1974
        target = self.make_branch_and_tree('target3')
1735
1975
        self.make_branch('target3/dir1')
1736
1976
        self.build_tree(['target3/dir1/file2'])
1737
1977
        build_tree(source.basis_tree(), target)
1738
 
        self.failIfExists('target3/dir1/file')
1739
 
        self.failUnlessExists('target3/dir1/file2')
1740
 
        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')
1741
1981
        self.assertEqual([DuplicateEntry('Diverted to',
1742
1982
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1743
1983
            target.conflicts())
1746
1986
        self.build_tree(['target4/dir1/'])
1747
1987
        self.make_branch('target4/dir1/file')
1748
1988
        build_tree(source.basis_tree(), target)
1749
 
        self.failUnlessExists('target4/dir1/file')
 
1989
        self.assertPathExists('target4/dir1/file')
1750
1990
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1751
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1991
        self.assertPathExists('target4/dir1/file.diverted')
1752
1992
        self.assertEqual([DuplicateEntry('Diverted to',
1753
1993
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1754
1994
            target.conflicts())
1808
2048
        self.build_tree_contents([('source/file2', 'C')])
1809
2049
        calls = []
1810
2050
        real_source_get_file = source.get_file
1811
 
        def get_file(file_id, path=None):
 
2051
        def get_file(path, file_id=None):
1812
2052
            calls.append(file_id)
1813
 
            return real_source_get_file(file_id, path)
 
2053
            return real_source_get_file(path, file_id)
1814
2054
        source.get_file = get_file
1815
2055
        target = self.make_branch_and_tree('target')
1816
2056
        revision_tree = source.basis_tree()
1822
2062
        self.addCleanup(target.unlock)
1823
2063
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1824
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
 
1825
2077
    def test_build_tree_accelerator_tree_missing_file(self):
1826
2078
        source = self.create_ab_tree()
1827
2079
        os.unlink('source/file1')
1848
2100
        os.symlink('file2', 'source/file1')
1849
2101
        calls = []
1850
2102
        real_source_get_file = source.get_file
1851
 
        def get_file(file_id, path=None):
 
2103
        def get_file(path, file_id=None):
1852
2104
            calls.append(file_id)
1853
 
            return real_source_get_file(file_id, path)
 
2105
            return real_source_get_file(path, file_id)
1854
2106
        source.get_file = get_file
1855
2107
        target = self.make_branch_and_tree('target')
1856
2108
        revision_tree = source.basis_tree()
1911
2163
        trans_id = tt.trans_id_tree_file_id('file1-id')
1912
2164
        tt.set_executability(True, trans_id)
1913
2165
        tt.apply()
1914
 
        self.assertTrue(source.is_executable('file1-id'))
 
2166
        self.assertTrue(source.is_executable('file1'))
1915
2167
        target = self.make_branch_and_tree('target')
1916
2168
        revision_tree = source.basis_tree()
1917
2169
        revision_tree.lock_read()
1920
2172
        target.lock_read()
1921
2173
        self.addCleanup(target.unlock)
1922
2174
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1923
 
        self.assertTrue(source.is_executable('file1-id'))
 
2175
        self.assertTrue(source.is_executable('file1'))
1924
2176
 
1925
2177
    def install_rot13_content_filter(self, pattern):
1926
2178
        # We could use
1934
2186
        def rot13(chunks, context=None):
1935
2187
            return [''.join(chunks).encode('rot13')]
1936
2188
        rot13filter = filters.ContentFilter(rot13, rot13)
1937
 
        filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
 
2189
        filters.filter_stacks_registry.register(
 
2190
            'rot13', {'yes': [rot13filter]}.get)
1938
2191
        os.mkdir(self.test_home_dir + '/.bazaar')
1939
2192
        rules_filename = self.test_home_dir + '/.bazaar/rules'
1940
2193
        f = open(rules_filename, 'wb')
1970
2223
        self.assertEqualStat(source_stat, target_stat)
1971
2224
 
1972
2225
    def test_case_insensitive_build_tree_inventory(self):
1973
 
        if (tests.CaseInsensitiveFilesystemFeature.available()
1974
 
            or tests.CaseInsCasePresFilenameFeature.available()):
 
2226
        if (features.CaseInsensitiveFilesystemFeature.available()
 
2227
            or features.CaseInsCasePresFilenameFeature.available()):
1975
2228
            raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2229
        source = self.make_branch_and_tree('source')
1977
2230
        self.build_tree(['source/file', 'source/FILE'])
1985
2238
        self.assertEqual('file.moved', target.id2path('lower-id'))
1986
2239
        self.assertEqual('FILE', target.id2path('upper-id'))
1987
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
                   ['file1-id', 'dir-id', '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', 'file1-id'))
 
2272
        self.assertEqual(entry2_sha,
 
2273
                         target.get_file_sha1('dir/file2', 'file2-id'))
 
2274
        self.assertEqual(entry1_state, entry1[1][0])
 
2275
        self.assertEqual(entry2_state, entry2[1][0])
 
2276
 
1988
2277
 
1989
2278
class TestCommitTransform(tests.TestCaseWithTransport):
1990
2279
 
2057
2346
        rev = tt.commit(branch, 'message')
2058
2347
        tree = branch.basis_tree()
2059
2348
        self.assertEqual('file', tree.id2path('file-id'))
2060
 
        self.assertEqual('contents', tree.get_file_text('file-id'))
 
2349
        self.assertEqual('contents', tree.get_file_text('file', 'file-id'))
2061
2350
        self.assertEqual('dir', tree.id2path('dir-id'))
2062
2351
        if SymlinkFeature.available():
2063
2352
            self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2064
 
            self.assertEqual('target', tree.get_symlink_target('symlink-id'))
 
2353
            self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2065
2354
 
2066
2355
    def test_add_unversioned(self):
2067
2356
        branch, tt = self.get_branch_and_transform()
2091
2380
        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2092
2381
                          'message')
2093
2382
 
2094
 
 
2095
 
class MockTransform(object):
2096
 
 
2097
 
    def has_named_child(self, by_parent, parent_id, name):
2098
 
        for child_id in by_parent[parent_id]:
2099
 
            if child_id == '0':
2100
 
                if name == "name~":
2101
 
                    return True
2102
 
            elif name == "name.~%s~" % child_id:
2103
 
                return True
2104
 
        return False
2105
 
 
2106
 
 
2107
 
class MockEntry(object):
2108
 
    def __init__(self):
2109
 
        object.__init__(self)
2110
 
        self.name = "name"
2111
 
 
2112
 
 
2113
 
class TestGetBackupName(TestCase):
2114
 
    def test_get_backup_name(self):
2115
 
        tt = MockTransform()
2116
 
        name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2117
 
        self.assertEqual(name, 'name.~1~')
2118
 
        name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2119
 
        self.assertEqual(name, 'name.~2~')
2120
 
        name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2121
 
        self.assertEqual(name, 'name.~1~')
2122
 
        name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2123
 
        self.assertEqual(name, 'name.~1~')
2124
 
        name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2125
 
        self.assertEqual(name, 'name.~4~')
 
2383
    def test_commit_rich_revision_data(self):
 
2384
        branch, tt = self.get_branch_and_transform()
 
2385
        rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
 
2386
                           committer='me <me@example.com>',
 
2387
                           revprops={'foo': 'bar'}, revision_id='revid-1',
 
2388
                           authors=['Author1 <author1@example.com>',
 
2389
                              'Author2 <author2@example.com>',
 
2390
                               ])
 
2391
        self.assertEqual('revid-1', rev_id)
 
2392
        revision = branch.repository.get_revision(rev_id)
 
2393
        self.assertEqual(1, revision.timestamp)
 
2394
        self.assertEqual(43201, revision.timezone)
 
2395
        self.assertEqual('me <me@example.com>', revision.committer)
 
2396
        self.assertEqual(['Author1 <author1@example.com>',
 
2397
                          'Author2 <author2@example.com>'],
 
2398
                         revision.get_apparent_authors())
 
2399
        del revision.properties['authors']
 
2400
        self.assertEqual({'foo': 'bar',
 
2401
                          'branch-nick': 'tree'},
 
2402
                         revision.properties)
 
2403
 
 
2404
    def test_no_explicit_revprops(self):
 
2405
        branch, tt = self.get_branch_and_transform()
 
2406
        rev_id = tt.commit(branch, 'message', authors=[
 
2407
            'Author1 <author1@example.com>',
 
2408
            'Author2 <author2@example.com>', ])
 
2409
        revision = branch.repository.get_revision(rev_id)
 
2410
        self.assertEqual(['Author1 <author1@example.com>',
 
2411
                          'Author2 <author2@example.com>'],
 
2412
                         revision.get_apparent_authors())
 
2413
        self.assertEqual('tree', revision.properties['branch-nick'])
2126
2414
 
2127
2415
 
2128
2416
class TestFileMover(tests.TestCaseWithTransport):
2131
2419
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2132
2420
        mover = _FileMover()
2133
2421
        mover.rename('a', 'q')
2134
 
        self.failUnlessExists('q')
2135
 
        self.failIfExists('a')
2136
 
        self.failUnlessExists('q/b')
2137
 
        self.failUnlessExists('c')
2138
 
        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')
2139
2427
 
2140
2428
    def test_pre_delete_rollback(self):
2141
2429
        self.build_tree(['a/'])
2142
2430
        mover = _FileMover()
2143
2431
        mover.pre_delete('a', 'q')
2144
 
        self.failUnlessExists('q')
2145
 
        self.failIfExists('a')
 
2432
        self.assertPathExists('q')
 
2433
        self.assertPathDoesNotExist('a')
2146
2434
        mover.rollback()
2147
 
        self.failIfExists('q')
2148
 
        self.failUnlessExists('a')
 
2435
        self.assertPathDoesNotExist('q')
 
2436
        self.assertPathExists('a')
2149
2437
 
2150
2438
    def test_apply_deletions(self):
2151
2439
        self.build_tree(['a/', 'b/'])
2152
2440
        mover = _FileMover()
2153
2441
        mover.pre_delete('a', 'q')
2154
2442
        mover.pre_delete('b', 'r')
2155
 
        self.failUnlessExists('q')
2156
 
        self.failUnlessExists('r')
2157
 
        self.failIfExists('a')
2158
 
        self.failIfExists('b')
 
2443
        self.assertPathExists('q')
 
2444
        self.assertPathExists('r')
 
2445
        self.assertPathDoesNotExist('a')
 
2446
        self.assertPathDoesNotExist('b')
2159
2447
        mover.apply_deletions()
2160
 
        self.failIfExists('q')
2161
 
        self.failIfExists('r')
2162
 
        self.failIfExists('a')
2163
 
        self.failIfExists('b')
 
2448
        self.assertPathDoesNotExist('q')
 
2449
        self.assertPathDoesNotExist('r')
 
2450
        self.assertPathDoesNotExist('a')
 
2451
        self.assertPathDoesNotExist('b')
2164
2452
 
2165
2453
    def test_file_mover_rollback(self):
2166
2454
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2169
2457
        mover.rename('c/e', 'c/d')
2170
2458
        try:
2171
2459
            mover.rename('a', 'c')
2172
 
        except errors.FileExists, e:
 
2460
        except errors.FileExists as e:
2173
2461
            mover.rollback()
2174
 
        self.failUnlessExists('a')
2175
 
        self.failUnlessExists('c/d')
 
2462
        self.assertPathExists('a')
 
2463
        self.assertPathExists('c/d')
2176
2464
 
2177
2465
 
2178
2466
class Bogus(Exception):
2208
2496
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2209
2497
        self.assertRaises(Bogus, tt.apply,
2210
2498
                          _mover=self.ExceptionFileMover(bad_source='a'))
2211
 
        self.failUnlessExists('a')
2212
 
        self.failUnlessExists('a/b')
 
2499
        self.assertPathExists('a')
 
2500
        self.assertPathExists('a/b')
2213
2501
        tt.apply()
2214
 
        self.failUnlessExists('c')
2215
 
        self.failUnlessExists('c/d')
 
2502
        self.assertPathExists('c')
 
2503
        self.assertPathExists('c/d')
2216
2504
 
2217
2505
    def test_rollback_rename_into_place(self):
2218
2506
        tree = self.make_branch_and_tree('.')
2224
2512
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2225
2513
        self.assertRaises(Bogus, tt.apply,
2226
2514
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2227
 
        self.failUnlessExists('a')
2228
 
        self.failUnlessExists('a/b')
 
2515
        self.assertPathExists('a')
 
2516
        self.assertPathExists('a/b')
2229
2517
        tt.apply()
2230
 
        self.failUnlessExists('c')
2231
 
        self.failUnlessExists('c/d')
 
2518
        self.assertPathExists('c')
 
2519
        self.assertPathExists('c/d')
2232
2520
 
2233
2521
    def test_rollback_deletion(self):
2234
2522
        tree = self.make_branch_and_tree('.')
2240
2528
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2529
        self.assertRaises(Bogus, tt.apply,
2242
2530
                          _mover=self.ExceptionFileMover(bad_target='d'))
2243
 
        self.failUnlessExists('a')
2244
 
        self.failUnlessExists('a/b')
2245
 
 
2246
 
    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):
2247
2662
        wt = self.make_branch_and_tree('.')
 
2663
        self.build_tree(['dir/',])
 
2664
        wt.add(['dir'], ['dir-id'])
 
2665
        wt.commit('Create dir')
2248
2666
        tt = TreeTransform(wt)
2249
2667
        self.addCleanup(tt.finalize)
2250
 
        parent = tt.trans_id_file_id('parent-id')
2251
 
        tt.new_file('file', parent, 'Contents')
2252
 
        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_file_id('dir-id')
 
2673
        file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='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_file_id('dir-id')
 
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())
2253
2692
 
2254
2693
 
2255
2694
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
2695
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2696
                  (False, False))
2258
2697
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2698
              ('', ''), ('directory', 'directory'), (False, False))
2260
2699
 
2261
2700
 
2262
2701
class TestTransformPreview(tests.TestCaseWithTransport):
2293
2732
        self.addCleanup(preview.finalize)
2294
2733
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2295
2734
        preview_tree = preview.get_preview_tree()
2296
 
        self.assertEqual(preview_tree.kind('file2-id'), 'file')
 
2735
        self.assertEqual(preview_tree.kind('file2'), 'file')
2297
2736
        self.assertEqual(
2298
 
            preview_tree.get_file('file2-id').read(), 'content B\n')
 
2737
            preview_tree.get_file('file2', 'file2-id').read(), 'content B\n')
2299
2738
 
2300
2739
    def test_diff_preview_tree(self):
2301
2740
        revision_tree = self.create_tree()
2303
2742
        self.addCleanup(preview.finalize)
2304
2743
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2305
2744
        preview_tree = preview.get_preview_tree()
2306
 
        out = StringIO()
 
2745
        out = BytesIO()
2307
2746
        show_diff_trees(revision_tree, preview_tree, out)
2308
2747
        lines = out.getvalue().splitlines()
2309
2748
        self.assertEqual(lines[0], "=== added file 'file2'")
2331
2770
 
2332
2771
    def test_iter_changes(self):
2333
2772
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2334
 
        root = revision_tree.inventory.root.file_id
 
2773
        root = revision_tree.get_root_id()
2335
2774
        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2336
2775
                          (root, root), ('a', 'a'), ('file', 'file'),
2337
2776
                          (False, False))],
2341
2780
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2342
2781
        changes = preview_tree.iter_changes(revision_tree,
2343
2782
                                            include_unchanged=True)
2344
 
        root = revision_tree.inventory.root.file_id
 
2783
        root = revision_tree.get_root_id()
2345
2784
 
2346
2785
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2347
2786
 
2349
2788
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2350
2789
        changes = preview_tree.iter_changes(revision_tree,
2351
2790
                                            specific_files=[''])
2352
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2791
        self.assertEqual([A_ENTRY], list(changes))
2353
2792
 
2354
2793
    def test_want_unversioned(self):
2355
2794
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2356
2795
        changes = preview_tree.iter_changes(revision_tree,
2357
2796
                                            want_unversioned=True)
2358
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2797
        self.assertEqual([A_ENTRY], list(changes))
2359
2798
 
2360
2799
    def test_ignore_extra_trees_no_specific_files(self):
2361
2800
        # extra_trees is harmless without specific_files, so we'll silently
2380
2819
        preview.new_file('file', preview.root, 'contents', 'file-id')
2381
2820
        preview.new_directory('directory', preview.root, 'dir-id')
2382
2821
        preview_tree = preview.get_preview_tree()
2383
 
        self.assertEqual('file', preview_tree.kind('file-id'))
2384
 
        self.assertEqual('directory', preview_tree.kind('dir-id'))
 
2822
        self.assertEqual('file', preview_tree.kind('file'))
 
2823
        self.assertEqual('directory', preview_tree.kind('directory'))
2385
2824
 
2386
2825
    def test_get_file_mtime(self):
2387
2826
        preview = self.get_empty_preview()
2390
2829
        limbo_path = preview._limbo_name(file_trans_id)
2391
2830
        preview_tree = preview.get_preview_tree()
2392
2831
        self.assertEqual(os.stat(limbo_path).st_mtime,
2393
 
                         preview_tree.get_file_mtime('file-id'))
 
2832
                         preview_tree.get_file_mtime('file', 'file-id'))
2394
2833
 
2395
2834
    def test_get_file_mtime_renamed(self):
2396
2835
        work_tree = self.make_branch_and_tree('tree')
2401
2840
        file_trans_id = preview.trans_id_tree_file_id('file-id')
2402
2841
        preview.adjust_path('renamed', preview.root, file_trans_id)
2403
2842
        preview_tree = preview.get_preview_tree()
2404
 
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2405
 
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
 
2843
        preview_mtime = preview_tree.get_file_mtime('renamed', 'file-id')
 
2844
        work_mtime = work_tree.get_file_mtime('file', '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', 'old')])
 
2849
        work_tree.add('old', 'old-id')
 
2850
        preview = TransformPreview(work_tree)
 
2851
        self.addCleanup(preview.finalize)
 
2852
        new_id = preview.new_file('name', preview.root, 'contents', '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'))
2406
2857
 
2407
2858
    def test_get_file(self):
2408
2859
        preview = self.get_empty_preview()
2409
2860
        preview.new_file('file', preview.root, 'contents', 'file-id')
2410
2861
        preview_tree = preview.get_preview_tree()
2411
 
        tree_file = preview_tree.get_file('file-id')
 
2862
        tree_file = preview_tree.get_file('file')
2412
2863
        try:
2413
2864
            self.assertEqual('contents', tree_file.read())
2414
2865
        finally:
2420
2871
        preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2421
2872
        preview_tree = preview.get_preview_tree()
2422
2873
        self.assertEqual('target',
2423
 
                         preview_tree.get_symlink_target('symlink-id'))
 
2874
                         preview_tree.get_symlink_target('symlink'))
2424
2875
 
2425
2876
    def test_all_file_ids(self):
2426
2877
        tree = self.make_branch_and_tree('tree')
2433
2884
        preview.unversion_file(c_trans_id)
2434
2885
        preview.version_file('c-id', c_trans_id)
2435
2886
        preview_tree = preview.get_preview_tree()
2436
 
        self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
 
2887
        self.assertEqual({'a-id', 'c-id', tree.get_root_id()},
2437
2888
                         preview_tree.all_file_ids())
2438
2889
 
2439
2890
    def test_path2id_deleted_unchanged(self):
2625
3076
            ('me:', 'b\n'),
2626
3077
            ('me:', 'c\n'),
2627
3078
        ]
2628
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3079
        annotation = preview_tree.annotate_iter('file', default_revision='me:')
2629
3080
        self.assertEqual(expected, annotation)
2630
3081
 
2631
3082
    def test_annotate_missing(self):
2637
3088
            ('me:', 'b\n'),
2638
3089
            ('me:', 'c\n'),
2639
3090
         ]
2640
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3091
        annotation = preview_tree.annotate_iter('file', default_revision='me:')
2641
3092
        self.assertEqual(expected, annotation)
2642
3093
 
2643
3094
    def test_annotate_rename(self):
2653
3104
        expected = [
2654
3105
            ('one', 'a\n'),
2655
3106
        ]
2656
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3107
        annotation = preview_tree.annotate_iter('file', default_revision='me:')
2657
3108
        self.assertEqual(expected, annotation)
2658
3109
 
2659
3110
    def test_annotate_deleted(self):
2667
3118
        file_trans_id = preview.trans_id_file_id('file-id')
2668
3119
        preview.delete_contents(file_trans_id)
2669
3120
        preview_tree = preview.get_preview_tree()
2670
 
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
3121
        annotation = preview_tree.annotate_iter('file', default_revision='me:')
2671
3122
        self.assertIs(None, annotation)
2672
3123
 
2673
3124
    def test_stored_kind(self):
2674
3125
        preview = self.get_empty_preview()
2675
3126
        preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
2676
3127
        preview_tree = preview.get_preview_tree()
2677
 
        self.assertEqual('file', preview_tree.stored_kind('file-id'))
 
3128
        self.assertEqual('file', preview_tree.stored_kind('file'))
2678
3129
 
2679
3130
    def test_is_executable(self):
2680
3131
        preview = self.get_empty_preview()
2681
3132
        preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
2682
3133
        preview.set_executability(True, preview.trans_id_file_id('file-id'))
2683
3134
        preview_tree = preview.get_preview_tree()
2684
 
        self.assertEqual(True, preview_tree.is_executable('file-id'))
 
3135
        self.assertEqual(True, preview_tree.is_executable('file'))
2685
3136
 
2686
3137
    def test_get_set_parent_ids(self):
2687
3138
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2694
3145
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2695
3146
        work_a.add('file', 'file-id')
2696
3147
        base_id = work_a.commit('base version')
2697
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3148
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3149
        preview = TransformPreview(work_a)
2699
3150
        self.addCleanup(preview.finalize)
2700
3151
        trans_id = preview.trans_id_file_id('file-id')
2717
3168
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2718
3169
        work_a.add('file', 'file-id')
2719
3170
        base_id = work_a.commit('base version')
2720
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3171
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2721
3172
        preview = TransformPreview(work_a.basis_tree())
2722
3173
        self.addCleanup(preview.finalize)
2723
3174
        trans_id = preview.trans_id_file_id('file-id')
2759
3210
                         'new-versioned-id')
2760
3211
        tree = preview.get_preview_tree()
2761
3212
        preview.unversion_file(preview.trans_id_tree_path('removed-file'))
2762
 
        self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
 
3213
        self.assertEqual({'new-file', 'removed-file', 'existing-file'},
2763
3214
                         set(tree.extras()))
2764
3215
 
2765
3216
    def test_merge_into_preview(self):
2766
3217
        work_tree = self.make_branch_and_tree('tree')
2767
 
        self.build_tree_contents([('tree/file','b\n')])
 
3218
        self.build_tree_contents([('tree/file', 'b\n')])
2768
3219
        work_tree.add('file', 'file-id')
2769
3220
        work_tree.commit('first commit')
2770
 
        child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
2771
 
        self.build_tree_contents([('child/file','b\nc\n')])
 
3221
        child_tree = work_tree.controldir.sprout('child').open_workingtree()
 
3222
        self.build_tree_contents([('child/file', 'b\nc\n')])
2772
3223
        child_tree.commit('child commit')
2773
3224
        child_tree.lock_write()
2774
3225
        self.addCleanup(child_tree.unlock)
2780
3231
        preview.delete_contents(file_trans_id)
2781
3232
        preview.create_file('a\nb\n', file_trans_id)
2782
3233
        preview_tree = preview.get_preview_tree()
2783
 
        merger = Merger.from_revision_ids(None, preview_tree,
 
3234
        merger = Merger.from_revision_ids(preview_tree,
2784
3235
                                          child_tree.branch.last_revision(),
2785
3236
                                          other_branch=child_tree.branch,
2786
3237
                                          tree_branch=work_tree.branch)
2788
3239
        tt = merger.make_merger().make_preview_transform()
2789
3240
        self.addCleanup(tt.finalize)
2790
3241
        final_tree = tt.get_preview_tree()
2791
 
        self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
 
3242
        self.assertEqual(
 
3243
                'a\nb\nc\n',
 
3244
                final_tree.get_file_text(final_tree.id2path('file-id')))
2792
3245
 
2793
3246
    def test_merge_preview_into_workingtree(self):
2794
3247
        tree = self.make_branch_and_tree('tree')
2799
3252
        tree2 = self.make_branch_and_tree('tree2')
2800
3253
        tree2.set_root_id('TREE_ROOT')
2801
3254
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
 
                                         None, tree.basis_tree())
 
3255
                                         tree.basis_tree())
2803
3256
        merger.merge_type = Merge3Merger
2804
3257
        merger.do_merge()
2805
3258
 
2813
3266
        trans_id = tt.trans_id_file_id('foo-id')
2814
3267
        tt.delete_contents(trans_id)
2815
3268
        tt.create_file('baz', trans_id)
2816
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
3269
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
2817
3270
        self.build_tree_contents([('tree2/foo', 'qux')])
2818
 
        pb = None
2819
3271
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
 
                                         pb, tree.basis_tree())
 
3272
                                         tree.basis_tree())
2821
3273
        merger.merge_type = Merge3Merger
2822
3274
        merger.do_merge()
2823
3275
 
 
3276
    def test_has_filename(self):
 
3277
        wt = self.make_branch_and_tree('tree')
 
3278
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3279
        tt = TransformPreview(wt)
 
3280
        removed_id = tt.trans_id_tree_path('removed')
 
3281
        tt.delete_contents(removed_id)
 
3282
        tt.new_file('new', tt.root, 'contents')
 
3283
        modified_id = tt.trans_id_tree_path('modified')
 
3284
        tt.delete_contents(modified_id)
 
3285
        tt.create_file('modified-contents', modified_id)
 
3286
        self.addCleanup(tt.finalize)
 
3287
        tree = tt.get_preview_tree()
 
3288
        self.assertTrue(tree.has_filename('unmodified'))
 
3289
        self.assertFalse(tree.has_filename('not-present'))
 
3290
        self.assertFalse(tree.has_filename('removed'))
 
3291
        self.assertTrue(tree.has_filename('new'))
 
3292
        self.assertTrue(tree.has_filename('modified'))
 
3293
 
2824
3294
    def test_is_executable(self):
2825
3295
        tree = self.make_branch_and_tree('tree')
2826
3296
        preview = TransformPreview(tree)
2827
3297
        self.addCleanup(preview.finalize)
2828
3298
        preview.new_file('foo', preview.root, 'bar', 'baz-id')
2829
3299
        preview_tree = preview.get_preview_tree()
2830
 
        self.assertEqual(False, preview_tree.is_executable('baz-id',
2831
 
                                                           'tree/foo'))
2832
 
        self.assertEqual(False, preview_tree.is_executable('baz-id'))
 
3300
        self.assertEqual(False, preview_tree.is_executable('tree/foo', 'baz-id'))
 
3301
        self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2833
3302
 
2834
3303
    def test_commit_preview_tree(self):
2835
3304
        tree = self.make_branch_and_tree('tree')
2846
3315
        builder.finish_inventory()
2847
3316
        rev2_id = builder.commit('rev2')
2848
3317
        rev2_tree = tree.branch.repository.revision_tree(rev2_id)
2849
 
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
 
3318
        self.assertEqual('contents', rev2_tree.get_file_text('file'))
2850
3319
 
2851
3320
    def test_ascii_limbo_paths(self):
2852
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
3321
        self.requireFeature(features.UnicodeFilenameFeature)
2853
3322
        branch = self.make_branch('any')
2854
3323
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
2855
3324
        tt = TransformPreview(tree)
2872
3341
 
2873
3342
class TestSerializeTransform(tests.TestCaseWithTransport):
2874
3343
 
2875
 
    _test_needs_features = [tests.UnicodeFilenameFeature]
 
3344
    _test_needs_features = [features.UnicodeFilenameFeature]
2876
3345
 
2877
3346
    def get_preview(self, tree=None):
2878
3347
        if tree is None:
2953
3422
        return self.make_records(attribs, contents)
2954
3423
 
2955
3424
    def test_serialize_symlink_creation(self):
2956
 
        self.requireFeature(tests.SymlinkFeature)
 
3425
        self.requireFeature(features.SymlinkFeature)
2957
3426
        tt = self.get_preview()
2958
3427
        tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
2959
3428
        self.assertSerializesTo(self.symlink_creation_records(), tt)
2960
3429
 
2961
3430
    def test_deserialize_symlink_creation(self):
2962
 
        self.requireFeature(tests.SymlinkFeature)
 
3431
        self.requireFeature(features.SymlinkFeature)
2963
3432
        tt = self.get_preview()
2964
3433
        tt.deserialize(iter(self.symlink_creation_records()))
2965
3434
        abspath = tt._limbo_name('new-1')
3001
3470
        self.assertEqual({'new-1': u'foo\u1234',
3002
3471
                          'new-2': 'bar',
3003
3472
                          tt.root: ''}, tt._tree_id_paths)
3004
 
        self.assertEqual(set(['new-1']), tt._removed_id)
3005
 
        self.assertEqual(set(['new-2']), tt._removed_contents)
 
3473
        self.assertEqual({'new-1'}, tt._removed_id)
 
3474
        self.assertEqual({'new-2'}, tt._removed_contents)
3006
3475
 
3007
3476
    def missing_records(self):
3008
3477
        attribs = self.default_attribs()
3132
3601
        trans_id = tt.trans_id_tree_path('file')
3133
3602
        self.assertEqual((LINES_ONE,),
3134
3603
            tt._get_parents_texts(trans_id))
 
3604
 
 
3605
 
 
3606
class TestOrphan(tests.TestCaseWithTransport):
 
3607
 
 
3608
    def test_no_orphan_for_transform_preview(self):
 
3609
        tree = self.make_branch_and_tree('tree')
 
3610
        tt = transform.TransformPreview(tree)
 
3611
        self.addCleanup(tt.finalize)
 
3612
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
3613
 
 
3614
    def _set_orphan_policy(self, wt, policy):
 
3615
        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
 
3616
                                               policy)
 
3617
 
 
3618
    def _prepare_orphan(self, wt):
 
3619
        self.build_tree(['dir/', 'dir/file', 'dir/foo'])
 
3620
        wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
 
3621
        wt.commit('add dir and file ignoring foo')
 
3622
        tt = transform.TreeTransform(wt)
 
3623
        self.addCleanup(tt.finalize)
 
3624
        # dir and bar are deleted
 
3625
        dir_tid = tt.trans_id_tree_path('dir')
 
3626
        file_tid = tt.trans_id_tree_path('dir/file')
 
3627
        orphan_tid = tt.trans_id_tree_path('dir/foo')
 
3628
        tt.delete_contents(file_tid)
 
3629
        tt.unversion_file(file_tid)
 
3630
        tt.delete_contents(dir_tid)
 
3631
        tt.unversion_file(dir_tid)
 
3632
        # There should be a conflict because dir still contain foo
 
3633
        raw_conflicts = tt.find_conflicts()
 
3634
        self.assertLength(1, raw_conflicts)
 
3635
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
 
3636
        return tt, orphan_tid
 
3637
 
 
3638
    def test_new_orphan_created(self):
 
3639
        wt = self.make_branch_and_tree('.')
 
3640
        self._set_orphan_policy(wt, 'move')
 
3641
        tt, orphan_tid = self._prepare_orphan(wt)
 
3642
        warnings = []
 
3643
        def warning(*args):
 
3644
            warnings.append(args[0] % args[1:])
 
3645
        self.overrideAttr(trace, 'warning', warning)
 
3646
        remaining_conflicts = resolve_conflicts(tt)
 
3647
        self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
 
3648
                          warnings)
 
3649
        # Yeah for resolved conflicts !
 
3650
        self.assertLength(0, remaining_conflicts)
 
3651
        # We have a new orphan
 
3652
        self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
 
3653
        self.assertEqual('brz-orphans',
 
3654
                          tt.final_name(tt.final_parent(orphan_tid)))
 
3655
 
 
3656
    def test_never_orphan(self):
 
3657
        wt = self.make_branch_and_tree('.')
 
3658
        self._set_orphan_policy(wt, 'conflict')
 
3659
        tt, orphan_tid = self._prepare_orphan(wt)
 
3660
        remaining_conflicts = resolve_conflicts(tt)
 
3661
        self.assertLength(1, remaining_conflicts)
 
3662
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3663
                         remaining_conflicts.pop())
 
3664
 
 
3665
    def test_orphan_error(self):
 
3666
        def bogus_orphan(tt, orphan_id, parent_id):
 
3667
            raise transform.OrphaningError(tt.final_name(orphan_id),
 
3668
                                           tt.final_name(parent_id))
 
3669
        transform.orphaning_registry.register('bogus', bogus_orphan,
 
3670
                                              'Raise an error when orphaning')
 
3671
        wt = self.make_branch_and_tree('.')
 
3672
        self._set_orphan_policy(wt, 'bogus')
 
3673
        tt, orphan_tid = self._prepare_orphan(wt)
 
3674
        remaining_conflicts = resolve_conflicts(tt)
 
3675
        self.assertLength(1, remaining_conflicts)
 
3676
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3677
                         remaining_conflicts.pop())
 
3678
 
 
3679
    def test_unknown_orphan_policy(self):
 
3680
        wt = self.make_branch_and_tree('.')
 
3681
        # Set a fictional policy nobody ever implemented
 
3682
        self._set_orphan_policy(wt, 'donttouchmypreciouuus')
 
3683
        tt, orphan_tid = self._prepare_orphan(wt)
 
3684
        warnings = []
 
3685
        def warning(*args):
 
3686
            warnings.append(args[0] % args[1:])
 
3687
        self.overrideAttr(trace, 'warning', warning)
 
3688
        remaining_conflicts = resolve_conflicts(tt)
 
3689
        # We fallback to the default policy which create a conflict
 
3690
        self.assertLength(1, remaining_conflicts)
 
3691
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3692
                         remaining_conflicts.pop())
 
3693
        self.assertLength(1, warnings)
 
3694
        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
 
3695
 
 
3696
 
 
3697
class TestTransformHooks(tests.TestCaseWithTransport):
 
3698
 
 
3699
    def setUp(self):
 
3700
        super(TestTransformHooks, self).setUp()
 
3701
        self.wt = self.make_branch_and_tree('.')
 
3702
        os.chdir('..')
 
3703
 
 
3704
    def get_transform(self):
 
3705
        transform = TreeTransform(self.wt)
 
3706
        self.addCleanup(transform.finalize)
 
3707
        return transform, transform.root
 
3708
 
 
3709
    def test_pre_commit_hooks(self):
 
3710
        calls = []
 
3711
        def record_pre_transform(tree, tt):
 
3712
            calls.append((tree, tt))
 
3713
        MutableTree.hooks.install_named_hook('pre_transform',
 
3714
            record_pre_transform, "Pre transform")
 
3715
        transform, root = self.get_transform()
 
3716
        old_root_id = transform.tree_file_id(root)
 
3717
        transform.apply()
 
3718
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3719
        self.assertEqual([(self.wt, transform)], calls)
 
3720
 
 
3721
    def test_post_commit_hooks(self):
 
3722
        calls = []
 
3723
        def record_post_transform(tree, tt):
 
3724
            calls.append((tree, tt))
 
3725
        MutableTree.hooks.install_named_hook('post_transform',
 
3726
            record_post_transform, "Post transform")
 
3727
        transform, root = self.get_transform()
 
3728
        old_root_id = transform.tree_file_id(root)
 
3729
        transform.apply()
 
3730
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3731
        self.assertEqual([(self.wt, transform)], calls)
 
3732
 
 
3733
 
 
3734
class TestLinkTree(tests.TestCaseWithTransport):
 
3735
 
 
3736
    _test_needs_features = [HardlinkFeature]
 
3737
 
 
3738
    def setUp(self):
 
3739
        tests.TestCaseWithTransport.setUp(self)
 
3740
        self.parent_tree = self.make_branch_and_tree('parent')
 
3741
        self.parent_tree.lock_write()
 
3742
        self.addCleanup(self.parent_tree.unlock)
 
3743
        self.build_tree_contents([('parent/foo', 'bar')])
 
3744
        self.parent_tree.add('foo', 'foo-id')
 
3745
        self.parent_tree.commit('added foo')
 
3746
        child_controldir = self.parent_tree.controldir.sprout('child')
 
3747
        self.child_tree = child_controldir.open_workingtree()
 
3748
 
 
3749
    def hardlinked(self):
 
3750
        parent_stat = os.lstat(self.parent_tree.abspath('foo'))
 
3751
        child_stat = os.lstat(self.child_tree.abspath('foo'))
 
3752
        return parent_stat.st_ino == child_stat.st_ino
 
3753
 
 
3754
    def test_link_fails_if_modified(self):
 
3755
        """If the file to be linked has modified text, don't link."""
 
3756
        self.build_tree_contents([('child/foo', 'baz')])
 
3757
        transform.link_tree(self.child_tree, self.parent_tree)
 
3758
        self.assertFalse(self.hardlinked())
 
3759
 
 
3760
    def test_link_fails_if_execute_bit_changed(self):
 
3761
        """If the file to be linked has modified execute bit, don't link."""
 
3762
        tt = TreeTransform(self.child_tree)
 
3763
        try:
 
3764
            trans_id = tt.trans_id_tree_file_id('foo-id')
 
3765
            tt.set_executability(True, trans_id)
 
3766
            tt.apply()
 
3767
        finally:
 
3768
            tt.finalize()
 
3769
        transform.link_tree(self.child_tree, self.parent_tree)
 
3770
        self.assertFalse(self.hardlinked())
 
3771
 
 
3772
    def test_link_succeeds_if_unmodified(self):
 
3773
        """If the file to be linked is unmodified, link"""
 
3774
        transform.link_tree(self.child_tree, self.parent_tree)
 
3775
        self.assertTrue(self.hardlinked())