/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-06-10 01:35:53 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610013553-560y7mn3su4pp763
Fix remaining tests.

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)
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()
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)
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')
525
686
 
526
687
    def test_both_rename2(self):
527
688
        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')
 
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
695
        mangle_tree,root = self.get_transform()
535
 
        bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
 
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()
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:
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
 
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(wt.path2id("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(wt.path2id("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(wt.path2id("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(wt.path2id("foo")), "file")
1391
1598
 
1392
1599
    def test_no_final_path(self):
1393
1600
        transform, root = self.get_transform()
1439
1646
    def __init__(self, dirname, root_id):
1440
1647
        self.name = dirname
1441
1648
        os.mkdir(dirname)
1442
 
        self.wt = BzrDir.create_standalone_workingtree(dirname)
 
1649
        self.wt = ControlDir.create_standalone_workingtree(dirname)
1443
1650
        self.wt.set_root_id(root_id)
1444
1651
        self.b = self.wt.branch
1445
1652
        self.tt = TreeTransform(self.wt)
1451
1658
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1452
1659
 
1453
1660
 
 
1661
class TestInventoryAltered(tests.TestCaseWithTransport):
 
1662
 
 
1663
    def test_inventory_altered_unchanged(self):
 
1664
        tree = self.make_branch_and_tree('tree')
 
1665
        self.build_tree(['tree/foo'])
 
1666
        tree.add('foo', 'foo-id')
 
1667
        with TransformPreview(tree) as tt:
 
1668
            self.assertEqual([], tt._inventory_altered())
 
1669
 
 
1670
    def test_inventory_altered_changed_parent_id(self):
 
1671
        tree = self.make_branch_and_tree('tree')
 
1672
        self.build_tree(['tree/foo'])
 
1673
        tree.add('foo', 'foo-id')
 
1674
        with TransformPreview(tree) as tt:
 
1675
            tt.unversion_file(tt.root)
 
1676
            tt.version_file('new-id', tt.root)
 
1677
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1678
            foo_tuple = ('foo', foo_trans_id)
 
1679
            root_tuple = ('', tt.root)
 
1680
            self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
 
1681
 
 
1682
    def test_inventory_altered_noop_changed_parent_id(self):
 
1683
        tree = self.make_branch_and_tree('tree')
 
1684
        self.build_tree(['tree/foo'])
 
1685
        tree.add('foo', 'foo-id')
 
1686
        with TransformPreview(tree) as tt:
 
1687
            tt.unversion_file(tt.root)
 
1688
            tt.version_file(tree.get_root_id(), tt.root)
 
1689
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1690
            self.assertEqual([], tt._inventory_altered())
 
1691
 
 
1692
 
1454
1693
class TestTransformMerge(TestCaseInTempDir):
1455
1694
 
1456
1695
    def test_text_merge(self):
1523
1762
        merge_modified = this.wt.merge_modified()
1524
1763
        self.assertSubset(merge_modified, modified)
1525
1764
        self.assertEqual(len(merge_modified), len(modified))
1526
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1765
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
1527
1766
        modified.pop(0)
1528
1767
        merge_modified = this.wt.merge_modified()
1529
1768
        self.assertSubset(merge_modified, modified)
1643
1882
    def test_build_tree_with_symlinks(self):
1644
1883
        self.requireFeature(SymlinkFeature)
1645
1884
        os.mkdir('a')
1646
 
        a = BzrDir.create_standalone_workingtree('a')
 
1885
        a = ControlDir.create_standalone_workingtree('a')
1647
1886
        os.mkdir('a/foo')
1648
 
        file('a/foo/bar', 'wb').write('contents')
 
1887
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1649
1888
        os.symlink('a/foo/bar', 'a/foo/baz')
1650
1889
        a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1890
        a.commit('initial commit')
1652
 
        b = BzrDir.create_standalone_workingtree('b')
 
1891
        b = ControlDir.create_standalone_workingtree('b')
1653
1892
        basis = a.basis_tree()
1654
1893
        basis.lock_read()
1655
1894
        self.addCleanup(basis.unlock)
1660
1899
 
1661
1900
    def test_build_with_references(self):
1662
1901
        tree = self.make_branch_and_tree('source',
1663
 
            format='dirstate-with-subtree')
 
1902
            format='development-subtree')
1664
1903
        subtree = self.make_branch_and_tree('source/subtree',
1665
 
            format='dirstate-with-subtree')
 
1904
            format='development-subtree')
1666
1905
        tree.add_reference(subtree)
1667
1906
        tree.commit('a revision')
1668
1907
        tree.branch.create_checkout('target')
1669
 
        self.failUnlessExists('target')
1670
 
        self.failUnlessExists('target/subtree')
 
1908
        self.assertPathExists('target')
 
1909
        self.assertPathExists('target/subtree')
1671
1910
 
1672
1911
    def test_file_conflict_handling(self):
1673
1912
        """Ensure that when building trees, conflict handling is done"""
1720
1959
        source.commit('added file')
1721
1960
        build_tree(source.basis_tree(), target)
1722
1961
        self.assertEqual([], target.conflicts())
1723
 
        self.failUnlessExists('target/dir1/file')
 
1962
        self.assertPathExists('target/dir1/file')
1724
1963
 
1725
1964
        # Ensure contents are merged
1726
1965
        target = self.make_branch_and_tree('target2')
1727
1966
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1728
1967
        build_tree(source.basis_tree(), target)
1729
1968
        self.assertEqual([], target.conflicts())
1730
 
        self.failUnlessExists('target2/dir1/file2')
1731
 
        self.failUnlessExists('target2/dir1/file')
 
1969
        self.assertPathExists('target2/dir1/file2')
 
1970
        self.assertPathExists('target2/dir1/file')
1732
1971
 
1733
1972
        # Ensure new contents are suppressed for existing branches
1734
1973
        target = self.make_branch_and_tree('target3')
1735
1974
        self.make_branch('target3/dir1')
1736
1975
        self.build_tree(['target3/dir1/file2'])
1737
1976
        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')
 
1977
        self.assertPathDoesNotExist('target3/dir1/file')
 
1978
        self.assertPathExists('target3/dir1/file2')
 
1979
        self.assertPathExists('target3/dir1.diverted/file')
1741
1980
        self.assertEqual([DuplicateEntry('Diverted to',
1742
1981
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1743
1982
            target.conflicts())
1746
1985
        self.build_tree(['target4/dir1/'])
1747
1986
        self.make_branch('target4/dir1/file')
1748
1987
        build_tree(source.basis_tree(), target)
1749
 
        self.failUnlessExists('target4/dir1/file')
 
1988
        self.assertPathExists('target4/dir1/file')
1750
1989
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1751
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1990
        self.assertPathExists('target4/dir1/file.diverted')
1752
1991
        self.assertEqual([DuplicateEntry('Diverted to',
1753
1992
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1754
1993
            target.conflicts())
1822
2061
        self.addCleanup(target.unlock)
1823
2062
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1824
2063
 
 
2064
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
2065
        source = self.create_ab_tree()
 
2066
        sha1 = osutils.sha_string('A')
 
2067
        target = self.make_branch_and_tree('target')
 
2068
        target.lock_write()
 
2069
        self.addCleanup(target.unlock)
 
2070
        state = target.current_dirstate()
 
2071
        state._cutoff_time = time.time() + 60
 
2072
        build_tree(source.basis_tree(), target, source)
 
2073
        entry = state._get_entry(0, path_utf8='file1')
 
2074
        self.assertEqual(sha1, entry[1][0][1])
 
2075
 
1825
2076
    def test_build_tree_accelerator_tree_missing_file(self):
1826
2077
        source = self.create_ab_tree()
1827
2078
        os.unlink('source/file1')
1934
2185
        def rot13(chunks, context=None):
1935
2186
            return [''.join(chunks).encode('rot13')]
1936
2187
        rot13filter = filters.ContentFilter(rot13, rot13)
1937
 
        filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
 
2188
        filters.filter_stacks_registry.register(
 
2189
            'rot13', {'yes': [rot13filter]}.get)
1938
2190
        os.mkdir(self.test_home_dir + '/.bazaar')
1939
2191
        rules_filename = self.test_home_dir + '/.bazaar/rules'
1940
2192
        f = open(rules_filename, 'wb')
1970
2222
        self.assertEqualStat(source_stat, target_stat)
1971
2223
 
1972
2224
    def test_case_insensitive_build_tree_inventory(self):
1973
 
        if (tests.CaseInsensitiveFilesystemFeature.available()
1974
 
            or tests.CaseInsCasePresFilenameFeature.available()):
 
2225
        if (features.CaseInsensitiveFilesystemFeature.available()
 
2226
            or features.CaseInsCasePresFilenameFeature.available()):
1975
2227
            raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2228
        source = self.make_branch_and_tree('source')
1977
2229
        self.build_tree(['source/file', 'source/FILE'])
1985
2237
        self.assertEqual('file.moved', target.id2path('lower-id'))
1986
2238
        self.assertEqual('FILE', target.id2path('upper-id'))
1987
2239
 
 
2240
    def test_build_tree_observes_sha(self):
 
2241
        source = self.make_branch_and_tree('source')
 
2242
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2243
        source.add(['file1', 'dir', 'dir/file2'],
 
2244
                   ['file1-id', 'dir-id', 'file2-id'])
 
2245
        source.commit('new files')
 
2246
        target = self.make_branch_and_tree('target')
 
2247
        target.lock_write()
 
2248
        self.addCleanup(target.unlock)
 
2249
        # We make use of the fact that DirState caches its cutoff time. So we
 
2250
        # set the 'safe' time to one minute in the future.
 
2251
        state = target.current_dirstate()
 
2252
        state._cutoff_time = time.time() + 60
 
2253
        build_tree(source.basis_tree(), target)
 
2254
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2255
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2256
        # entry[1] is the state information, entry[1][0] is the state of the
 
2257
        # working tree, entry[1][0][1] is the sha value for the current working
 
2258
        # tree
 
2259
        entry1 = state._get_entry(0, path_utf8='file1')
 
2260
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2261
        # The 'size' field must also be set.
 
2262
        self.assertEqual(25, entry1[1][0][2])
 
2263
        entry1_state = entry1[1][0]
 
2264
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2265
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2266
        self.assertEqual(29, entry2[1][0][2])
 
2267
        entry2_state = entry2[1][0]
 
2268
        # Now, make sure that we don't have to re-read the content. The
 
2269
        # packed_stat should match exactly.
 
2270
        self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
 
2271
        self.assertEqual(entry2_sha,
 
2272
                         target.get_file_sha1('file2-id', 'dir/file2'))
 
2273
        self.assertEqual(entry1_state, entry1[1][0])
 
2274
        self.assertEqual(entry2_state, entry2[1][0])
 
2275
 
1988
2276
 
1989
2277
class TestCommitTransform(tests.TestCaseWithTransport):
1990
2278
 
2091
2379
        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2092
2380
                          'message')
2093
2381
 
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~')
 
2382
    def test_commit_rich_revision_data(self):
 
2383
        branch, tt = self.get_branch_and_transform()
 
2384
        rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
 
2385
                           committer='me <me@example.com>',
 
2386
                           revprops={'foo': 'bar'}, revision_id='revid-1',
 
2387
                           authors=['Author1 <author1@example.com>',
 
2388
                              'Author2 <author2@example.com>',
 
2389
                               ])
 
2390
        self.assertEqual('revid-1', rev_id)
 
2391
        revision = branch.repository.get_revision(rev_id)
 
2392
        self.assertEqual(1, revision.timestamp)
 
2393
        self.assertEqual(43201, revision.timezone)
 
2394
        self.assertEqual('me <me@example.com>', revision.committer)
 
2395
        self.assertEqual(['Author1 <author1@example.com>',
 
2396
                          'Author2 <author2@example.com>'],
 
2397
                         revision.get_apparent_authors())
 
2398
        del revision.properties['authors']
 
2399
        self.assertEqual({'foo': 'bar',
 
2400
                          'branch-nick': 'tree'},
 
2401
                         revision.properties)
 
2402
 
 
2403
    def test_no_explicit_revprops(self):
 
2404
        branch, tt = self.get_branch_and_transform()
 
2405
        rev_id = tt.commit(branch, 'message', authors=[
 
2406
            'Author1 <author1@example.com>',
 
2407
            'Author2 <author2@example.com>', ])
 
2408
        revision = branch.repository.get_revision(rev_id)
 
2409
        self.assertEqual(['Author1 <author1@example.com>',
 
2410
                          'Author2 <author2@example.com>'],
 
2411
                         revision.get_apparent_authors())
 
2412
        self.assertEqual('tree', revision.properties['branch-nick'])
2126
2413
 
2127
2414
 
2128
2415
class TestFileMover(tests.TestCaseWithTransport):
2131
2418
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2132
2419
        mover = _FileMover()
2133
2420
        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')
 
2421
        self.assertPathExists('q')
 
2422
        self.assertPathDoesNotExist('a')
 
2423
        self.assertPathExists('q/b')
 
2424
        self.assertPathExists('c')
 
2425
        self.assertPathExists('c/d')
2139
2426
 
2140
2427
    def test_pre_delete_rollback(self):
2141
2428
        self.build_tree(['a/'])
2142
2429
        mover = _FileMover()
2143
2430
        mover.pre_delete('a', 'q')
2144
 
        self.failUnlessExists('q')
2145
 
        self.failIfExists('a')
 
2431
        self.assertPathExists('q')
 
2432
        self.assertPathDoesNotExist('a')
2146
2433
        mover.rollback()
2147
 
        self.failIfExists('q')
2148
 
        self.failUnlessExists('a')
 
2434
        self.assertPathDoesNotExist('q')
 
2435
        self.assertPathExists('a')
2149
2436
 
2150
2437
    def test_apply_deletions(self):
2151
2438
        self.build_tree(['a/', 'b/'])
2152
2439
        mover = _FileMover()
2153
2440
        mover.pre_delete('a', 'q')
2154
2441
        mover.pre_delete('b', 'r')
2155
 
        self.failUnlessExists('q')
2156
 
        self.failUnlessExists('r')
2157
 
        self.failIfExists('a')
2158
 
        self.failIfExists('b')
 
2442
        self.assertPathExists('q')
 
2443
        self.assertPathExists('r')
 
2444
        self.assertPathDoesNotExist('a')
 
2445
        self.assertPathDoesNotExist('b')
2159
2446
        mover.apply_deletions()
2160
 
        self.failIfExists('q')
2161
 
        self.failIfExists('r')
2162
 
        self.failIfExists('a')
2163
 
        self.failIfExists('b')
 
2447
        self.assertPathDoesNotExist('q')
 
2448
        self.assertPathDoesNotExist('r')
 
2449
        self.assertPathDoesNotExist('a')
 
2450
        self.assertPathDoesNotExist('b')
2164
2451
 
2165
2452
    def test_file_mover_rollback(self):
2166
2453
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2169
2456
        mover.rename('c/e', 'c/d')
2170
2457
        try:
2171
2458
            mover.rename('a', 'c')
2172
 
        except errors.FileExists, e:
 
2459
        except errors.FileExists as e:
2173
2460
            mover.rollback()
2174
 
        self.failUnlessExists('a')
2175
 
        self.failUnlessExists('c/d')
 
2461
        self.assertPathExists('a')
 
2462
        self.assertPathExists('c/d')
2176
2463
 
2177
2464
 
2178
2465
class Bogus(Exception):
2208
2495
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2209
2496
        self.assertRaises(Bogus, tt.apply,
2210
2497
                          _mover=self.ExceptionFileMover(bad_source='a'))
2211
 
        self.failUnlessExists('a')
2212
 
        self.failUnlessExists('a/b')
 
2498
        self.assertPathExists('a')
 
2499
        self.assertPathExists('a/b')
2213
2500
        tt.apply()
2214
 
        self.failUnlessExists('c')
2215
 
        self.failUnlessExists('c/d')
 
2501
        self.assertPathExists('c')
 
2502
        self.assertPathExists('c/d')
2216
2503
 
2217
2504
    def test_rollback_rename_into_place(self):
2218
2505
        tree = self.make_branch_and_tree('.')
2224
2511
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2225
2512
        self.assertRaises(Bogus, tt.apply,
2226
2513
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2227
 
        self.failUnlessExists('a')
2228
 
        self.failUnlessExists('a/b')
 
2514
        self.assertPathExists('a')
 
2515
        self.assertPathExists('a/b')
2229
2516
        tt.apply()
2230
 
        self.failUnlessExists('c')
2231
 
        self.failUnlessExists('c/d')
 
2517
        self.assertPathExists('c')
 
2518
        self.assertPathExists('c/d')
2232
2519
 
2233
2520
    def test_rollback_deletion(self):
2234
2521
        tree = self.make_branch_and_tree('.')
2240
2527
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2528
        self.assertRaises(Bogus, tt.apply,
2242
2529
                          _mover=self.ExceptionFileMover(bad_target='d'))
2243
 
        self.failUnlessExists('a')
2244
 
        self.failUnlessExists('a/b')
2245
 
 
2246
 
    def test_resolve_no_parent(self):
 
2530
        self.assertPathExists('a')
 
2531
        self.assertPathExists('a/b')
 
2532
 
 
2533
 
 
2534
class TestFinalizeRobustness(tests.TestCaseWithTransport):
 
2535
    """Ensure treetransform creation errors can be safely cleaned up after"""
 
2536
 
 
2537
    def _override_globals_in_method(self, instance, method_name, globals):
 
2538
        """Replace method on instance with one with updated globals"""
 
2539
        import types
 
2540
        func = getattr(instance, method_name).__func__
 
2541
        new_globals = dict(func.__globals__)
 
2542
        new_globals.update(globals)
 
2543
        new_func = types.FunctionType(func.__code__, new_globals,
 
2544
            func.__name__, func.__defaults__)
 
2545
        setattr(instance, method_name,
 
2546
            types.MethodType(new_func, instance, instance.__class__))
 
2547
        self.addCleanup(delattr, instance, method_name)
 
2548
 
 
2549
    @staticmethod
 
2550
    def _fake_open_raises_before(name, mode):
 
2551
        """Like open() but raises before doing anything"""
 
2552
        raise RuntimeError
 
2553
 
 
2554
    @staticmethod
 
2555
    def _fake_open_raises_after(name, mode):
 
2556
        """Like open() but raises after creating file without returning"""
 
2557
        open(name, mode).close()
 
2558
        raise RuntimeError
 
2559
 
 
2560
    def create_transform_and_root_trans_id(self):
 
2561
        """Setup a transform creating a file in limbo"""
 
2562
        tree = self.make_branch_and_tree('.')
 
2563
        tt = TreeTransform(tree)
 
2564
        return tt, tt.create_path("a", tt.root)
 
2565
 
 
2566
    def create_transform_and_subdir_trans_id(self):
 
2567
        """Setup a transform creating a directory containing a file in limbo"""
 
2568
        tree = self.make_branch_and_tree('.')
 
2569
        tt = TreeTransform(tree)
 
2570
        d_trans_id = tt.create_path("d", tt.root)
 
2571
        tt.create_directory(d_trans_id)
 
2572
        f_trans_id = tt.create_path("a", d_trans_id)
 
2573
        tt.adjust_path("a", d_trans_id, f_trans_id)
 
2574
        return tt, f_trans_id
 
2575
 
 
2576
    def test_root_create_file_open_raises_before_creation(self):
 
2577
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2578
        self._override_globals_in_method(tt, "create_file",
 
2579
            {"open": self._fake_open_raises_before})
 
2580
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2581
        path = tt._limbo_name(trans_id)
 
2582
        self.assertPathDoesNotExist(path)
 
2583
        tt.finalize()
 
2584
        self.assertPathDoesNotExist(tt._limbodir)
 
2585
 
 
2586
    def test_root_create_file_open_raises_after_creation(self):
 
2587
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2588
        self._override_globals_in_method(tt, "create_file",
 
2589
            {"open": self._fake_open_raises_after})
 
2590
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2591
        path = tt._limbo_name(trans_id)
 
2592
        self.assertPathExists(path)
 
2593
        tt.finalize()
 
2594
        self.assertPathDoesNotExist(path)
 
2595
        self.assertPathDoesNotExist(tt._limbodir)
 
2596
 
 
2597
    def test_subdir_create_file_open_raises_before_creation(self):
 
2598
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2599
        self._override_globals_in_method(tt, "create_file",
 
2600
            {"open": self._fake_open_raises_before})
 
2601
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2602
        path = tt._limbo_name(trans_id)
 
2603
        self.assertPathDoesNotExist(path)
 
2604
        tt.finalize()
 
2605
        self.assertPathDoesNotExist(tt._limbodir)
 
2606
 
 
2607
    def test_subdir_create_file_open_raises_after_creation(self):
 
2608
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2609
        self._override_globals_in_method(tt, "create_file",
 
2610
            {"open": self._fake_open_raises_after})
 
2611
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2612
        path = tt._limbo_name(trans_id)
 
2613
        self.assertPathExists(path)
 
2614
        tt.finalize()
 
2615
        self.assertPathDoesNotExist(path)
 
2616
        self.assertPathDoesNotExist(tt._limbodir)
 
2617
 
 
2618
    def test_rename_in_limbo_rename_raises_after_rename(self):
 
2619
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2620
        parent1 = tt.new_directory('parent1', tt.root)
 
2621
        child1 = tt.new_file('child1', parent1, 'contents')
 
2622
        parent2 = tt.new_directory('parent2', tt.root)
 
2623
 
 
2624
        class FakeOSModule(object):
 
2625
            def rename(self, old, new):
 
2626
                os.rename(old, new)
 
2627
                raise RuntimeError
 
2628
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2629
            {"os": FakeOSModule()})
 
2630
        self.assertRaises(
 
2631
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2632
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
 
2633
        self.assertPathExists(path)
 
2634
        tt.finalize()
 
2635
        self.assertPathDoesNotExist(path)
 
2636
        self.assertPathDoesNotExist(tt._limbodir)
 
2637
 
 
2638
    def test_rename_in_limbo_rename_raises_before_rename(self):
 
2639
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2640
        parent1 = tt.new_directory('parent1', tt.root)
 
2641
        child1 = tt.new_file('child1', parent1, 'contents')
 
2642
        parent2 = tt.new_directory('parent2', tt.root)
 
2643
 
 
2644
        class FakeOSModule(object):
 
2645
            def rename(self, old, new):
 
2646
                raise RuntimeError
 
2647
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2648
            {"os": FakeOSModule()})
 
2649
        self.assertRaises(
 
2650
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2651
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
 
2652
        self.assertPathExists(path)
 
2653
        tt.finalize()
 
2654
        self.assertPathDoesNotExist(path)
 
2655
        self.assertPathDoesNotExist(tt._limbodir)
 
2656
 
 
2657
 
 
2658
class TestTransformMissingParent(tests.TestCaseWithTransport):
 
2659
 
 
2660
    def make_tt_with_versioned_dir(self):
2247
2661
        wt = self.make_branch_and_tree('.')
 
2662
        self.build_tree(['dir/',])
 
2663
        wt.add(['dir'], ['dir-id'])
 
2664
        wt.commit('Create dir')
2248
2665
        tt = TreeTransform(wt)
2249
2666
        self.addCleanup(tt.finalize)
2250
 
        parent = tt.trans_id_file_id('parent-id')
2251
 
        tt.new_file('file', parent, 'Contents')
2252
 
        resolve_conflicts(tt)
 
2667
        return wt, tt
 
2668
 
 
2669
    def test_resolve_create_parent_for_versioned_file(self):
 
2670
        wt, tt = self.make_tt_with_versioned_dir()
 
2671
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2672
        file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
 
2673
        tt.delete_contents(dir_tid)
 
2674
        tt.unversion_file(dir_tid)
 
2675
        conflicts = resolve_conflicts(tt)
 
2676
        # one conflict for the missing directory, one for the unversioned
 
2677
        # parent
 
2678
        self.assertLength(2, conflicts)
 
2679
 
 
2680
    def test_non_versioned_file_create_conflict(self):
 
2681
        wt, tt = self.make_tt_with_versioned_dir()
 
2682
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2683
        tt.new_file('file', dir_tid, 'Contents')
 
2684
        tt.delete_contents(dir_tid)
 
2685
        tt.unversion_file(dir_tid)
 
2686
        conflicts = resolve_conflicts(tt)
 
2687
        # no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
 
2688
        self.assertLength(1, conflicts)
 
2689
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
2690
                         conflicts.pop())
2253
2691
 
2254
2692
 
2255
2693
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
2694
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2695
                  (False, False))
2258
2696
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2697
              ('', ''), ('directory', 'directory'), (False, False))
2260
2698
 
2261
2699
 
2262
2700
class TestTransformPreview(tests.TestCaseWithTransport):
2303
2741
        self.addCleanup(preview.finalize)
2304
2742
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2305
2743
        preview_tree = preview.get_preview_tree()
2306
 
        out = StringIO()
 
2744
        out = BytesIO()
2307
2745
        show_diff_trees(revision_tree, preview_tree, out)
2308
2746
        lines = out.getvalue().splitlines()
2309
2747
        self.assertEqual(lines[0], "=== added file 'file2'")
2331
2769
 
2332
2770
    def test_iter_changes(self):
2333
2771
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2334
 
        root = revision_tree.inventory.root.file_id
 
2772
        root = revision_tree.get_root_id()
2335
2773
        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2336
2774
                          (root, root), ('a', 'a'), ('file', 'file'),
2337
2775
                          (False, False))],
2341
2779
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2342
2780
        changes = preview_tree.iter_changes(revision_tree,
2343
2781
                                            include_unchanged=True)
2344
 
        root = revision_tree.inventory.root.file_id
 
2782
        root = revision_tree.get_root_id()
2345
2783
 
2346
2784
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2347
2785
 
2349
2787
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2350
2788
        changes = preview_tree.iter_changes(revision_tree,
2351
2789
                                            specific_files=[''])
2352
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2790
        self.assertEqual([A_ENTRY], list(changes))
2353
2791
 
2354
2792
    def test_want_unversioned(self):
2355
2793
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2356
2794
        changes = preview_tree.iter_changes(revision_tree,
2357
2795
                                            want_unversioned=True)
2358
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2796
        self.assertEqual([A_ENTRY], list(changes))
2359
2797
 
2360
2798
    def test_ignore_extra_trees_no_specific_files(self):
2361
2799
        # extra_trees is harmless without specific_files, so we'll silently
2404
2842
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2405
2843
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
2406
2844
 
 
2845
    def test_get_file_size(self):
 
2846
        work_tree = self.make_branch_and_tree('tree')
 
2847
        self.build_tree_contents([('tree/old', 'old')])
 
2848
        work_tree.add('old', 'old-id')
 
2849
        preview = TransformPreview(work_tree)
 
2850
        self.addCleanup(preview.finalize)
 
2851
        new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
 
2852
                                  'executable')
 
2853
        tree = preview.get_preview_tree()
 
2854
        self.assertEqual(len('old'), tree.get_file_size('old-id'))
 
2855
        self.assertEqual(len('contents'), tree.get_file_size('new-id'))
 
2856
 
2407
2857
    def test_get_file(self):
2408
2858
        preview = self.get_empty_preview()
2409
2859
        preview.new_file('file', preview.root, 'contents', 'file-id')
2433
2883
        preview.unversion_file(c_trans_id)
2434
2884
        preview.version_file('c-id', c_trans_id)
2435
2885
        preview_tree = preview.get_preview_tree()
2436
 
        self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
 
2886
        self.assertEqual({'a-id', 'c-id', tree.get_root_id()},
2437
2887
                         preview_tree.all_file_ids())
2438
2888
 
2439
2889
    def test_path2id_deleted_unchanged(self):
2694
3144
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2695
3145
        work_a.add('file', 'file-id')
2696
3146
        base_id = work_a.commit('base version')
2697
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3147
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3148
        preview = TransformPreview(work_a)
2699
3149
        self.addCleanup(preview.finalize)
2700
3150
        trans_id = preview.trans_id_file_id('file-id')
2717
3167
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2718
3168
        work_a.add('file', 'file-id')
2719
3169
        base_id = work_a.commit('base version')
2720
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3170
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2721
3171
        preview = TransformPreview(work_a.basis_tree())
2722
3172
        self.addCleanup(preview.finalize)
2723
3173
        trans_id = preview.trans_id_file_id('file-id')
2759
3209
                         'new-versioned-id')
2760
3210
        tree = preview.get_preview_tree()
2761
3211
        preview.unversion_file(preview.trans_id_tree_path('removed-file'))
2762
 
        self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
 
3212
        self.assertEqual({'new-file', 'removed-file', 'existing-file'},
2763
3213
                         set(tree.extras()))
2764
3214
 
2765
3215
    def test_merge_into_preview(self):
2767
3217
        self.build_tree_contents([('tree/file','b\n')])
2768
3218
        work_tree.add('file', 'file-id')
2769
3219
        work_tree.commit('first commit')
2770
 
        child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
 
3220
        child_tree = work_tree.controldir.sprout('child').open_workingtree()
2771
3221
        self.build_tree_contents([('child/file','b\nc\n')])
2772
3222
        child_tree.commit('child commit')
2773
3223
        child_tree.lock_write()
2813
3263
        trans_id = tt.trans_id_file_id('foo-id')
2814
3264
        tt.delete_contents(trans_id)
2815
3265
        tt.create_file('baz', trans_id)
2816
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
3266
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
2817
3267
        self.build_tree_contents([('tree2/foo', 'qux')])
2818
3268
        pb = None
2819
3269
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2821
3271
        merger.merge_type = Merge3Merger
2822
3272
        merger.do_merge()
2823
3273
 
 
3274
    def test_has_filename(self):
 
3275
        wt = self.make_branch_and_tree('tree')
 
3276
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3277
        tt = TransformPreview(wt)
 
3278
        removed_id = tt.trans_id_tree_path('removed')
 
3279
        tt.delete_contents(removed_id)
 
3280
        tt.new_file('new', tt.root, 'contents')
 
3281
        modified_id = tt.trans_id_tree_path('modified')
 
3282
        tt.delete_contents(modified_id)
 
3283
        tt.create_file('modified-contents', modified_id)
 
3284
        self.addCleanup(tt.finalize)
 
3285
        tree = tt.get_preview_tree()
 
3286
        self.assertTrue(tree.has_filename('unmodified'))
 
3287
        self.assertFalse(tree.has_filename('not-present'))
 
3288
        self.assertFalse(tree.has_filename('removed'))
 
3289
        self.assertTrue(tree.has_filename('new'))
 
3290
        self.assertTrue(tree.has_filename('modified'))
 
3291
 
2824
3292
    def test_is_executable(self):
2825
3293
        tree = self.make_branch_and_tree('tree')
2826
3294
        preview = TransformPreview(tree)
2849
3317
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
2850
3318
 
2851
3319
    def test_ascii_limbo_paths(self):
2852
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
3320
        self.requireFeature(features.UnicodeFilenameFeature)
2853
3321
        branch = self.make_branch('any')
2854
3322
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
2855
3323
        tt = TransformPreview(tree)
2872
3340
 
2873
3341
class TestSerializeTransform(tests.TestCaseWithTransport):
2874
3342
 
2875
 
    _test_needs_features = [tests.UnicodeFilenameFeature]
 
3343
    _test_needs_features = [features.UnicodeFilenameFeature]
2876
3344
 
2877
3345
    def get_preview(self, tree=None):
2878
3346
        if tree is None:
2953
3421
        return self.make_records(attribs, contents)
2954
3422
 
2955
3423
    def test_serialize_symlink_creation(self):
2956
 
        self.requireFeature(tests.SymlinkFeature)
 
3424
        self.requireFeature(features.SymlinkFeature)
2957
3425
        tt = self.get_preview()
2958
3426
        tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
2959
3427
        self.assertSerializesTo(self.symlink_creation_records(), tt)
2960
3428
 
2961
3429
    def test_deserialize_symlink_creation(self):
2962
 
        self.requireFeature(tests.SymlinkFeature)
 
3430
        self.requireFeature(features.SymlinkFeature)
2963
3431
        tt = self.get_preview()
2964
3432
        tt.deserialize(iter(self.symlink_creation_records()))
2965
3433
        abspath = tt._limbo_name('new-1')
3001
3469
        self.assertEqual({'new-1': u'foo\u1234',
3002
3470
                          'new-2': 'bar',
3003
3471
                          tt.root: ''}, tt._tree_id_paths)
3004
 
        self.assertEqual(set(['new-1']), tt._removed_id)
3005
 
        self.assertEqual(set(['new-2']), tt._removed_contents)
 
3472
        self.assertEqual({'new-1'}, tt._removed_id)
 
3473
        self.assertEqual({'new-2'}, tt._removed_contents)
3006
3474
 
3007
3475
    def missing_records(self):
3008
3476
        attribs = self.default_attribs()
3132
3600
        trans_id = tt.trans_id_tree_path('file')
3133
3601
        self.assertEqual((LINES_ONE,),
3134
3602
            tt._get_parents_texts(trans_id))
 
3603
 
 
3604
 
 
3605
class TestOrphan(tests.TestCaseWithTransport):
 
3606
 
 
3607
    def test_no_orphan_for_transform_preview(self):
 
3608
        tree = self.make_branch_and_tree('tree')
 
3609
        tt = transform.TransformPreview(tree)
 
3610
        self.addCleanup(tt.finalize)
 
3611
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
3612
 
 
3613
    def _set_orphan_policy(self, wt, policy):
 
3614
        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
 
3615
                                               policy)
 
3616
 
 
3617
    def _prepare_orphan(self, wt):
 
3618
        self.build_tree(['dir/', 'dir/file', 'dir/foo'])
 
3619
        wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
 
3620
        wt.commit('add dir and file ignoring foo')
 
3621
        tt = transform.TreeTransform(wt)
 
3622
        self.addCleanup(tt.finalize)
 
3623
        # dir and bar are deleted
 
3624
        dir_tid = tt.trans_id_tree_path('dir')
 
3625
        file_tid = tt.trans_id_tree_path('dir/file')
 
3626
        orphan_tid = tt.trans_id_tree_path('dir/foo')
 
3627
        tt.delete_contents(file_tid)
 
3628
        tt.unversion_file(file_tid)
 
3629
        tt.delete_contents(dir_tid)
 
3630
        tt.unversion_file(dir_tid)
 
3631
        # There should be a conflict because dir still contain foo
 
3632
        raw_conflicts = tt.find_conflicts()
 
3633
        self.assertLength(1, raw_conflicts)
 
3634
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
 
3635
        return tt, orphan_tid
 
3636
 
 
3637
    def test_new_orphan_created(self):
 
3638
        wt = self.make_branch_and_tree('.')
 
3639
        self._set_orphan_policy(wt, 'move')
 
3640
        tt, orphan_tid = self._prepare_orphan(wt)
 
3641
        warnings = []
 
3642
        def warning(*args):
 
3643
            warnings.append(args[0] % args[1:])
 
3644
        self.overrideAttr(trace, 'warning', warning)
 
3645
        remaining_conflicts = resolve_conflicts(tt)
 
3646
        self.assertEqual(['dir/foo has been orphaned in bzr-orphans'],
 
3647
                          warnings)
 
3648
        # Yeah for resolved conflicts !
 
3649
        self.assertLength(0, remaining_conflicts)
 
3650
        # We have a new orphan
 
3651
        self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
 
3652
        self.assertEqual('bzr-orphans',
 
3653
                          tt.final_name(tt.final_parent(orphan_tid)))
 
3654
 
 
3655
    def test_never_orphan(self):
 
3656
        wt = self.make_branch_and_tree('.')
 
3657
        self._set_orphan_policy(wt, 'conflict')
 
3658
        tt, orphan_tid = self._prepare_orphan(wt)
 
3659
        remaining_conflicts = resolve_conflicts(tt)
 
3660
        self.assertLength(1, remaining_conflicts)
 
3661
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3662
                         remaining_conflicts.pop())
 
3663
 
 
3664
    def test_orphan_error(self):
 
3665
        def bogus_orphan(tt, orphan_id, parent_id):
 
3666
            raise transform.OrphaningError(tt.final_name(orphan_id),
 
3667
                                           tt.final_name(parent_id))
 
3668
        transform.orphaning_registry.register('bogus', bogus_orphan,
 
3669
                                              'Raise an error when orphaning')
 
3670
        wt = self.make_branch_and_tree('.')
 
3671
        self._set_orphan_policy(wt, 'bogus')
 
3672
        tt, orphan_tid = self._prepare_orphan(wt)
 
3673
        remaining_conflicts = resolve_conflicts(tt)
 
3674
        self.assertLength(1, remaining_conflicts)
 
3675
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3676
                         remaining_conflicts.pop())
 
3677
 
 
3678
    def test_unknown_orphan_policy(self):
 
3679
        wt = self.make_branch_and_tree('.')
 
3680
        # Set a fictional policy nobody ever implemented
 
3681
        self._set_orphan_policy(wt, 'donttouchmypreciouuus')
 
3682
        tt, orphan_tid = self._prepare_orphan(wt)
 
3683
        warnings = []
 
3684
        def warning(*args):
 
3685
            warnings.append(args[0] % args[1:])
 
3686
        self.overrideAttr(trace, 'warning', warning)
 
3687
        remaining_conflicts = resolve_conflicts(tt)
 
3688
        # We fallback to the default policy which create a conflict
 
3689
        self.assertLength(1, remaining_conflicts)
 
3690
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3691
                         remaining_conflicts.pop())
 
3692
        self.assertLength(1, warnings)
 
3693
        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
 
3694
 
 
3695
 
 
3696
class TestTransformHooks(tests.TestCaseWithTransport):
 
3697
 
 
3698
    def setUp(self):
 
3699
        super(TestTransformHooks, self).setUp()
 
3700
        self.wt = self.make_branch_and_tree('.')
 
3701
        os.chdir('..')
 
3702
 
 
3703
    def get_transform(self):
 
3704
        transform = TreeTransform(self.wt)
 
3705
        self.addCleanup(transform.finalize)
 
3706
        return transform, transform.root
 
3707
 
 
3708
    def test_pre_commit_hooks(self):
 
3709
        calls = []
 
3710
        def record_pre_transform(tree, tt):
 
3711
            calls.append((tree, tt))
 
3712
        MutableTree.hooks.install_named_hook('pre_transform',
 
3713
            record_pre_transform, "Pre transform")
 
3714
        transform, root = self.get_transform()
 
3715
        old_root_id = transform.tree_file_id(root)
 
3716
        transform.apply()
 
3717
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3718
        self.assertEqual([(self.wt, transform)], calls)
 
3719
 
 
3720
    def test_post_commit_hooks(self):
 
3721
        calls = []
 
3722
        def record_post_transform(tree, tt):
 
3723
            calls.append((tree, tt))
 
3724
        MutableTree.hooks.install_named_hook('post_transform',
 
3725
            record_post_transform, "Post transform")
 
3726
        transform, root = self.get_transform()
 
3727
        old_root_id = transform.tree_file_id(root)
 
3728
        transform.apply()
 
3729
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3730
        self.assertEqual([(self.wt, transform)], calls)