← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-28 16:13:49 UTC
  • mfrom: (6499.2.3 948339-config-caching)
  • Revision ID: pqm@pqm.ubuntu.com-20120328161349-2gsc0g11fcu43hlc
(vila) Properly share mutable config sections and save the branch config
 only during the final unlock (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
19
from StringIO import StringIO
19
20
import sys
25
26
    filters,
26
27
    generate_ids,
27
28
    osutils,
28
 
    progress,
29
29
    revision as _mod_revision,
30
30
    rules,
 
31
    symbol_versioning,
31
32
    tests,
 
33
    trace,
 
34
    transform,
32
35
    urlutils,
33
36
    )
34
 
from bzrlib.bzrdir import BzrDir
35
 
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
36
 
                              UnversionedParent, ParentLoop, DeletingParent,
37
 
                              NonDirectoryParent)
 
37
from bzrlib.conflicts import (
 
38
    DeletingParent,
 
39
    DuplicateEntry,
 
40
    DuplicateID,
 
41
    MissingParent,
 
42
    NonDirectoryParent,
 
43
    ParentLoop,
 
44
    UnversionedParent,
 
45
)
 
46
from bzrlib.controldir import ControlDir
38
47
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
 
48
from bzrlib.errors import (
 
49
    DuplicateKey,
 
50
    ExistingLimbo,
 
51
    ExistingPendingDeletion,
 
52
    ImmortalLimbo,
 
53
    ImmortalPendingDeletion,
 
54
    LockError,
 
55
    MalformedTransform,
 
56
    ReusingTransform,
 
57
)
 
58
from bzrlib.osutils import (
 
59
    file_kind,
 
60
    pathjoin,
 
61
)
45
62
from bzrlib.merge import Merge3Merger, Merger
 
63
from bzrlib.mutabletree import MutableTree
46
64
from bzrlib.tests import (
 
65
    features,
 
66
    TestCaseInTempDir,
 
67
    TestSkipped,
 
68
    )
 
69
from bzrlib.tests.features import (
47
70
    HardlinkFeature,
48
71
    SymlinkFeature,
49
 
    TestCase,
50
 
    TestCaseInTempDir,
51
 
    TestSkipped,
52
72
    )
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)
 
73
from bzrlib.transform import (
 
74
    build_tree,
 
75
    create_from_tree,
 
76
    cook_conflicts,
 
77
    _FileMover,
 
78
    FinalPaths,
 
79
    resolve_conflicts,
 
80
    resolve_checkout,
 
81
    ROOT_PARENT,
 
82
    TransformPreview,
 
83
    TreeTransform,
 
84
)
58
85
 
59
86
 
60
87
class TestTreeTransform(tests.TestCaseWithTransport):
61
88
 
62
89
    def setUp(self):
63
90
        super(TestTreeTransform, self).setUp()
64
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
91
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
65
92
        os.chdir('..')
66
93
 
67
94
    def get_transform(self):
69
96
        self.addCleanup(transform.finalize)
70
97
        return transform, transform.root
71
98
 
 
99
    def get_transform_for_sha1_test(self):
 
100
        trans, root = self.get_transform()
 
101
        self.wt.lock_tree_write()
 
102
        self.addCleanup(self.wt.unlock)
 
103
        contents = ['just some content\n']
 
104
        sha1 = osutils.sha_strings(contents)
 
105
        # Roll back the clock
 
106
        trans._creation_mtime = time.time() - 20.0
 
107
        return trans, root, contents, sha1
 
108
 
72
109
    def test_existing_limbo(self):
73
110
        transform, root = self.get_transform()
74
111
        limbo_name = transform._limbodir
101
138
        imaginary_id = transform.trans_id_tree_path('imaginary')
102
139
        imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
140
        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())
 
141
        self.assertEqual(root, transform.get_tree_parent(imaginary_id))
 
142
        self.assertEqual('directory', transform.final_kind(root))
 
143
        self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
107
144
        trans_id = transform.create_path('name', root)
108
145
        self.assertIs(transform.final_file_id(trans_id), None)
109
 
        self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
 
146
        self.assertIs(None, transform.final_kind(trans_id))
110
147
        transform.create_file('contents', trans_id)
111
148
        transform.set_executability(True, trans_id)
112
149
        transform.version_file('my_pretties', trans_id)
137
174
        transform.finalize()
138
175
        transform.finalize()
139
176
 
 
177
    def test_apply_informs_tree_of_observed_sha1(self):
 
178
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
179
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
180
                                  sha1=sha1)
 
181
        calls = []
 
182
        orig = self.wt._observed_sha1
 
183
        def _observed_sha1(*args):
 
184
            calls.append(args)
 
185
            orig(*args)
 
186
        self.wt._observed_sha1 = _observed_sha1
 
187
        trans.apply()
 
188
        self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
 
189
                         calls)
 
190
 
 
191
    def test_create_file_caches_sha1(self):
 
192
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
193
        trans_id = trans.create_path('file1', root)
 
194
        trans.create_file(contents, trans_id, sha1=sha1)
 
195
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
196
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
197
        self.assertEqual(o_sha1, sha1)
 
198
        self.assertEqualStat(o_st_val, st_val)
 
199
 
 
200
    def test__apply_insertions_updates_sha1(self):
 
201
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
202
        trans_id = trans.create_path('file1', root)
 
203
        trans.create_file(contents, trans_id, sha1=sha1)
 
204
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
205
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
206
        self.assertEqual(o_sha1, sha1)
 
207
        self.assertEqualStat(o_st_val, st_val)
 
208
        creation_mtime = trans._creation_mtime + 10.0
 
209
        # We fake a time difference from when the file was created until now it
 
210
        # is being renamed by using os.utime. Note that the change we actually
 
211
        # want to see is the real ctime change from 'os.rename()', but as long
 
212
        # as we observe a new stat value, we should be fine.
 
213
        os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
 
214
        trans.apply()
 
215
        new_st_val = osutils.lstat(self.wt.abspath('file1'))
 
216
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
217
        self.assertEqual(o_sha1, sha1)
 
218
        self.assertEqualStat(o_st_val, new_st_val)
 
219
        self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
 
220
 
 
221
    def test_new_file_caches_sha1(self):
 
222
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
223
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
224
                                  sha1=sha1)
 
225
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
226
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
227
        self.assertEqual(o_sha1, sha1)
 
228
        self.assertEqualStat(o_st_val, st_val)
 
229
 
 
230
    def test_cancel_creation_removes_observed_sha1(self):
 
231
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
232
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
233
                                  sha1=sha1)
 
234
        self.assertTrue(trans_id in trans._observed_sha1s)
 
235
        trans.cancel_creation(trans_id)
 
236
        self.assertFalse(trans_id in trans._observed_sha1s)
 
237
 
140
238
    def test_create_files_same_timestamp(self):
141
239
        transform, root = self.get_transform()
142
240
        self.wt.lock_tree_write()
190
288
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
191
289
        self.assertRaises(ValueError, transform.fixup_new_roots)
192
290
 
 
291
    def test_retain_existing_root(self):
 
292
        tt, root = self.get_transform()
 
293
        with tt:
 
294
            tt.new_directory('', ROOT_PARENT, 'new-root-id')
 
295
            tt.fixup_new_roots()
 
296
            self.assertNotEqual('new-root-id', tt.final_file_id(tt.root))
 
297
 
 
298
    def test_retain_existing_root_added_file(self):
 
299
        tt, root = self.get_transform()
 
300
        new_trans_id = tt.new_directory('', ROOT_PARENT, 'new-root-id')
 
301
        child = tt.new_directory('child', new_trans_id, 'child-id')
 
302
        tt.fixup_new_roots()
 
303
        self.assertEqual(tt.root, tt.final_parent(child))
 
304
 
 
305
    def test_add_unversioned_root(self):
 
306
        transform, root = self.get_transform()
 
307
        new_trans_id = transform.new_directory('', ROOT_PARENT, None)
 
308
        transform.delete_contents(transform.root)
 
309
        transform.fixup_new_roots()
 
310
        self.assertNotIn(transform.root, transform._new_id)
 
311
 
 
312
    def test_remove_root_fixup(self):
 
313
        transform, root = self.get_transform()
 
314
        old_root_id = self.wt.get_root_id()
 
315
        self.assertNotEqual('new-root-id', old_root_id)
 
316
        transform.delete_contents(root)
 
317
        transform.unversion_file(root)
 
318
        transform.fixup_new_roots()
 
319
        transform.apply()
 
320
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
321
 
 
322
        transform, root = self.get_transform()
 
323
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
 
324
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
 
325
        self.assertRaises(ValueError, transform.fixup_new_roots)
 
326
 
 
327
    def test_fixup_new_roots_permits_empty_tree(self):
 
328
        transform, root = self.get_transform()
 
329
        transform.delete_contents(root)
 
330
        transform.unversion_file(root)
 
331
        transform.fixup_new_roots()
 
332
        self.assertIs(None, transform.final_kind(root))
 
333
        self.assertIs(None, transform.final_file_id(root))
 
334
 
 
335
    def test_apply_retains_root_directory(self):
 
336
        # Do not attempt to delete the physical root directory, because that
 
337
        # is impossible.
 
338
        transform, root = self.get_transform()
 
339
        with transform:
 
340
            transform.delete_contents(root)
 
341
            e = self.assertRaises(AssertionError, self.assertRaises,
 
342
                                  errors.TransformRenameFailed,
 
343
                                  transform.apply)
 
344
        self.assertContainsRe('TransformRenameFailed not raised', str(e))
 
345
 
 
346
    def test_apply_retains_file_id(self):
 
347
        transform, root = self.get_transform()
 
348
        old_root_id = transform.tree_file_id(root)
 
349
        transform.unversion_file(root)
 
350
        transform.apply()
 
351
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
352
 
193
353
    def test_hardlink(self):
194
354
        self.requireFeature(HardlinkFeature)
195
355
        transform, root = self.get_transform()
200
360
        trans_id = target_transform.create_path('file1', target_transform.root)
201
361
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
362
        target_transform.apply()
203
 
        self.failUnlessExists('target/file1')
 
363
        self.assertPathExists('target/file1')
204
364
        source_stat = os.stat(self.wt.abspath('file1'))
205
365
        target_stat = os.stat('target/file1')
206
366
        self.assertEqual(source_stat, target_stat)
239
399
        tree.lock_read()
240
400
        self.addCleanup(tree.unlock)
241
401
        self.assertEqual('subtree-revision',
242
 
                         tree.inventory['subtree-id'].reference_revision)
 
402
                         tree.root_inventory['subtree-id'].reference_revision)
243
403
 
244
404
    def test_conflicts(self):
245
405
        transform, root = self.get_transform()
372
532
        transform.new_file('FiLe', transform.root, 'content')
373
533
        resolve_conflicts(transform)
374
534
        transform.apply()
375
 
        self.failUnlessExists('tree/file')
376
 
        self.failUnlessExists('tree/FiLe.moved')
 
535
        self.assertPathExists('tree/file')
 
536
        self.assertPathExists('tree/FiLe.moved')
377
537
 
378
538
    def test_resolve_checkout_case_conflict(self):
379
539
        tree = self.make_branch_and_tree('tree')
388
548
        resolve_conflicts(transform,
389
549
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
390
550
        transform.apply()
391
 
        self.failUnlessExists('tree/file')
392
 
        self.failUnlessExists('tree/FiLe.moved')
 
551
        self.assertPathExists('tree/file')
 
552
        self.assertPathExists('tree/FiLe.moved')
393
553
 
394
554
    def test_apply_case_conflict(self):
395
555
        """Ensure that a transform with case conflicts can always be applied"""
403
563
        transform.new_file('dirFiLe', dir, 'content')
404
564
        resolve_conflicts(transform)
405
565
        transform.apply()
406
 
        self.failUnlessExists('tree/file')
 
566
        self.assertPathExists('tree/file')
407
567
        if not os.path.exists('tree/FiLe.moved'):
408
 
            self.failUnlessExists('tree/FiLe')
409
 
        self.failUnlessExists('tree/dir/dirfile')
 
568
            self.assertPathExists('tree/FiLe')
 
569
        self.assertPathExists('tree/dir/dirfile')
410
570
        if not os.path.exists('tree/dir/dirFiLe.moved'):
411
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
571
            self.assertPathExists('tree/dir/dirFiLe')
412
572
 
413
573
    def test_case_insensitive_limbo(self):
414
574
        tree = self.make_branch_and_tree('tree')
622
782
                            'wizard2', 'behind_curtain')
623
783
 
624
784
    def test_symlinks_unicode(self):
625
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
785
        self.requireFeature(features.UnicodeFilenameFeature)
626
786
        self._test_symlinks(u'\N{Euro Sign}wizard',
627
787
                            u'wizard-targ\N{Euro Sign}t',
628
788
                            u'\N{Euro Sign}wizard2',
716
876
        raw_conflicts = resolve_conflicts(tt)
717
877
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
718
878
        tt.finalize()
719
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
879
        conflicts_s = [unicode(c) for c in cooked_conflicts]
720
880
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
721
881
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
722
882
                                         'Moved existing file to '
735
895
                                         ' versioned, but has versioned'
736
896
                                         ' children.  Versioned directory.')
737
897
        self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
738
 
                                         ' oz/emeraldcity.  Cancelled move.')
 
898
                                         ' oz/emeraldcity. Cancelled move.')
739
899
 
740
900
    def prepare_wrong_parent_kind(self):
741
901
        tt, root = self.get_transform()
792
952
        self.assertIs(None, self.wt.path2id('parent'))
793
953
        self.assertIs(None, self.wt.path2id('parent.new'))
794
954
 
 
955
    def test_resolve_conflicts_missing_parent(self):
 
956
        wt = self.make_branch_and_tree('.')
 
957
        tt = TreeTransform(wt)
 
958
        self.addCleanup(tt.finalize)
 
959
        parent = tt.trans_id_file_id('parent-id')
 
960
        tt.new_file('file', parent, 'Contents')
 
961
        raw_conflicts = resolve_conflicts(tt)
 
962
        # Since the directory doesn't exist it's seen as 'missing'.  So
 
963
        # 'resolve_conflicts' create a conflict asking for it to be created.
 
964
        self.assertLength(1, raw_conflicts)
 
965
        self.assertEqual(('missing parent', 'Created directory', 'new-1'),
 
966
                         raw_conflicts.pop())
 
967
        # apply fail since the missing directory doesn't exist
 
968
        self.assertRaises(errors.NoFinalPath, tt.apply)
 
969
 
795
970
    def test_moving_versioned_directories(self):
796
971
        create, root = self.get_transform()
797
972
        kansas = create.new_directory('kansas', root, 'kansas-id')
830
1005
        rename.set_executability(True, myfile)
831
1006
        rename.apply()
832
1007
 
 
1008
    def test_rename_fails(self):
 
1009
        self.requireFeature(features.not_running_as_root)
 
1010
        # see https://bugs.launchpad.net/bzr/+bug/491763
 
1011
        create, root_id = self.get_transform()
 
1012
        first_dir = create.new_directory('first-dir', root_id, 'first-id')
 
1013
        myfile = create.new_file('myfile', root_id, 'myfile-text',
 
1014
                                 'myfile-id')
 
1015
        create.apply()
 
1016
        if os.name == "posix" and sys.platform != "cygwin":
 
1017
            # posix filesystems fail on renaming if the readonly bit is set
 
1018
            osutils.make_readonly(self.wt.abspath('first-dir'))
 
1019
        elif os.name == "nt":
 
1020
            # windows filesystems fail on renaming open files
 
1021
            self.addCleanup(file(self.wt.abspath('myfile')).close)
 
1022
        else:
 
1023
            self.skip("Don't know how to force a permissions error on rename")
 
1024
        # now transform to rename
 
1025
        rename_transform, root_id = self.get_transform()
 
1026
        file_trans_id = rename_transform.trans_id_file_id('myfile-id')
 
1027
        dir_id = rename_transform.trans_id_file_id('first-id')
 
1028
        rename_transform.adjust_path('newname', dir_id, file_trans_id)
 
1029
        e = self.assertRaises(errors.TransformRenameFailed,
 
1030
            rename_transform.apply)
 
1031
        # On nix looks like: 
 
1032
        # "Failed to rename .../work/.bzr/checkout/limbo/new-1
 
1033
        # to .../first-dir/newname: [Errno 13] Permission denied"
 
1034
        # On windows looks like:
 
1035
        # "Failed to rename .../work/myfile to 
 
1036
        # .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
 
1037
        # This test isn't concerned with exactly what the error looks like,
 
1038
        # and the strerror will vary across OS and locales, but the assert
 
1039
        # that the exeception attributes are what we expect
 
1040
        self.assertEqual(e.errno, errno.EACCES)
 
1041
        if os.name == "posix":
 
1042
            self.assertEndsWith(e.to_path, "/first-dir/newname")
 
1043
        else:
 
1044
            self.assertEqual(os.path.basename(e.from_path), "myfile")
 
1045
 
833
1046
    def test_set_executability_order(self):
834
1047
        """Ensure that executability behaves the same, no matter what order.
835
1048
 
1107
1320
        parent2 = transform.new_directory('parent2', root)
1108
1321
        transform.adjust_path('child1', parent2, child1)
1109
1322
        transform.apply()
1110
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1111
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1323
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1324
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1112
1325
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1113
1326
        # no rename for child1 (counting only renames during apply)
1114
 
        self.failUnlessEqual(2, transform.rename_count)
 
1327
        self.assertEqual(2, transform.rename_count)
1115
1328
 
1116
1329
    def test_cancel_parent(self):
1117
1330
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1140
1353
        parent2 = transform.new_directory('parent2', root)
1141
1354
        transform.adjust_path('child1', parent2, child1)
1142
1355
        transform.apply()
1143
 
        self.failIfExists(self.wt.abspath('parent1'))
1144
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1356
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1357
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1145
1358
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1146
 
        self.failUnlessEqual(2, transform.rename_count)
 
1359
        self.assertEqual(2, transform.rename_count)
1147
1360
 
1148
1361
    def test_adjust_and_cancel(self):
1149
1362
        """Make sure adjust_path keeps track of limbo children properly"""
1182
1395
        child = transform.new_directory('child', parent)
1183
1396
        transform.adjust_path('parent', root, parent)
1184
1397
        transform.apply()
1185
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1398
        self.assertPathExists(self.wt.abspath('parent/child'))
1186
1399
        self.assertEqual(1, transform.rename_count)
1187
1400
 
1188
1401
    def test_reuse_name(self):
1264
1477
        # The rename will fail because the target directory is not empty (but
1265
1478
        # raises FileExists anyway).
1266
1479
        err = self.assertRaises(errors.FileExists, tt_helper)
1267
 
        self.assertContainsRe(str(err),
1268
 
            "^File exists: .+/baz")
 
1480
        self.assertEndsWith(err.path, "/baz")
1269
1481
 
1270
1482
    def test_two_directories_clash(self):
1271
1483
        def tt_helper():
1283
1495
                wt.unlock()
1284
1496
                raise
1285
1497
        err = self.assertRaises(errors.FileExists, tt_helper)
1286
 
        self.assertContainsRe(str(err),
1287
 
            "^File exists: .+/foo")
 
1498
        self.assertEndsWith(err.path, "/foo")
1288
1499
 
1289
1500
    def test_two_directories_clash_finalize(self):
1290
1501
        def tt_helper():
1302
1513
                tt.finalize()
1303
1514
                raise
1304
1515
        err = self.assertRaises(errors.FileExists, tt_helper)
1305
 
        self.assertContainsRe(str(err),
1306
 
            "^File exists: .+/foo")
 
1516
        self.assertEndsWith(err.path, "/foo")
1307
1517
 
1308
1518
    def test_file_to_directory(self):
1309
1519
        wt = self.make_branch_and_tree('.')
1319
1529
        tt.create_file(["aa\n"], bar_trans_id)
1320
1530
        tt.version_file("bar-1", bar_trans_id)
1321
1531
        tt.apply()
1322
 
        self.failUnlessExists("foo/bar")
 
1532
        self.assertPathExists("foo/bar")
1323
1533
        wt.lock_read()
1324
1534
        try:
1325
 
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1326
 
                    "directory")
 
1535
            self.assertEqual(wt.kind(wt.path2id("foo")), "directory")
1327
1536
        finally:
1328
1537
            wt.unlock()
1329
1538
        wt.commit("two")
1342
1551
        tt.delete_contents(foo_trans_id)
1343
1552
        tt.create_symlink("bar", foo_trans_id)
1344
1553
        tt.apply()
1345
 
        self.failUnlessExists("foo")
 
1554
        self.assertPathExists("foo")
1346
1555
        wt.lock_read()
1347
1556
        self.addCleanup(wt.unlock)
1348
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1349
 
                "symlink")
 
1557
        self.assertEqual(wt.kind(wt.path2id("foo")), "symlink")
1350
1558
 
1351
1559
    def test_dir_to_file(self):
1352
1560
        wt = self.make_branch_and_tree('.')
1361
1569
        tt.delete_versioned(bar_trans_id)
1362
1570
        tt.create_file(["aa\n"], foo_trans_id)
1363
1571
        tt.apply()
1364
 
        self.failUnlessExists("foo")
 
1572
        self.assertPathExists("foo")
1365
1573
        wt.lock_read()
1366
1574
        self.addCleanup(wt.unlock)
1367
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1368
 
                "file")
 
1575
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
1369
1576
 
1370
1577
    def test_dir_to_hardlink(self):
1371
1578
        self.requireFeature(HardlinkFeature)
1382
1589
        self.build_tree(['baz'])
1383
1590
        tt.create_hardlink("baz", foo_trans_id)
1384
1591
        tt.apply()
1385
 
        self.failUnlessExists("foo")
1386
 
        self.failUnlessExists("baz")
 
1592
        self.assertPathExists("foo")
 
1593
        self.assertPathExists("baz")
1387
1594
        wt.lock_read()
1388
1595
        self.addCleanup(wt.unlock)
1389
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1390
 
                "file")
 
1596
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
1391
1597
 
1392
1598
    def test_no_final_path(self):
1393
1599
        transform, root = self.get_transform()
1439
1645
    def __init__(self, dirname, root_id):
1440
1646
        self.name = dirname
1441
1647
        os.mkdir(dirname)
1442
 
        self.wt = BzrDir.create_standalone_workingtree(dirname)
 
1648
        self.wt = ControlDir.create_standalone_workingtree(dirname)
1443
1649
        self.wt.set_root_id(root_id)
1444
1650
        self.b = self.wt.branch
1445
1651
        self.tt = TreeTransform(self.wt)
1451
1657
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1452
1658
 
1453
1659
 
 
1660
class TestInventoryAltered(tests.TestCaseWithTransport):
 
1661
 
 
1662
    def test_inventory_altered_unchanged(self):
 
1663
        tree = self.make_branch_and_tree('tree')
 
1664
        self.build_tree(['tree/foo'])
 
1665
        tree.add('foo', 'foo-id')
 
1666
        with TransformPreview(tree) as tt:
 
1667
            self.assertEqual([], tt._inventory_altered())
 
1668
 
 
1669
    def test_inventory_altered_changed_parent_id(self):
 
1670
        tree = self.make_branch_and_tree('tree')
 
1671
        self.build_tree(['tree/foo'])
 
1672
        tree.add('foo', 'foo-id')
 
1673
        with TransformPreview(tree) as tt:
 
1674
            tt.unversion_file(tt.root)
 
1675
            tt.version_file('new-id', tt.root)
 
1676
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1677
            foo_tuple = ('foo', foo_trans_id)
 
1678
            root_tuple = ('', tt.root)
 
1679
            self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
 
1680
 
 
1681
    def test_inventory_altered_noop_changed_parent_id(self):
 
1682
        tree = self.make_branch_and_tree('tree')
 
1683
        self.build_tree(['tree/foo'])
 
1684
        tree.add('foo', 'foo-id')
 
1685
        with TransformPreview(tree) as tt:
 
1686
            tt.unversion_file(tt.root)
 
1687
            tt.version_file(tree.get_root_id(), tt.root)
 
1688
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1689
            self.assertEqual([], tt._inventory_altered())
 
1690
 
 
1691
 
1454
1692
class TestTransformMerge(TestCaseInTempDir):
1455
1693
 
1456
1694
    def test_text_merge(self):
1523
1761
        merge_modified = this.wt.merge_modified()
1524
1762
        self.assertSubset(merge_modified, modified)
1525
1763
        self.assertEqual(len(merge_modified), len(modified))
1526
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1764
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
1527
1765
        modified.pop(0)
1528
1766
        merge_modified = this.wt.merge_modified()
1529
1767
        self.assertSubset(merge_modified, modified)
1643
1881
    def test_build_tree_with_symlinks(self):
1644
1882
        self.requireFeature(SymlinkFeature)
1645
1883
        os.mkdir('a')
1646
 
        a = BzrDir.create_standalone_workingtree('a')
 
1884
        a = ControlDir.create_standalone_workingtree('a')
1647
1885
        os.mkdir('a/foo')
1648
 
        file('a/foo/bar', 'wb').write('contents')
 
1886
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1649
1887
        os.symlink('a/foo/bar', 'a/foo/baz')
1650
1888
        a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1889
        a.commit('initial commit')
1652
 
        b = BzrDir.create_standalone_workingtree('b')
 
1890
        b = ControlDir.create_standalone_workingtree('b')
1653
1891
        basis = a.basis_tree()
1654
1892
        basis.lock_read()
1655
1893
        self.addCleanup(basis.unlock)
1660
1898
 
1661
1899
    def test_build_with_references(self):
1662
1900
        tree = self.make_branch_and_tree('source',
1663
 
            format='dirstate-with-subtree')
 
1901
            format='development-subtree')
1664
1902
        subtree = self.make_branch_and_tree('source/subtree',
1665
 
            format='dirstate-with-subtree')
 
1903
            format='development-subtree')
1666
1904
        tree.add_reference(subtree)
1667
1905
        tree.commit('a revision')
1668
1906
        tree.branch.create_checkout('target')
1669
 
        self.failUnlessExists('target')
1670
 
        self.failUnlessExists('target/subtree')
 
1907
        self.assertPathExists('target')
 
1908
        self.assertPathExists('target/subtree')
1671
1909
 
1672
1910
    def test_file_conflict_handling(self):
1673
1911
        """Ensure that when building trees, conflict handling is done"""
1720
1958
        source.commit('added file')
1721
1959
        build_tree(source.basis_tree(), target)
1722
1960
        self.assertEqual([], target.conflicts())
1723
 
        self.failUnlessExists('target/dir1/file')
 
1961
        self.assertPathExists('target/dir1/file')
1724
1962
 
1725
1963
        # Ensure contents are merged
1726
1964
        target = self.make_branch_and_tree('target2')
1727
1965
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1728
1966
        build_tree(source.basis_tree(), target)
1729
1967
        self.assertEqual([], target.conflicts())
1730
 
        self.failUnlessExists('target2/dir1/file2')
1731
 
        self.failUnlessExists('target2/dir1/file')
 
1968
        self.assertPathExists('target2/dir1/file2')
 
1969
        self.assertPathExists('target2/dir1/file')
1732
1970
 
1733
1971
        # Ensure new contents are suppressed for existing branches
1734
1972
        target = self.make_branch_and_tree('target3')
1735
1973
        self.make_branch('target3/dir1')
1736
1974
        self.build_tree(['target3/dir1/file2'])
1737
1975
        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')
 
1976
        self.assertPathDoesNotExist('target3/dir1/file')
 
1977
        self.assertPathExists('target3/dir1/file2')
 
1978
        self.assertPathExists('target3/dir1.diverted/file')
1741
1979
        self.assertEqual([DuplicateEntry('Diverted to',
1742
1980
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1743
1981
            target.conflicts())
1746
1984
        self.build_tree(['target4/dir1/'])
1747
1985
        self.make_branch('target4/dir1/file')
1748
1986
        build_tree(source.basis_tree(), target)
1749
 
        self.failUnlessExists('target4/dir1/file')
 
1987
        self.assertPathExists('target4/dir1/file')
1750
1988
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1751
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1989
        self.assertPathExists('target4/dir1/file.diverted')
1752
1990
        self.assertEqual([DuplicateEntry('Diverted to',
1753
1991
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1754
1992
            target.conflicts())
1822
2060
        self.addCleanup(target.unlock)
1823
2061
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1824
2062
 
 
2063
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
2064
        source = self.create_ab_tree()
 
2065
        sha1 = osutils.sha_string('A')
 
2066
        target = self.make_branch_and_tree('target')
 
2067
        target.lock_write()
 
2068
        self.addCleanup(target.unlock)
 
2069
        state = target.current_dirstate()
 
2070
        state._cutoff_time = time.time() + 60
 
2071
        build_tree(source.basis_tree(), target, source)
 
2072
        entry = state._get_entry(0, path_utf8='file1')
 
2073
        self.assertEqual(sha1, entry[1][0][1])
 
2074
 
1825
2075
    def test_build_tree_accelerator_tree_missing_file(self):
1826
2076
        source = self.create_ab_tree()
1827
2077
        os.unlink('source/file1')
1923
2173
        self.assertTrue(source.is_executable('file1-id'))
1924
2174
 
1925
2175
    def install_rot13_content_filter(self, pattern):
 
2176
        # We could use
 
2177
        # self.addCleanup(filters._reset_registry, filters._reset_registry())
 
2178
        # below, but that looks a bit... hard to read even if it's exactly
 
2179
        # the same thing.
1926
2180
        original_registry = filters._reset_registry()
1927
2181
        def restore_registry():
1928
2182
            filters._reset_registry(original_registry)
1966
2220
        self.assertEqualStat(source_stat, target_stat)
1967
2221
 
1968
2222
    def test_case_insensitive_build_tree_inventory(self):
1969
 
        if (tests.CaseInsensitiveFilesystemFeature.available()
1970
 
            or tests.CaseInsCasePresFilenameFeature.available()):
 
2223
        if (features.CaseInsensitiveFilesystemFeature.available()
 
2224
            or features.CaseInsCasePresFilenameFeature.available()):
1971
2225
            raise tests.UnavailableFeature('Fully case sensitive filesystem')
1972
2226
        source = self.make_branch_and_tree('source')
1973
2227
        self.build_tree(['source/file', 'source/FILE'])
1981
2235
        self.assertEqual('file.moved', target.id2path('lower-id'))
1982
2236
        self.assertEqual('FILE', target.id2path('upper-id'))
1983
2237
 
 
2238
    def test_build_tree_observes_sha(self):
 
2239
        source = self.make_branch_and_tree('source')
 
2240
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2241
        source.add(['file1', 'dir', 'dir/file2'],
 
2242
                   ['file1-id', 'dir-id', 'file2-id'])
 
2243
        source.commit('new files')
 
2244
        target = self.make_branch_and_tree('target')
 
2245
        target.lock_write()
 
2246
        self.addCleanup(target.unlock)
 
2247
        # We make use of the fact that DirState caches its cutoff time. So we
 
2248
        # set the 'safe' time to one minute in the future.
 
2249
        state = target.current_dirstate()
 
2250
        state._cutoff_time = time.time() + 60
 
2251
        build_tree(source.basis_tree(), target)
 
2252
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2253
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2254
        # entry[1] is the state information, entry[1][0] is the state of the
 
2255
        # working tree, entry[1][0][1] is the sha value for the current working
 
2256
        # tree
 
2257
        entry1 = state._get_entry(0, path_utf8='file1')
 
2258
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2259
        # The 'size' field must also be set.
 
2260
        self.assertEqual(25, entry1[1][0][2])
 
2261
        entry1_state = entry1[1][0]
 
2262
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2263
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2264
        self.assertEqual(29, entry2[1][0][2])
 
2265
        entry2_state = entry2[1][0]
 
2266
        # Now, make sure that we don't have to re-read the content. The
 
2267
        # packed_stat should match exactly.
 
2268
        self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
 
2269
        self.assertEqual(entry2_sha,
 
2270
                         target.get_file_sha1('file2-id', 'dir/file2'))
 
2271
        self.assertEqual(entry1_state, entry1[1][0])
 
2272
        self.assertEqual(entry2_state, entry2[1][0])
 
2273
 
1984
2274
 
1985
2275
class TestCommitTransform(tests.TestCaseWithTransport):
1986
2276
 
2087
2377
        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2088
2378
                          'message')
2089
2379
 
2090
 
 
2091
 
class MockTransform(object):
2092
 
 
2093
 
    def has_named_child(self, by_parent, parent_id, name):
2094
 
        for child_id in by_parent[parent_id]:
2095
 
            if child_id == '0':
2096
 
                if name == "name~":
2097
 
                    return True
2098
 
            elif name == "name.~%s~" % child_id:
2099
 
                return True
2100
 
        return False
2101
 
 
2102
 
 
2103
 
class MockEntry(object):
2104
 
    def __init__(self):
2105
 
        object.__init__(self)
2106
 
        self.name = "name"
2107
 
 
2108
 
 
2109
 
class TestGetBackupName(TestCase):
2110
 
    def test_get_backup_name(self):
2111
 
        tt = MockTransform()
2112
 
        name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2113
 
        self.assertEqual(name, 'name.~1~')
2114
 
        name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2115
 
        self.assertEqual(name, 'name.~2~')
2116
 
        name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2117
 
        self.assertEqual(name, 'name.~1~')
2118
 
        name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2119
 
        self.assertEqual(name, 'name.~1~')
2120
 
        name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2121
 
        self.assertEqual(name, 'name.~4~')
 
2380
    def test_commit_rich_revision_data(self):
 
2381
        branch, tt = self.get_branch_and_transform()
 
2382
        rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
 
2383
                           committer='me <me@example.com>',
 
2384
                           revprops={'foo': 'bar'}, revision_id='revid-1',
 
2385
                           authors=['Author1 <author1@example.com>',
 
2386
                              'Author2 <author2@example.com>',
 
2387
                               ])
 
2388
        self.assertEqual('revid-1', rev_id)
 
2389
        revision = branch.repository.get_revision(rev_id)
 
2390
        self.assertEqual(1, revision.timestamp)
 
2391
        self.assertEqual(43201, revision.timezone)
 
2392
        self.assertEqual('me <me@example.com>', revision.committer)
 
2393
        self.assertEqual(['Author1 <author1@example.com>',
 
2394
                          'Author2 <author2@example.com>'],
 
2395
                         revision.get_apparent_authors())
 
2396
        del revision.properties['authors']
 
2397
        self.assertEqual({'foo': 'bar',
 
2398
                          'branch-nick': 'tree'},
 
2399
                         revision.properties)
 
2400
 
 
2401
    def test_no_explicit_revprops(self):
 
2402
        branch, tt = self.get_branch_and_transform()
 
2403
        rev_id = tt.commit(branch, 'message', authors=[
 
2404
            'Author1 <author1@example.com>',
 
2405
            'Author2 <author2@example.com>', ])
 
2406
        revision = branch.repository.get_revision(rev_id)
 
2407
        self.assertEqual(['Author1 <author1@example.com>',
 
2408
                          'Author2 <author2@example.com>'],
 
2409
                         revision.get_apparent_authors())
 
2410
        self.assertEqual('tree', revision.properties['branch-nick'])
2122
2411
 
2123
2412
 
2124
2413
class TestFileMover(tests.TestCaseWithTransport):
2127
2416
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2128
2417
        mover = _FileMover()
2129
2418
        mover.rename('a', 'q')
2130
 
        self.failUnlessExists('q')
2131
 
        self.failIfExists('a')
2132
 
        self.failUnlessExists('q/b')
2133
 
        self.failUnlessExists('c')
2134
 
        self.failUnlessExists('c/d')
 
2419
        self.assertPathExists('q')
 
2420
        self.assertPathDoesNotExist('a')
 
2421
        self.assertPathExists('q/b')
 
2422
        self.assertPathExists('c')
 
2423
        self.assertPathExists('c/d')
2135
2424
 
2136
2425
    def test_pre_delete_rollback(self):
2137
2426
        self.build_tree(['a/'])
2138
2427
        mover = _FileMover()
2139
2428
        mover.pre_delete('a', 'q')
2140
 
        self.failUnlessExists('q')
2141
 
        self.failIfExists('a')
 
2429
        self.assertPathExists('q')
 
2430
        self.assertPathDoesNotExist('a')
2142
2431
        mover.rollback()
2143
 
        self.failIfExists('q')
2144
 
        self.failUnlessExists('a')
 
2432
        self.assertPathDoesNotExist('q')
 
2433
        self.assertPathExists('a')
2145
2434
 
2146
2435
    def test_apply_deletions(self):
2147
2436
        self.build_tree(['a/', 'b/'])
2148
2437
        mover = _FileMover()
2149
2438
        mover.pre_delete('a', 'q')
2150
2439
        mover.pre_delete('b', 'r')
2151
 
        self.failUnlessExists('q')
2152
 
        self.failUnlessExists('r')
2153
 
        self.failIfExists('a')
2154
 
        self.failIfExists('b')
 
2440
        self.assertPathExists('q')
 
2441
        self.assertPathExists('r')
 
2442
        self.assertPathDoesNotExist('a')
 
2443
        self.assertPathDoesNotExist('b')
2155
2444
        mover.apply_deletions()
2156
 
        self.failIfExists('q')
2157
 
        self.failIfExists('r')
2158
 
        self.failIfExists('a')
2159
 
        self.failIfExists('b')
 
2445
        self.assertPathDoesNotExist('q')
 
2446
        self.assertPathDoesNotExist('r')
 
2447
        self.assertPathDoesNotExist('a')
 
2448
        self.assertPathDoesNotExist('b')
2160
2449
 
2161
2450
    def test_file_mover_rollback(self):
2162
2451
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2167
2456
            mover.rename('a', 'c')
2168
2457
        except errors.FileExists, e:
2169
2458
            mover.rollback()
2170
 
        self.failUnlessExists('a')
2171
 
        self.failUnlessExists('c/d')
 
2459
        self.assertPathExists('a')
 
2460
        self.assertPathExists('c/d')
2172
2461
 
2173
2462
 
2174
2463
class Bogus(Exception):
2204
2493
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2205
2494
        self.assertRaises(Bogus, tt.apply,
2206
2495
                          _mover=self.ExceptionFileMover(bad_source='a'))
2207
 
        self.failUnlessExists('a')
2208
 
        self.failUnlessExists('a/b')
 
2496
        self.assertPathExists('a')
 
2497
        self.assertPathExists('a/b')
2209
2498
        tt.apply()
2210
 
        self.failUnlessExists('c')
2211
 
        self.failUnlessExists('c/d')
 
2499
        self.assertPathExists('c')
 
2500
        self.assertPathExists('c/d')
2212
2501
 
2213
2502
    def test_rollback_rename_into_place(self):
2214
2503
        tree = self.make_branch_and_tree('.')
2220
2509
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2221
2510
        self.assertRaises(Bogus, tt.apply,
2222
2511
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2223
 
        self.failUnlessExists('a')
2224
 
        self.failUnlessExists('a/b')
 
2512
        self.assertPathExists('a')
 
2513
        self.assertPathExists('a/b')
2225
2514
        tt.apply()
2226
 
        self.failUnlessExists('c')
2227
 
        self.failUnlessExists('c/d')
 
2515
        self.assertPathExists('c')
 
2516
        self.assertPathExists('c/d')
2228
2517
 
2229
2518
    def test_rollback_deletion(self):
2230
2519
        tree = self.make_branch_and_tree('.')
2236
2525
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2237
2526
        self.assertRaises(Bogus, tt.apply,
2238
2527
                          _mover=self.ExceptionFileMover(bad_target='d'))
2239
 
        self.failUnlessExists('a')
2240
 
        self.failUnlessExists('a/b')
2241
 
 
2242
 
    def test_resolve_no_parent(self):
 
2528
        self.assertPathExists('a')
 
2529
        self.assertPathExists('a/b')
 
2530
 
 
2531
 
 
2532
class TestFinalizeRobustness(tests.TestCaseWithTransport):
 
2533
    """Ensure treetransform creation errors can be safely cleaned up after"""
 
2534
 
 
2535
    def _override_globals_in_method(self, instance, method_name, globals):
 
2536
        """Replace method on instance with one with updated globals"""
 
2537
        import types
 
2538
        func = getattr(instance, method_name).im_func
 
2539
        new_globals = dict(func.func_globals)
 
2540
        new_globals.update(globals)
 
2541
        new_func = types.FunctionType(func.func_code, new_globals,
 
2542
            func.func_name, func.func_defaults)
 
2543
        setattr(instance, method_name,
 
2544
            types.MethodType(new_func, instance, instance.__class__))
 
2545
        self.addCleanup(delattr, instance, method_name)
 
2546
 
 
2547
    @staticmethod
 
2548
    def _fake_open_raises_before(name, mode):
 
2549
        """Like open() but raises before doing anything"""
 
2550
        raise RuntimeError
 
2551
 
 
2552
    @staticmethod
 
2553
    def _fake_open_raises_after(name, mode):
 
2554
        """Like open() but raises after creating file without returning"""
 
2555
        open(name, mode).close()
 
2556
        raise RuntimeError
 
2557
 
 
2558
    def create_transform_and_root_trans_id(self):
 
2559
        """Setup a transform creating a file in limbo"""
 
2560
        tree = self.make_branch_and_tree('.')
 
2561
        tt = TreeTransform(tree)
 
2562
        return tt, tt.create_path("a", tt.root)
 
2563
 
 
2564
    def create_transform_and_subdir_trans_id(self):
 
2565
        """Setup a transform creating a directory containing a file in limbo"""
 
2566
        tree = self.make_branch_and_tree('.')
 
2567
        tt = TreeTransform(tree)
 
2568
        d_trans_id = tt.create_path("d", tt.root)
 
2569
        tt.create_directory(d_trans_id)
 
2570
        f_trans_id = tt.create_path("a", d_trans_id)
 
2571
        tt.adjust_path("a", d_trans_id, f_trans_id)
 
2572
        return tt, f_trans_id
 
2573
 
 
2574
    def test_root_create_file_open_raises_before_creation(self):
 
2575
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2576
        self._override_globals_in_method(tt, "create_file",
 
2577
            {"open": self._fake_open_raises_before})
 
2578
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2579
        path = tt._limbo_name(trans_id)
 
2580
        self.assertPathDoesNotExist(path)
 
2581
        tt.finalize()
 
2582
        self.assertPathDoesNotExist(tt._limbodir)
 
2583
 
 
2584
    def test_root_create_file_open_raises_after_creation(self):
 
2585
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2586
        self._override_globals_in_method(tt, "create_file",
 
2587
            {"open": self._fake_open_raises_after})
 
2588
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2589
        path = tt._limbo_name(trans_id)
 
2590
        self.assertPathExists(path)
 
2591
        tt.finalize()
 
2592
        self.assertPathDoesNotExist(path)
 
2593
        self.assertPathDoesNotExist(tt._limbodir)
 
2594
 
 
2595
    def test_subdir_create_file_open_raises_before_creation(self):
 
2596
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2597
        self._override_globals_in_method(tt, "create_file",
 
2598
            {"open": self._fake_open_raises_before})
 
2599
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2600
        path = tt._limbo_name(trans_id)
 
2601
        self.assertPathDoesNotExist(path)
 
2602
        tt.finalize()
 
2603
        self.assertPathDoesNotExist(tt._limbodir)
 
2604
 
 
2605
    def test_subdir_create_file_open_raises_after_creation(self):
 
2606
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2607
        self._override_globals_in_method(tt, "create_file",
 
2608
            {"open": self._fake_open_raises_after})
 
2609
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2610
        path = tt._limbo_name(trans_id)
 
2611
        self.assertPathExists(path)
 
2612
        tt.finalize()
 
2613
        self.assertPathDoesNotExist(path)
 
2614
        self.assertPathDoesNotExist(tt._limbodir)
 
2615
 
 
2616
    def test_rename_in_limbo_rename_raises_after_rename(self):
 
2617
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2618
        parent1 = tt.new_directory('parent1', tt.root)
 
2619
        child1 = tt.new_file('child1', parent1, 'contents')
 
2620
        parent2 = tt.new_directory('parent2', tt.root)
 
2621
 
 
2622
        class FakeOSModule(object):
 
2623
            def rename(self, old, new):
 
2624
                os.rename(old, new)
 
2625
                raise RuntimeError
 
2626
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2627
            {"os": FakeOSModule()})
 
2628
        self.assertRaises(
 
2629
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2630
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
 
2631
        self.assertPathExists(path)
 
2632
        tt.finalize()
 
2633
        self.assertPathDoesNotExist(path)
 
2634
        self.assertPathDoesNotExist(tt._limbodir)
 
2635
 
 
2636
    def test_rename_in_limbo_rename_raises_before_rename(self):
 
2637
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2638
        parent1 = tt.new_directory('parent1', tt.root)
 
2639
        child1 = tt.new_file('child1', parent1, 'contents')
 
2640
        parent2 = tt.new_directory('parent2', tt.root)
 
2641
 
 
2642
        class FakeOSModule(object):
 
2643
            def rename(self, old, new):
 
2644
                raise RuntimeError
 
2645
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2646
            {"os": FakeOSModule()})
 
2647
        self.assertRaises(
 
2648
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2649
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
 
2650
        self.assertPathExists(path)
 
2651
        tt.finalize()
 
2652
        self.assertPathDoesNotExist(path)
 
2653
        self.assertPathDoesNotExist(tt._limbodir)
 
2654
 
 
2655
 
 
2656
class TestTransformMissingParent(tests.TestCaseWithTransport):
 
2657
 
 
2658
    def make_tt_with_versioned_dir(self):
2243
2659
        wt = self.make_branch_and_tree('.')
 
2660
        self.build_tree(['dir/',])
 
2661
        wt.add(['dir'], ['dir-id'])
 
2662
        wt.commit('Create dir')
2244
2663
        tt = TreeTransform(wt)
2245
2664
        self.addCleanup(tt.finalize)
2246
 
        parent = tt.trans_id_file_id('parent-id')
2247
 
        tt.new_file('file', parent, 'Contents')
2248
 
        resolve_conflicts(tt)
 
2665
        return wt, tt
 
2666
 
 
2667
    def test_resolve_create_parent_for_versioned_file(self):
 
2668
        wt, tt = self.make_tt_with_versioned_dir()
 
2669
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2670
        file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
 
2671
        tt.delete_contents(dir_tid)
 
2672
        tt.unversion_file(dir_tid)
 
2673
        conflicts = resolve_conflicts(tt)
 
2674
        # one conflict for the missing directory, one for the unversioned
 
2675
        # parent
 
2676
        self.assertLength(2, conflicts)
 
2677
 
 
2678
    def test_non_versioned_file_create_conflict(self):
 
2679
        wt, tt = self.make_tt_with_versioned_dir()
 
2680
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2681
        tt.new_file('file', dir_tid, 'Contents')
 
2682
        tt.delete_contents(dir_tid)
 
2683
        tt.unversion_file(dir_tid)
 
2684
        conflicts = resolve_conflicts(tt)
 
2685
        # no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
 
2686
        self.assertLength(1, conflicts)
 
2687
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
2688
                         conflicts.pop())
2249
2689
 
2250
2690
 
2251
2691
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2252
2692
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2253
2693
                  (False, False))
2254
2694
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2255
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2695
              ('', ''), ('directory', 'directory'), (False, False))
2256
2696
 
2257
2697
 
2258
2698
class TestTransformPreview(tests.TestCaseWithTransport):
2327
2767
 
2328
2768
    def test_iter_changes(self):
2329
2769
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2330
 
        root = revision_tree.inventory.root.file_id
 
2770
        root = revision_tree.get_root_id()
2331
2771
        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2332
2772
                          (root, root), ('a', 'a'), ('file', 'file'),
2333
2773
                          (False, False))],
2337
2777
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2338
2778
        changes = preview_tree.iter_changes(revision_tree,
2339
2779
                                            include_unchanged=True)
2340
 
        root = revision_tree.inventory.root.file_id
 
2780
        root = revision_tree.get_root_id()
2341
2781
 
2342
2782
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2343
2783
 
2345
2785
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2346
2786
        changes = preview_tree.iter_changes(revision_tree,
2347
2787
                                            specific_files=[''])
2348
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2788
        self.assertEqual([A_ENTRY], list(changes))
2349
2789
 
2350
2790
    def test_want_unversioned(self):
2351
2791
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2352
2792
        changes = preview_tree.iter_changes(revision_tree,
2353
2793
                                            want_unversioned=True)
2354
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2794
        self.assertEqual([A_ENTRY], list(changes))
2355
2795
 
2356
2796
    def test_ignore_extra_trees_no_specific_files(self):
2357
2797
        # extra_trees is harmless without specific_files, so we'll silently
2367
2807
    def test_ignore_pb(self):
2368
2808
        # pb could be supported, but TT.iter_changes doesn't support it.
2369
2809
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2370
 
        preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
 
2810
        preview_tree.iter_changes(revision_tree)
2371
2811
 
2372
2812
    def test_kind(self):
2373
2813
        revision_tree = self.create_tree()
2400
2840
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2401
2841
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
2402
2842
 
 
2843
    def test_get_file_size(self):
 
2844
        work_tree = self.make_branch_and_tree('tree')
 
2845
        self.build_tree_contents([('tree/old', 'old')])
 
2846
        work_tree.add('old', 'old-id')
 
2847
        preview = TransformPreview(work_tree)
 
2848
        self.addCleanup(preview.finalize)
 
2849
        new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
 
2850
                                  'executable')
 
2851
        tree = preview.get_preview_tree()
 
2852
        self.assertEqual(len('old'), tree.get_file_size('old-id'))
 
2853
        self.assertEqual(len('contents'), tree.get_file_size('new-id'))
 
2854
 
2403
2855
    def test_get_file(self):
2404
2856
        preview = self.get_empty_preview()
2405
2857
        preview.new_file('file', preview.root, 'contents', 'file-id')
2775
3227
        file_trans_id = preview.trans_id_file_id('file-id')
2776
3228
        preview.delete_contents(file_trans_id)
2777
3229
        preview.create_file('a\nb\n', file_trans_id)
2778
 
        pb = progress.DummyProgress()
2779
3230
        preview_tree = preview.get_preview_tree()
2780
 
        merger = Merger.from_revision_ids(pb, preview_tree,
 
3231
        merger = Merger.from_revision_ids(None, preview_tree,
2781
3232
                                          child_tree.branch.last_revision(),
2782
3233
                                          other_branch=child_tree.branch,
2783
3234
                                          tree_branch=work_tree.branch)
2795
3246
        tt.new_file('name', tt.root, 'content', 'file-id')
2796
3247
        tree2 = self.make_branch_and_tree('tree2')
2797
3248
        tree2.set_root_id('TREE_ROOT')
2798
 
        pb = progress.DummyProgress()
2799
3249
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2800
 
                                         pb, tree.basis_tree())
 
3250
                                         None, tree.basis_tree())
2801
3251
        merger.merge_type = Merge3Merger
2802
3252
        merger.do_merge()
2803
3253
 
2813
3263
        tt.create_file('baz', trans_id)
2814
3264
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2815
3265
        self.build_tree_contents([('tree2/foo', 'qux')])
2816
 
        pb = progress.DummyProgress()
 
3266
        pb = None
2817
3267
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2818
3268
                                         pb, tree.basis_tree())
2819
3269
        merger.merge_type = Merge3Merger
2820
3270
        merger.do_merge()
2821
3271
 
 
3272
    def test_has_filename(self):
 
3273
        wt = self.make_branch_and_tree('tree')
 
3274
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3275
        tt = TransformPreview(wt)
 
3276
        removed_id = tt.trans_id_tree_path('removed')
 
3277
        tt.delete_contents(removed_id)
 
3278
        tt.new_file('new', tt.root, 'contents')
 
3279
        modified_id = tt.trans_id_tree_path('modified')
 
3280
        tt.delete_contents(modified_id)
 
3281
        tt.create_file('modified-contents', modified_id)
 
3282
        self.addCleanup(tt.finalize)
 
3283
        tree = tt.get_preview_tree()
 
3284
        self.assertTrue(tree.has_filename('unmodified'))
 
3285
        self.assertFalse(tree.has_filename('not-present'))
 
3286
        self.assertFalse(tree.has_filename('removed'))
 
3287
        self.assertTrue(tree.has_filename('new'))
 
3288
        self.assertTrue(tree.has_filename('modified'))
 
3289
 
2822
3290
    def test_is_executable(self):
2823
3291
        tree = self.make_branch_and_tree('tree')
2824
3292
        preview = TransformPreview(tree)
2847
3315
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
2848
3316
 
2849
3317
    def test_ascii_limbo_paths(self):
2850
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
3318
        self.requireFeature(features.UnicodeFilenameFeature)
2851
3319
        branch = self.make_branch('any')
2852
3320
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
2853
3321
        tt = TransformPreview(tree)
2870
3338
 
2871
3339
class TestSerializeTransform(tests.TestCaseWithTransport):
2872
3340
 
2873
 
    _test_needs_features = [tests.UnicodeFilenameFeature]
 
3341
    _test_needs_features = [features.UnicodeFilenameFeature]
2874
3342
 
2875
3343
    def get_preview(self, tree=None):
2876
3344
        if tree is None:
2951
3419
        return self.make_records(attribs, contents)
2952
3420
 
2953
3421
    def test_serialize_symlink_creation(self):
2954
 
        self.requireFeature(tests.SymlinkFeature)
 
3422
        self.requireFeature(features.SymlinkFeature)
2955
3423
        tt = self.get_preview()
2956
3424
        tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
2957
3425
        self.assertSerializesTo(self.symlink_creation_records(), tt)
2958
3426
 
2959
3427
    def test_deserialize_symlink_creation(self):
2960
 
        self.requireFeature(tests.SymlinkFeature)
 
3428
        self.requireFeature(features.SymlinkFeature)
2961
3429
        tt = self.get_preview()
2962
3430
        tt.deserialize(iter(self.symlink_creation_records()))
2963
3431
        abspath = tt._limbo_name('new-1')
3130
3598
        trans_id = tt.trans_id_tree_path('file')
3131
3599
        self.assertEqual((LINES_ONE,),
3132
3600
            tt._get_parents_texts(trans_id))
 
3601
 
 
3602
 
 
3603
class TestOrphan(tests.TestCaseWithTransport):
 
3604
 
 
3605
    def test_no_orphan_for_transform_preview(self):
 
3606
        tree = self.make_branch_and_tree('tree')
 
3607
        tt = transform.TransformPreview(tree)
 
3608
        self.addCleanup(tt.finalize)
 
3609
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
3610
 
 
3611
    def _set_orphan_policy(self, wt, policy):
 
3612
        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
 
3613
                                               policy)
 
3614
 
 
3615
    def _prepare_orphan(self, wt):
 
3616
        self.build_tree(['dir/', 'dir/file', 'dir/foo'])
 
3617
        wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
 
3618
        wt.commit('add dir and file ignoring foo')
 
3619
        tt = transform.TreeTransform(wt)
 
3620
        self.addCleanup(tt.finalize)
 
3621
        # dir and bar are deleted
 
3622
        dir_tid = tt.trans_id_tree_path('dir')
 
3623
        file_tid = tt.trans_id_tree_path('dir/file')
 
3624
        orphan_tid = tt.trans_id_tree_path('dir/foo')
 
3625
        tt.delete_contents(file_tid)
 
3626
        tt.unversion_file(file_tid)
 
3627
        tt.delete_contents(dir_tid)
 
3628
        tt.unversion_file(dir_tid)
 
3629
        # There should be a conflict because dir still contain foo
 
3630
        raw_conflicts = tt.find_conflicts()
 
3631
        self.assertLength(1, raw_conflicts)
 
3632
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
 
3633
        return tt, orphan_tid
 
3634
 
 
3635
    def test_new_orphan_created(self):
 
3636
        wt = self.make_branch_and_tree('.')
 
3637
        self._set_orphan_policy(wt, 'move')
 
3638
        tt, orphan_tid = self._prepare_orphan(wt)
 
3639
        warnings = []
 
3640
        def warning(*args):
 
3641
            warnings.append(args[0] % args[1:])
 
3642
        self.overrideAttr(trace, 'warning', warning)
 
3643
        remaining_conflicts = resolve_conflicts(tt)
 
3644
        self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
 
3645
                          warnings)
 
3646
        # Yeah for resolved conflicts !
 
3647
        self.assertLength(0, remaining_conflicts)
 
3648
        # We have a new orphan
 
3649
        self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
 
3650
        self.assertEquals('bzr-orphans',
 
3651
                          tt.final_name(tt.final_parent(orphan_tid)))
 
3652
 
 
3653
    def test_never_orphan(self):
 
3654
        wt = self.make_branch_and_tree('.')
 
3655
        self._set_orphan_policy(wt, 'conflict')
 
3656
        tt, orphan_tid = self._prepare_orphan(wt)
 
3657
        remaining_conflicts = resolve_conflicts(tt)
 
3658
        self.assertLength(1, remaining_conflicts)
 
3659
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3660
                         remaining_conflicts.pop())
 
3661
 
 
3662
    def test_orphan_error(self):
 
3663
        def bogus_orphan(tt, orphan_id, parent_id):
 
3664
            raise transform.OrphaningError(tt.final_name(orphan_id),
 
3665
                                           tt.final_name(parent_id))
 
3666
        transform.orphaning_registry.register('bogus', bogus_orphan,
 
3667
                                              'Raise an error when orphaning')
 
3668
        wt = self.make_branch_and_tree('.')
 
3669
        self._set_orphan_policy(wt, 'bogus')
 
3670
        tt, orphan_tid = self._prepare_orphan(wt)
 
3671
        remaining_conflicts = resolve_conflicts(tt)
 
3672
        self.assertLength(1, remaining_conflicts)
 
3673
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3674
                         remaining_conflicts.pop())
 
3675
 
 
3676
    def test_unknown_orphan_policy(self):
 
3677
        wt = self.make_branch_and_tree('.')
 
3678
        # Set a fictional policy nobody ever implemented
 
3679
        self._set_orphan_policy(wt, 'donttouchmypreciouuus')
 
3680
        tt, orphan_tid = self._prepare_orphan(wt)
 
3681
        warnings = []
 
3682
        def warning(*args):
 
3683
            warnings.append(args[0] % args[1:])
 
3684
        self.overrideAttr(trace, 'warning', warning)
 
3685
        remaining_conflicts = resolve_conflicts(tt)
 
3686
        # We fallback to the default policy which create a conflict
 
3687
        self.assertLength(1, remaining_conflicts)
 
3688
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3689
                         remaining_conflicts.pop())
 
3690
        self.assertLength(1, warnings)
 
3691
        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
 
3692
 
 
3693
 
 
3694
class TestTransformHooks(tests.TestCaseWithTransport):
 
3695
 
 
3696
    def setUp(self):
 
3697
        super(TestTransformHooks, self).setUp()
 
3698
        self.wt = self.make_branch_and_tree('.')
 
3699
        os.chdir('..')
 
3700
 
 
3701
    def get_transform(self):
 
3702
        transform = TreeTransform(self.wt)
 
3703
        self.addCleanup(transform.finalize)
 
3704
        return transform, transform.root
 
3705
 
 
3706
    def test_pre_commit_hooks(self):
 
3707
        calls = []
 
3708
        def record_pre_transform(tree, tt):
 
3709
            calls.append((tree, tt))
 
3710
        MutableTree.hooks.install_named_hook('pre_transform',
 
3711
            record_pre_transform, "Pre transform")
 
3712
        transform, root = self.get_transform()
 
3713
        old_root_id = transform.tree_file_id(root)
 
3714
        transform.apply()
 
3715
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3716
        self.assertEquals([(self.wt, transform)], calls)
 
3717
 
 
3718
    def test_post_commit_hooks(self):
 
3719
        calls = []
 
3720
        def record_post_transform(tree, tt):
 
3721
            calls.append((tree, tt))
 
3722
        MutableTree.hooks.install_named_hook('post_transform',
 
3723
            record_post_transform, "Post transform")
 
3724
        transform, root = self.get_transform()
 
3725
        old_root_id = transform.tree_file_id(root)
 
3726
        transform.apply()
 
3727
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3728
        self.assertEquals([(self.wt, transform)], calls)