← 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: Jelmer Vernooij
  • Date: 2011-06-16 16:06:33 UTC
  • mto: This revision was merged to the branch mainline in revision 5979.
  • Revision ID: jelmer@samba.org-20110616160633-o7gytmtrm37jr89p
Fix import

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
37
from bzrlib.bzrdir import BzrDir
35
 
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
36
 
                              UnversionedParent, ParentLoop, DeletingParent,
37
 
                              NonDirectoryParent)
 
38
from bzrlib.conflicts import (
 
39
    DeletingParent,
 
40
    DuplicateEntry,
 
41
    DuplicateID,
 
42
    MissingParent,
 
43
    NonDirectoryParent,
 
44
    ParentLoop,
 
45
    UnversionedParent,
 
46
)
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
46
63
from bzrlib.tests import (
 
64
    features,
47
65
    HardlinkFeature,
48
66
    SymlinkFeature,
49
 
    TestCase,
50
67
    TestCaseInTempDir,
51
68
    TestSkipped,
52
 
    )
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)
 
69
)
 
70
from bzrlib.transform import (
 
71
    build_tree,
 
72
    create_from_tree,
 
73
    cook_conflicts,
 
74
    _FileMover,
 
75
    FinalPaths,
 
76
    resolve_conflicts,
 
77
    resolve_checkout,
 
78
    ROOT_PARENT,
 
79
    TransformPreview,
 
80
    TreeTransform,
 
81
)
58
82
 
59
83
 
60
84
class TestTreeTransform(tests.TestCaseWithTransport):
69
93
        self.addCleanup(transform.finalize)
70
94
        return transform, transform.root
71
95
 
 
96
    def get_transform_for_sha1_test(self):
 
97
        trans, root = self.get_transform()
 
98
        self.wt.lock_tree_write()
 
99
        self.addCleanup(self.wt.unlock)
 
100
        contents = ['just some content\n']
 
101
        sha1 = osutils.sha_strings(contents)
 
102
        # Roll back the clock
 
103
        trans._creation_mtime = time.time() - 20.0
 
104
        return trans, root, contents, sha1
 
105
 
72
106
    def test_existing_limbo(self):
73
107
        transform, root = self.get_transform()
74
108
        limbo_name = transform._limbodir
101
135
        imaginary_id = transform.trans_id_tree_path('imaginary')
102
136
        imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
137
        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())
 
138
        self.assertEqual(root, transform.get_tree_parent(imaginary_id))
 
139
        self.assertEqual('directory', transform.final_kind(root))
 
140
        self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
107
141
        trans_id = transform.create_path('name', root)
108
142
        self.assertIs(transform.final_file_id(trans_id), None)
109
 
        self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
 
143
        self.assertIs(None, transform.final_kind(trans_id))
110
144
        transform.create_file('contents', trans_id)
111
145
        transform.set_executability(True, trans_id)
112
146
        transform.version_file('my_pretties', trans_id)
137
171
        transform.finalize()
138
172
        transform.finalize()
139
173
 
 
174
    def test_apply_informs_tree_of_observed_sha1(self):
 
175
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
176
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
177
                                  sha1=sha1)
 
178
        calls = []
 
179
        orig = self.wt._observed_sha1
 
180
        def _observed_sha1(*args):
 
181
            calls.append(args)
 
182
            orig(*args)
 
183
        self.wt._observed_sha1 = _observed_sha1
 
184
        trans.apply()
 
185
        self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
 
186
                         calls)
 
187
 
 
188
    def test_create_file_caches_sha1(self):
 
189
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
190
        trans_id = trans.create_path('file1', root)
 
191
        trans.create_file(contents, trans_id, sha1=sha1)
 
192
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
193
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
194
        self.assertEqual(o_sha1, sha1)
 
195
        self.assertEqualStat(o_st_val, st_val)
 
196
 
 
197
    def test__apply_insertions_updates_sha1(self):
 
198
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
199
        trans_id = trans.create_path('file1', root)
 
200
        trans.create_file(contents, trans_id, sha1=sha1)
 
201
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
202
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
203
        self.assertEqual(o_sha1, sha1)
 
204
        self.assertEqualStat(o_st_val, st_val)
 
205
        creation_mtime = trans._creation_mtime + 10.0
 
206
        # We fake a time difference from when the file was created until now it
 
207
        # is being renamed by using os.utime. Note that the change we actually
 
208
        # want to see is the real ctime change from 'os.rename()', but as long
 
209
        # as we observe a new stat value, we should be fine.
 
210
        os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
 
211
        trans.apply()
 
212
        new_st_val = osutils.lstat(self.wt.abspath('file1'))
 
213
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
214
        self.assertEqual(o_sha1, sha1)
 
215
        self.assertEqualStat(o_st_val, new_st_val)
 
216
        self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
 
217
 
 
218
    def test_new_file_caches_sha1(self):
 
219
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
220
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
221
                                  sha1=sha1)
 
222
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
223
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
224
        self.assertEqual(o_sha1, sha1)
 
225
        self.assertEqualStat(o_st_val, st_val)
 
226
 
 
227
    def test_cancel_creation_removes_observed_sha1(self):
 
228
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
229
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
230
                                  sha1=sha1)
 
231
        self.assertTrue(trans_id in trans._observed_sha1s)
 
232
        trans.cancel_creation(trans_id)
 
233
        self.assertFalse(trans_id in trans._observed_sha1s)
 
234
 
140
235
    def test_create_files_same_timestamp(self):
141
236
        transform, root = self.get_transform()
142
237
        self.wt.lock_tree_write()
190
285
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
191
286
        self.assertRaises(ValueError, transform.fixup_new_roots)
192
287
 
 
288
    def test_add_unversioned_root(self):
 
289
        transform, root = self.get_transform()
 
290
        new_trans_id = transform.new_directory('', ROOT_PARENT, None)
 
291
        transform.fixup_new_roots()
 
292
        self.assertNotIn(transform.root, transform._new_id)
 
293
 
 
294
    def test_apply_retains_root_directory(self):
 
295
        # Do not attempt to delete the physical root directory, because that
 
296
        # is impossible.
 
297
        transform, root = self.get_transform()
 
298
        with transform:
 
299
            transform.delete_contents(root)
 
300
            e = self.assertRaises(AssertionError, self.assertRaises,
 
301
                                  errors.TransformRenameFailed,
 
302
                                  transform.apply)
 
303
        self.assertContainsRe('TransformRenameFailed not raised', str(e))
 
304
 
193
305
    def test_hardlink(self):
194
306
        self.requireFeature(HardlinkFeature)
195
307
        transform, root = self.get_transform()
200
312
        trans_id = target_transform.create_path('file1', target_transform.root)
201
313
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
314
        target_transform.apply()
203
 
        self.failUnlessExists('target/file1')
 
315
        self.assertPathExists('target/file1')
204
316
        source_stat = os.stat(self.wt.abspath('file1'))
205
317
        target_stat = os.stat('target/file1')
206
318
        self.assertEqual(source_stat, target_stat)
372
484
        transform.new_file('FiLe', transform.root, 'content')
373
485
        resolve_conflicts(transform)
374
486
        transform.apply()
375
 
        self.failUnlessExists('tree/file')
376
 
        self.failUnlessExists('tree/FiLe.moved')
 
487
        self.assertPathExists('tree/file')
 
488
        self.assertPathExists('tree/FiLe.moved')
377
489
 
378
490
    def test_resolve_checkout_case_conflict(self):
379
491
        tree = self.make_branch_and_tree('tree')
388
500
        resolve_conflicts(transform,
389
501
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
390
502
        transform.apply()
391
 
        self.failUnlessExists('tree/file')
392
 
        self.failUnlessExists('tree/FiLe.moved')
 
503
        self.assertPathExists('tree/file')
 
504
        self.assertPathExists('tree/FiLe.moved')
393
505
 
394
506
    def test_apply_case_conflict(self):
395
507
        """Ensure that a transform with case conflicts can always be applied"""
403
515
        transform.new_file('dirFiLe', dir, 'content')
404
516
        resolve_conflicts(transform)
405
517
        transform.apply()
406
 
        self.failUnlessExists('tree/file')
 
518
        self.assertPathExists('tree/file')
407
519
        if not os.path.exists('tree/FiLe.moved'):
408
 
            self.failUnlessExists('tree/FiLe')
409
 
        self.failUnlessExists('tree/dir/dirfile')
 
520
            self.assertPathExists('tree/FiLe')
 
521
        self.assertPathExists('tree/dir/dirfile')
410
522
        if not os.path.exists('tree/dir/dirFiLe.moved'):
411
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
523
            self.assertPathExists('tree/dir/dirFiLe')
412
524
 
413
525
    def test_case_insensitive_limbo(self):
414
526
        tree = self.make_branch_and_tree('tree')
716
828
        raw_conflicts = resolve_conflicts(tt)
717
829
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
718
830
        tt.finalize()
719
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
831
        conflicts_s = [unicode(c) for c in cooked_conflicts]
720
832
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
721
833
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
722
834
                                         'Moved existing file to '
792
904
        self.assertIs(None, self.wt.path2id('parent'))
793
905
        self.assertIs(None, self.wt.path2id('parent.new'))
794
906
 
 
907
    def test_resolve_conflicts_missing_parent(self):
 
908
        wt = self.make_branch_and_tree('.')
 
909
        tt = TreeTransform(wt)
 
910
        self.addCleanup(tt.finalize)
 
911
        parent = tt.trans_id_file_id('parent-id')
 
912
        tt.new_file('file', parent, 'Contents')
 
913
        raw_conflicts = resolve_conflicts(tt)
 
914
        # Since the directory doesn't exist it's seen as 'missing'.  So
 
915
        # 'resolve_conflicts' create a conflict asking for it to be created.
 
916
        self.assertLength(1, raw_conflicts)
 
917
        self.assertEqual(('missing parent', 'Created directory', 'new-1'),
 
918
                         raw_conflicts.pop())
 
919
        # apply fail since the missing directory doesn't exist
 
920
        self.assertRaises(errors.NoFinalPath, tt.apply)
 
921
 
795
922
    def test_moving_versioned_directories(self):
796
923
        create, root = self.get_transform()
797
924
        kansas = create.new_directory('kansas', root, 'kansas-id')
830
957
        rename.set_executability(True, myfile)
831
958
        rename.apply()
832
959
 
 
960
    def test_rename_fails(self):
 
961
        self.requireFeature(features.not_running_as_root)
 
962
        # see https://bugs.launchpad.net/bzr/+bug/491763
 
963
        create, root_id = self.get_transform()
 
964
        first_dir = create.new_directory('first-dir', root_id, 'first-id')
 
965
        myfile = create.new_file('myfile', root_id, 'myfile-text',
 
966
                                 'myfile-id')
 
967
        create.apply()
 
968
        if os.name == "posix" and sys.platform != "cygwin":
 
969
            # posix filesystems fail on renaming if the readonly bit is set
 
970
            osutils.make_readonly(self.wt.abspath('first-dir'))
 
971
        elif os.name == "nt":
 
972
            # windows filesystems fail on renaming open files
 
973
            self.addCleanup(file(self.wt.abspath('myfile')).close)
 
974
        else:
 
975
            self.skip("Don't know how to force a permissions error on rename")
 
976
        # now transform to rename
 
977
        rename_transform, root_id = self.get_transform()
 
978
        file_trans_id = rename_transform.trans_id_file_id('myfile-id')
 
979
        dir_id = rename_transform.trans_id_file_id('first-id')
 
980
        rename_transform.adjust_path('newname', dir_id, file_trans_id)
 
981
        e = self.assertRaises(errors.TransformRenameFailed,
 
982
            rename_transform.apply)
 
983
        # On nix looks like: 
 
984
        # "Failed to rename .../work/.bzr/checkout/limbo/new-1
 
985
        # to .../first-dir/newname: [Errno 13] Permission denied"
 
986
        # On windows looks like:
 
987
        # "Failed to rename .../work/myfile to 
 
988
        # .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
 
989
        # This test isn't concerned with exactly what the error looks like,
 
990
        # and the strerror will vary across OS and locales, but the assert
 
991
        # that the exeception attributes are what we expect
 
992
        self.assertEqual(e.errno, errno.EACCES)
 
993
        if os.name == "posix":
 
994
            self.assertEndsWith(e.to_path, "/first-dir/newname")
 
995
        else:
 
996
            self.assertEqual(os.path.basename(e.from_path), "myfile")
 
997
 
833
998
    def test_set_executability_order(self):
834
999
        """Ensure that executability behaves the same, no matter what order.
835
1000
 
1107
1272
        parent2 = transform.new_directory('parent2', root)
1108
1273
        transform.adjust_path('child1', parent2, child1)
1109
1274
        transform.apply()
1110
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1111
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1275
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1276
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1112
1277
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1113
1278
        # no rename for child1 (counting only renames during apply)
1114
 
        self.failUnlessEqual(2, transform.rename_count)
 
1279
        self.assertEqual(2, transform.rename_count)
1115
1280
 
1116
1281
    def test_cancel_parent(self):
1117
1282
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1140
1305
        parent2 = transform.new_directory('parent2', root)
1141
1306
        transform.adjust_path('child1', parent2, child1)
1142
1307
        transform.apply()
1143
 
        self.failIfExists(self.wt.abspath('parent1'))
1144
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1308
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1309
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1145
1310
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1146
 
        self.failUnlessEqual(2, transform.rename_count)
 
1311
        self.assertEqual(2, transform.rename_count)
1147
1312
 
1148
1313
    def test_adjust_and_cancel(self):
1149
1314
        """Make sure adjust_path keeps track of limbo children properly"""
1182
1347
        child = transform.new_directory('child', parent)
1183
1348
        transform.adjust_path('parent', root, parent)
1184
1349
        transform.apply()
1185
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1350
        self.assertPathExists(self.wt.abspath('parent/child'))
1186
1351
        self.assertEqual(1, transform.rename_count)
1187
1352
 
1188
1353
    def test_reuse_name(self):
1319
1484
        tt.create_file(["aa\n"], bar_trans_id)
1320
1485
        tt.version_file("bar-1", bar_trans_id)
1321
1486
        tt.apply()
1322
 
        self.failUnlessExists("foo/bar")
 
1487
        self.assertPathExists("foo/bar")
1323
1488
        wt.lock_read()
1324
1489
        try:
1325
1490
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1342
1507
        tt.delete_contents(foo_trans_id)
1343
1508
        tt.create_symlink("bar", foo_trans_id)
1344
1509
        tt.apply()
1345
 
        self.failUnlessExists("foo")
 
1510
        self.assertPathExists("foo")
1346
1511
        wt.lock_read()
1347
1512
        self.addCleanup(wt.unlock)
1348
1513
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1361
1526
        tt.delete_versioned(bar_trans_id)
1362
1527
        tt.create_file(["aa\n"], foo_trans_id)
1363
1528
        tt.apply()
1364
 
        self.failUnlessExists("foo")
 
1529
        self.assertPathExists("foo")
1365
1530
        wt.lock_read()
1366
1531
        self.addCleanup(wt.unlock)
1367
1532
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1382
1547
        self.build_tree(['baz'])
1383
1548
        tt.create_hardlink("baz", foo_trans_id)
1384
1549
        tt.apply()
1385
 
        self.failUnlessExists("foo")
1386
 
        self.failUnlessExists("baz")
 
1550
        self.assertPathExists("foo")
 
1551
        self.assertPathExists("baz")
1387
1552
        wt.lock_read()
1388
1553
        self.addCleanup(wt.unlock)
1389
1554
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1451
1616
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1452
1617
 
1453
1618
 
 
1619
class TestInventoryAltered(tests.TestCaseWithTransport):
 
1620
 
 
1621
    def test_inventory_altered_unchanged(self):
 
1622
        tree = self.make_branch_and_tree('tree')
 
1623
        self.build_tree(['tree/foo'])
 
1624
        tree.add('foo', 'foo-id')
 
1625
        with TransformPreview(tree) as tt:
 
1626
            self.assertEqual([], tt._inventory_altered())
 
1627
 
 
1628
    def test_inventory_altered_changed_parent_id(self):
 
1629
        tree = self.make_branch_and_tree('tree')
 
1630
        self.build_tree(['tree/foo'])
 
1631
        tree.add('foo', 'foo-id')
 
1632
        with TransformPreview(tree) as tt:
 
1633
            tt.unversion_file(tt.root)
 
1634
            tt.version_file('new-id', tt.root)
 
1635
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1636
            foo_tuple = ('foo', foo_trans_id)
 
1637
            root_tuple = ('', tt.root)
 
1638
            self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
 
1639
 
 
1640
    def test_inventory_altered_noop_changed_parent_id(self):
 
1641
        tree = self.make_branch_and_tree('tree')
 
1642
        self.build_tree(['tree/foo'])
 
1643
        tree.add('foo', 'foo-id')
 
1644
        with TransformPreview(tree) as tt:
 
1645
            tt.unversion_file(tt.root)
 
1646
            tt.version_file(tree.get_root_id(), tt.root)
 
1647
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1648
            self.assertEqual([], tt._inventory_altered())
 
1649
 
 
1650
 
1454
1651
class TestTransformMerge(TestCaseInTempDir):
1455
1652
 
1456
1653
    def test_text_merge(self):
1666
1863
        tree.add_reference(subtree)
1667
1864
        tree.commit('a revision')
1668
1865
        tree.branch.create_checkout('target')
1669
 
        self.failUnlessExists('target')
1670
 
        self.failUnlessExists('target/subtree')
 
1866
        self.assertPathExists('target')
 
1867
        self.assertPathExists('target/subtree')
1671
1868
 
1672
1869
    def test_file_conflict_handling(self):
1673
1870
        """Ensure that when building trees, conflict handling is done"""
1720
1917
        source.commit('added file')
1721
1918
        build_tree(source.basis_tree(), target)
1722
1919
        self.assertEqual([], target.conflicts())
1723
 
        self.failUnlessExists('target/dir1/file')
 
1920
        self.assertPathExists('target/dir1/file')
1724
1921
 
1725
1922
        # Ensure contents are merged
1726
1923
        target = self.make_branch_and_tree('target2')
1727
1924
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1728
1925
        build_tree(source.basis_tree(), target)
1729
1926
        self.assertEqual([], target.conflicts())
1730
 
        self.failUnlessExists('target2/dir1/file2')
1731
 
        self.failUnlessExists('target2/dir1/file')
 
1927
        self.assertPathExists('target2/dir1/file2')
 
1928
        self.assertPathExists('target2/dir1/file')
1732
1929
 
1733
1930
        # Ensure new contents are suppressed for existing branches
1734
1931
        target = self.make_branch_and_tree('target3')
1735
1932
        self.make_branch('target3/dir1')
1736
1933
        self.build_tree(['target3/dir1/file2'])
1737
1934
        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')
 
1935
        self.assertPathDoesNotExist('target3/dir1/file')
 
1936
        self.assertPathExists('target3/dir1/file2')
 
1937
        self.assertPathExists('target3/dir1.diverted/file')
1741
1938
        self.assertEqual([DuplicateEntry('Diverted to',
1742
1939
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1743
1940
            target.conflicts())
1746
1943
        self.build_tree(['target4/dir1/'])
1747
1944
        self.make_branch('target4/dir1/file')
1748
1945
        build_tree(source.basis_tree(), target)
1749
 
        self.failUnlessExists('target4/dir1/file')
 
1946
        self.assertPathExists('target4/dir1/file')
1750
1947
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1751
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1948
        self.assertPathExists('target4/dir1/file.diverted')
1752
1949
        self.assertEqual([DuplicateEntry('Diverted to',
1753
1950
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1754
1951
            target.conflicts())
1822
2019
        self.addCleanup(target.unlock)
1823
2020
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1824
2021
 
 
2022
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
2023
        source = self.create_ab_tree()
 
2024
        sha1 = osutils.sha_string('A')
 
2025
        target = self.make_branch_and_tree('target')
 
2026
        target.lock_write()
 
2027
        self.addCleanup(target.unlock)
 
2028
        state = target.current_dirstate()
 
2029
        state._cutoff_time = time.time() + 60
 
2030
        build_tree(source.basis_tree(), target, source)
 
2031
        entry = state._get_entry(0, path_utf8='file1')
 
2032
        self.assertEqual(sha1, entry[1][0][1])
 
2033
 
1825
2034
    def test_build_tree_accelerator_tree_missing_file(self):
1826
2035
        source = self.create_ab_tree()
1827
2036
        os.unlink('source/file1')
1985
2194
        self.assertEqual('file.moved', target.id2path('lower-id'))
1986
2195
        self.assertEqual('FILE', target.id2path('upper-id'))
1987
2196
 
 
2197
    def test_build_tree_observes_sha(self):
 
2198
        source = self.make_branch_and_tree('source')
 
2199
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2200
        source.add(['file1', 'dir', 'dir/file2'],
 
2201
                   ['file1-id', 'dir-id', 'file2-id'])
 
2202
        source.commit('new files')
 
2203
        target = self.make_branch_and_tree('target')
 
2204
        target.lock_write()
 
2205
        self.addCleanup(target.unlock)
 
2206
        # We make use of the fact that DirState caches its cutoff time. So we
 
2207
        # set the 'safe' time to one minute in the future.
 
2208
        state = target.current_dirstate()
 
2209
        state._cutoff_time = time.time() + 60
 
2210
        build_tree(source.basis_tree(), target)
 
2211
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2212
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2213
        # entry[1] is the state information, entry[1][0] is the state of the
 
2214
        # working tree, entry[1][0][1] is the sha value for the current working
 
2215
        # tree
 
2216
        entry1 = state._get_entry(0, path_utf8='file1')
 
2217
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2218
        # The 'size' field must also be set.
 
2219
        self.assertEqual(25, entry1[1][0][2])
 
2220
        entry1_state = entry1[1][0]
 
2221
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2222
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2223
        self.assertEqual(29, entry2[1][0][2])
 
2224
        entry2_state = entry2[1][0]
 
2225
        # Now, make sure that we don't have to re-read the content. The
 
2226
        # packed_stat should match exactly.
 
2227
        self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
 
2228
        self.assertEqual(entry2_sha,
 
2229
                         target.get_file_sha1('file2-id', 'dir/file2'))
 
2230
        self.assertEqual(entry1_state, entry1[1][0])
 
2231
        self.assertEqual(entry2_state, entry2[1][0])
 
2232
 
1988
2233
 
1989
2234
class TestCommitTransform(tests.TestCaseWithTransport):
1990
2235
 
2091
2336
        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2092
2337
                          'message')
2093
2338
 
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):
 
2339
    def test_commit_rich_revision_data(self):
 
2340
        branch, tt = self.get_branch_and_transform()
 
2341
        rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
 
2342
                           committer='me <me@example.com>',
 
2343
                           revprops={'foo': 'bar'}, revision_id='revid-1',
 
2344
                           authors=['Author1 <author1@example.com>',
 
2345
                              'Author2 <author2@example.com>',
 
2346
                               ])
 
2347
        self.assertEqual('revid-1', rev_id)
 
2348
        revision = branch.repository.get_revision(rev_id)
 
2349
        self.assertEqual(1, revision.timestamp)
 
2350
        self.assertEqual(43201, revision.timezone)
 
2351
        self.assertEqual('me <me@example.com>', revision.committer)
 
2352
        self.assertEqual(['Author1 <author1@example.com>',
 
2353
                          'Author2 <author2@example.com>'],
 
2354
                         revision.get_apparent_authors())
 
2355
        del revision.properties['authors']
 
2356
        self.assertEqual({'foo': 'bar',
 
2357
                          'branch-nick': 'tree'},
 
2358
                         revision.properties)
 
2359
 
 
2360
    def test_no_explicit_revprops(self):
 
2361
        branch, tt = self.get_branch_and_transform()
 
2362
        rev_id = tt.commit(branch, 'message', authors=[
 
2363
            'Author1 <author1@example.com>',
 
2364
            'Author2 <author2@example.com>', ])
 
2365
        revision = branch.repository.get_revision(rev_id)
 
2366
        self.assertEqual(['Author1 <author1@example.com>',
 
2367
                          'Author2 <author2@example.com>'],
 
2368
                         revision.get_apparent_authors())
 
2369
        self.assertEqual('tree', revision.properties['branch-nick'])
 
2370
 
 
2371
 
 
2372
class TestBackupName(tests.TestCase):
 
2373
 
 
2374
    def test_deprecations(self):
 
2375
        class MockTransform(object):
 
2376
 
 
2377
            def has_named_child(self, by_parent, parent_id, name):
 
2378
                return name in by_parent.get(parent_id, [])
 
2379
 
 
2380
        class MockEntry(object):
 
2381
 
 
2382
            def __init__(self):
 
2383
                object.__init__(self)
 
2384
                self.name = "name"
 
2385
 
2115
2386
        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~')
 
2387
        name1 = self.applyDeprecated(
 
2388
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2389
            transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
 
2390
        self.assertEqual('name.~1~', name1)
 
2391
        name2 = self.applyDeprecated(
 
2392
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2393
            transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
 
2394
        self.assertEqual('name.~2~', name2)
2126
2395
 
2127
2396
 
2128
2397
class TestFileMover(tests.TestCaseWithTransport):
2131
2400
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2132
2401
        mover = _FileMover()
2133
2402
        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')
 
2403
        self.assertPathExists('q')
 
2404
        self.assertPathDoesNotExist('a')
 
2405
        self.assertPathExists('q/b')
 
2406
        self.assertPathExists('c')
 
2407
        self.assertPathExists('c/d')
2139
2408
 
2140
2409
    def test_pre_delete_rollback(self):
2141
2410
        self.build_tree(['a/'])
2142
2411
        mover = _FileMover()
2143
2412
        mover.pre_delete('a', 'q')
2144
 
        self.failUnlessExists('q')
2145
 
        self.failIfExists('a')
 
2413
        self.assertPathExists('q')
 
2414
        self.assertPathDoesNotExist('a')
2146
2415
        mover.rollback()
2147
 
        self.failIfExists('q')
2148
 
        self.failUnlessExists('a')
 
2416
        self.assertPathDoesNotExist('q')
 
2417
        self.assertPathExists('a')
2149
2418
 
2150
2419
    def test_apply_deletions(self):
2151
2420
        self.build_tree(['a/', 'b/'])
2152
2421
        mover = _FileMover()
2153
2422
        mover.pre_delete('a', 'q')
2154
2423
        mover.pre_delete('b', 'r')
2155
 
        self.failUnlessExists('q')
2156
 
        self.failUnlessExists('r')
2157
 
        self.failIfExists('a')
2158
 
        self.failIfExists('b')
 
2424
        self.assertPathExists('q')
 
2425
        self.assertPathExists('r')
 
2426
        self.assertPathDoesNotExist('a')
 
2427
        self.assertPathDoesNotExist('b')
2159
2428
        mover.apply_deletions()
2160
 
        self.failIfExists('q')
2161
 
        self.failIfExists('r')
2162
 
        self.failIfExists('a')
2163
 
        self.failIfExists('b')
 
2429
        self.assertPathDoesNotExist('q')
 
2430
        self.assertPathDoesNotExist('r')
 
2431
        self.assertPathDoesNotExist('a')
 
2432
        self.assertPathDoesNotExist('b')
2164
2433
 
2165
2434
    def test_file_mover_rollback(self):
2166
2435
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2171
2440
            mover.rename('a', 'c')
2172
2441
        except errors.FileExists, e:
2173
2442
            mover.rollback()
2174
 
        self.failUnlessExists('a')
2175
 
        self.failUnlessExists('c/d')
 
2443
        self.assertPathExists('a')
 
2444
        self.assertPathExists('c/d')
2176
2445
 
2177
2446
 
2178
2447
class Bogus(Exception):
2208
2477
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2209
2478
        self.assertRaises(Bogus, tt.apply,
2210
2479
                          _mover=self.ExceptionFileMover(bad_source='a'))
2211
 
        self.failUnlessExists('a')
2212
 
        self.failUnlessExists('a/b')
 
2480
        self.assertPathExists('a')
 
2481
        self.assertPathExists('a/b')
2213
2482
        tt.apply()
2214
 
        self.failUnlessExists('c')
2215
 
        self.failUnlessExists('c/d')
 
2483
        self.assertPathExists('c')
 
2484
        self.assertPathExists('c/d')
2216
2485
 
2217
2486
    def test_rollback_rename_into_place(self):
2218
2487
        tree = self.make_branch_and_tree('.')
2224
2493
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2225
2494
        self.assertRaises(Bogus, tt.apply,
2226
2495
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2227
 
        self.failUnlessExists('a')
2228
 
        self.failUnlessExists('a/b')
 
2496
        self.assertPathExists('a')
 
2497
        self.assertPathExists('a/b')
2229
2498
        tt.apply()
2230
 
        self.failUnlessExists('c')
2231
 
        self.failUnlessExists('c/d')
 
2499
        self.assertPathExists('c')
 
2500
        self.assertPathExists('c/d')
2232
2501
 
2233
2502
    def test_rollback_deletion(self):
2234
2503
        tree = self.make_branch_and_tree('.')
2240
2509
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2510
        self.assertRaises(Bogus, tt.apply,
2242
2511
                          _mover=self.ExceptionFileMover(bad_target='d'))
2243
 
        self.failUnlessExists('a')
2244
 
        self.failUnlessExists('a/b')
2245
 
 
2246
 
    def test_resolve_no_parent(self):
 
2512
        self.assertPathExists('a')
 
2513
        self.assertPathExists('a/b')
 
2514
 
 
2515
 
 
2516
class TestFinalizeRobustness(tests.TestCaseWithTransport):
 
2517
    """Ensure treetransform creation errors can be safely cleaned up after"""
 
2518
 
 
2519
    def _override_globals_in_method(self, instance, method_name, globals):
 
2520
        """Replace method on instance with one with updated globals"""
 
2521
        import types
 
2522
        func = getattr(instance, method_name).im_func
 
2523
        new_globals = dict(func.func_globals)
 
2524
        new_globals.update(globals)
 
2525
        new_func = types.FunctionType(func.func_code, new_globals,
 
2526
            func.func_name, func.func_defaults)
 
2527
        setattr(instance, method_name,
 
2528
            types.MethodType(new_func, instance, instance.__class__))
 
2529
        self.addCleanup(delattr, instance, method_name)
 
2530
 
 
2531
    @staticmethod
 
2532
    def _fake_open_raises_before(name, mode):
 
2533
        """Like open() but raises before doing anything"""
 
2534
        raise RuntimeError
 
2535
 
 
2536
    @staticmethod
 
2537
    def _fake_open_raises_after(name, mode):
 
2538
        """Like open() but raises after creating file without returning"""
 
2539
        open(name, mode).close()
 
2540
        raise RuntimeError
 
2541
 
 
2542
    def create_transform_and_root_trans_id(self):
 
2543
        """Setup a transform creating a file in limbo"""
 
2544
        tree = self.make_branch_and_tree('.')
 
2545
        tt = TreeTransform(tree)
 
2546
        return tt, tt.create_path("a", tt.root)
 
2547
 
 
2548
    def create_transform_and_subdir_trans_id(self):
 
2549
        """Setup a transform creating a directory containing a file in limbo"""
 
2550
        tree = self.make_branch_and_tree('.')
 
2551
        tt = TreeTransform(tree)
 
2552
        d_trans_id = tt.create_path("d", tt.root)
 
2553
        tt.create_directory(d_trans_id)
 
2554
        f_trans_id = tt.create_path("a", d_trans_id)
 
2555
        tt.adjust_path("a", d_trans_id, f_trans_id)
 
2556
        return tt, f_trans_id
 
2557
 
 
2558
    def test_root_create_file_open_raises_before_creation(self):
 
2559
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2560
        self._override_globals_in_method(tt, "create_file",
 
2561
            {"open": self._fake_open_raises_before})
 
2562
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2563
        path = tt._limbo_name(trans_id)
 
2564
        self.assertPathDoesNotExist(path)
 
2565
        tt.finalize()
 
2566
        self.assertPathDoesNotExist(tt._limbodir)
 
2567
 
 
2568
    def test_root_create_file_open_raises_after_creation(self):
 
2569
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2570
        self._override_globals_in_method(tt, "create_file",
 
2571
            {"open": self._fake_open_raises_after})
 
2572
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2573
        path = tt._limbo_name(trans_id)
 
2574
        self.assertPathExists(path)
 
2575
        tt.finalize()
 
2576
        self.assertPathDoesNotExist(path)
 
2577
        self.assertPathDoesNotExist(tt._limbodir)
 
2578
 
 
2579
    def test_subdir_create_file_open_raises_before_creation(self):
 
2580
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2581
        self._override_globals_in_method(tt, "create_file",
 
2582
            {"open": self._fake_open_raises_before})
 
2583
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2584
        path = tt._limbo_name(trans_id)
 
2585
        self.assertPathDoesNotExist(path)
 
2586
        tt.finalize()
 
2587
        self.assertPathDoesNotExist(tt._limbodir)
 
2588
 
 
2589
    def test_subdir_create_file_open_raises_after_creation(self):
 
2590
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2591
        self._override_globals_in_method(tt, "create_file",
 
2592
            {"open": self._fake_open_raises_after})
 
2593
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2594
        path = tt._limbo_name(trans_id)
 
2595
        self.assertPathExists(path)
 
2596
        tt.finalize()
 
2597
        self.assertPathDoesNotExist(path)
 
2598
        self.assertPathDoesNotExist(tt._limbodir)
 
2599
 
 
2600
    def test_rename_in_limbo_rename_raises_after_rename(self):
 
2601
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2602
        parent1 = tt.new_directory('parent1', tt.root)
 
2603
        child1 = tt.new_file('child1', parent1, 'contents')
 
2604
        parent2 = tt.new_directory('parent2', tt.root)
 
2605
 
 
2606
        class FakeOSModule(object):
 
2607
            def rename(self, old, new):
 
2608
                os.rename(old, new)
 
2609
                raise RuntimeError
 
2610
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2611
            {"os": FakeOSModule()})
 
2612
        self.assertRaises(
 
2613
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2614
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
 
2615
        self.assertPathExists(path)
 
2616
        tt.finalize()
 
2617
        self.assertPathDoesNotExist(path)
 
2618
        self.assertPathDoesNotExist(tt._limbodir)
 
2619
 
 
2620
    def test_rename_in_limbo_rename_raises_before_rename(self):
 
2621
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2622
        parent1 = tt.new_directory('parent1', tt.root)
 
2623
        child1 = tt.new_file('child1', parent1, 'contents')
 
2624
        parent2 = tt.new_directory('parent2', tt.root)
 
2625
 
 
2626
        class FakeOSModule(object):
 
2627
            def rename(self, old, new):
 
2628
                raise RuntimeError
 
2629
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2630
            {"os": FakeOSModule()})
 
2631
        self.assertRaises(
 
2632
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2633
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
 
2634
        self.assertPathExists(path)
 
2635
        tt.finalize()
 
2636
        self.assertPathDoesNotExist(path)
 
2637
        self.assertPathDoesNotExist(tt._limbodir)
 
2638
 
 
2639
 
 
2640
class TestTransformMissingParent(tests.TestCaseWithTransport):
 
2641
 
 
2642
    def make_tt_with_versioned_dir(self):
2247
2643
        wt = self.make_branch_and_tree('.')
 
2644
        self.build_tree(['dir/',])
 
2645
        wt.add(['dir'], ['dir-id'])
 
2646
        wt.commit('Create dir')
2248
2647
        tt = TreeTransform(wt)
2249
2648
        self.addCleanup(tt.finalize)
2250
 
        parent = tt.trans_id_file_id('parent-id')
2251
 
        tt.new_file('file', parent, 'Contents')
2252
 
        resolve_conflicts(tt)
 
2649
        return wt, tt
 
2650
 
 
2651
    def test_resolve_create_parent_for_versioned_file(self):
 
2652
        wt, tt = self.make_tt_with_versioned_dir()
 
2653
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2654
        file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
 
2655
        tt.delete_contents(dir_tid)
 
2656
        tt.unversion_file(dir_tid)
 
2657
        conflicts = resolve_conflicts(tt)
 
2658
        # one conflict for the missing directory, one for the unversioned
 
2659
        # parent
 
2660
        self.assertLength(2, conflicts)
 
2661
 
 
2662
    def test_non_versioned_file_create_conflict(self):
 
2663
        wt, tt = self.make_tt_with_versioned_dir()
 
2664
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2665
        tt.new_file('file', dir_tid, 'Contents')
 
2666
        tt.delete_contents(dir_tid)
 
2667
        tt.unversion_file(dir_tid)
 
2668
        conflicts = resolve_conflicts(tt)
 
2669
        # no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
 
2670
        self.assertLength(1, conflicts)
 
2671
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
2672
                         conflicts.pop())
2253
2673
 
2254
2674
 
2255
2675
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
2676
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2677
                  (False, False))
2258
2678
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2679
              ('', ''), ('directory', 'directory'), (False, False))
2260
2680
 
2261
2681
 
2262
2682
class TestTransformPreview(tests.TestCaseWithTransport):
2349
2769
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2350
2770
        changes = preview_tree.iter_changes(revision_tree,
2351
2771
                                            specific_files=[''])
2352
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2772
        self.assertEqual([A_ENTRY], list(changes))
2353
2773
 
2354
2774
    def test_want_unversioned(self):
2355
2775
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2356
2776
        changes = preview_tree.iter_changes(revision_tree,
2357
2777
                                            want_unversioned=True)
2358
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2778
        self.assertEqual([A_ENTRY], list(changes))
2359
2779
 
2360
2780
    def test_ignore_extra_trees_no_specific_files(self):
2361
2781
        # extra_trees is harmless without specific_files, so we'll silently
2404
2824
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2405
2825
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
2406
2826
 
 
2827
    def test_get_file_size(self):
 
2828
        work_tree = self.make_branch_and_tree('tree')
 
2829
        self.build_tree_contents([('tree/old', 'old')])
 
2830
        work_tree.add('old', 'old-id')
 
2831
        preview = TransformPreview(work_tree)
 
2832
        self.addCleanup(preview.finalize)
 
2833
        new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
 
2834
                                  'executable')
 
2835
        tree = preview.get_preview_tree()
 
2836
        self.assertEqual(len('old'), tree.get_file_size('old-id'))
 
2837
        self.assertEqual(len('contents'), tree.get_file_size('new-id'))
 
2838
 
2407
2839
    def test_get_file(self):
2408
2840
        preview = self.get_empty_preview()
2409
2841
        preview.new_file('file', preview.root, 'contents', 'file-id')
2821
3253
        merger.merge_type = Merge3Merger
2822
3254
        merger.do_merge()
2823
3255
 
 
3256
    def test_has_filename(self):
 
3257
        wt = self.make_branch_and_tree('tree')
 
3258
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3259
        tt = TransformPreview(wt)
 
3260
        removed_id = tt.trans_id_tree_path('removed')
 
3261
        tt.delete_contents(removed_id)
 
3262
        tt.new_file('new', tt.root, 'contents')
 
3263
        modified_id = tt.trans_id_tree_path('modified')
 
3264
        tt.delete_contents(modified_id)
 
3265
        tt.create_file('modified-contents', modified_id)
 
3266
        self.addCleanup(tt.finalize)
 
3267
        tree = tt.get_preview_tree()
 
3268
        self.assertTrue(tree.has_filename('unmodified'))
 
3269
        self.assertFalse(tree.has_filename('not-present'))
 
3270
        self.assertFalse(tree.has_filename('removed'))
 
3271
        self.assertTrue(tree.has_filename('new'))
 
3272
        self.assertTrue(tree.has_filename('modified'))
 
3273
 
2824
3274
    def test_is_executable(self):
2825
3275
        tree = self.make_branch_and_tree('tree')
2826
3276
        preview = TransformPreview(tree)
3132
3582
        trans_id = tt.trans_id_tree_path('file')
3133
3583
        self.assertEqual((LINES_ONE,),
3134
3584
            tt._get_parents_texts(trans_id))
 
3585
 
 
3586
 
 
3587
class TestOrphan(tests.TestCaseWithTransport):
 
3588
 
 
3589
    def test_no_orphan_for_transform_preview(self):
 
3590
        tree = self.make_branch_and_tree('tree')
 
3591
        tt = transform.TransformPreview(tree)
 
3592
        self.addCleanup(tt.finalize)
 
3593
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
3594
 
 
3595
    def _set_orphan_policy(self, wt, policy):
 
3596
        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
 
3597
                                               policy)
 
3598
 
 
3599
    def _prepare_orphan(self, wt):
 
3600
        self.build_tree(['dir/', 'dir/file', 'dir/foo'])
 
3601
        wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
 
3602
        wt.commit('add dir and file ignoring foo')
 
3603
        tt = transform.TreeTransform(wt)
 
3604
        self.addCleanup(tt.finalize)
 
3605
        # dir and bar are deleted
 
3606
        dir_tid = tt.trans_id_tree_path('dir')
 
3607
        file_tid = tt.trans_id_tree_path('dir/file')
 
3608
        orphan_tid = tt.trans_id_tree_path('dir/foo')
 
3609
        tt.delete_contents(file_tid)
 
3610
        tt.unversion_file(file_tid)
 
3611
        tt.delete_contents(dir_tid)
 
3612
        tt.unversion_file(dir_tid)
 
3613
        # There should be a conflict because dir still contain foo
 
3614
        raw_conflicts = tt.find_conflicts()
 
3615
        self.assertLength(1, raw_conflicts)
 
3616
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
 
3617
        return tt, orphan_tid
 
3618
 
 
3619
    def test_new_orphan_created(self):
 
3620
        wt = self.make_branch_and_tree('.')
 
3621
        self._set_orphan_policy(wt, 'move')
 
3622
        tt, orphan_tid = self._prepare_orphan(wt)
 
3623
        warnings = []
 
3624
        def warning(*args):
 
3625
            warnings.append(args[0] % args[1:])
 
3626
        self.overrideAttr(trace, 'warning', warning)
 
3627
        remaining_conflicts = resolve_conflicts(tt)
 
3628
        self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
 
3629
                          warnings)
 
3630
        # Yeah for resolved conflicts !
 
3631
        self.assertLength(0, remaining_conflicts)
 
3632
        # We have a new orphan
 
3633
        self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
 
3634
        self.assertEquals('bzr-orphans',
 
3635
                          tt.final_name(tt.final_parent(orphan_tid)))
 
3636
 
 
3637
    def test_never_orphan(self):
 
3638
        wt = self.make_branch_and_tree('.')
 
3639
        self._set_orphan_policy(wt, 'conflict')
 
3640
        tt, orphan_tid = self._prepare_orphan(wt)
 
3641
        remaining_conflicts = resolve_conflicts(tt)
 
3642
        self.assertLength(1, remaining_conflicts)
 
3643
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3644
                         remaining_conflicts.pop())
 
3645
 
 
3646
    def test_orphan_error(self):
 
3647
        def bogus_orphan(tt, orphan_id, parent_id):
 
3648
            raise transform.OrphaningError(tt.final_name(orphan_id),
 
3649
                                           tt.final_name(parent_id))
 
3650
        transform.orphaning_registry.register('bogus', bogus_orphan,
 
3651
                                              'Raise an error when orphaning')
 
3652
        wt = self.make_branch_and_tree('.')
 
3653
        self._set_orphan_policy(wt, 'bogus')
 
3654
        tt, orphan_tid = self._prepare_orphan(wt)
 
3655
        remaining_conflicts = resolve_conflicts(tt)
 
3656
        self.assertLength(1, remaining_conflicts)
 
3657
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3658
                         remaining_conflicts.pop())
 
3659
 
 
3660
    def test_unknown_orphan_policy(self):
 
3661
        wt = self.make_branch_and_tree('.')
 
3662
        # Set a fictional policy nobody ever implemented
 
3663
        self._set_orphan_policy(wt, 'donttouchmypreciouuus')
 
3664
        tt, orphan_tid = self._prepare_orphan(wt)
 
3665
        warnings = []
 
3666
        def warning(*args):
 
3667
            warnings.append(args[0] % args[1:])
 
3668
        self.overrideAttr(trace, 'warning', warning)
 
3669
        remaining_conflicts = resolve_conflicts(tt)
 
3670
        # We fallback to the default policy which create a conflict
 
3671
        self.assertLength(1, remaining_conflicts)
 
3672
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3673
                         remaining_conflicts.pop())
 
3674
        self.assertLength(1, warnings)
 
3675
        self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')