/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Gordon Tyler
  • Date: 2011-06-30 21:00:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6007.
  • Revision ID: gordon@doxxx.net-20110630210038-bzscps46jgcqtkr0
https://launchpad.net/bugs/784505
Use known executables for win32 and other platforms in test_exe_on_path.

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_remove_root_fixup(self):
 
295
        transform, root = self.get_transform()
 
296
        old_root_id = self.wt.get_root_id()
 
297
        self.assertNotEqual('new-root-id', old_root_id)
 
298
        transform.delete_contents(root)
 
299
        transform.unversion_file(root)
 
300
        transform.fixup_new_roots()
 
301
        transform.apply()
 
302
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
303
 
 
304
        transform, root = self.get_transform()
 
305
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
 
306
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
 
307
        self.assertRaises(ValueError, transform.fixup_new_roots)
 
308
 
 
309
    def test_apply_retains_root_directory(self):
 
310
        # Do not attempt to delete the physical root directory, because that
 
311
        # is impossible.
 
312
        transform, root = self.get_transform()
 
313
        with transform:
 
314
            transform.delete_contents(root)
 
315
            e = self.assertRaises(AssertionError, self.assertRaises,
 
316
                                  errors.TransformRenameFailed,
 
317
                                  transform.apply)
 
318
        self.assertContainsRe('TransformRenameFailed not raised', str(e))
 
319
 
193
320
    def test_hardlink(self):
194
321
        self.requireFeature(HardlinkFeature)
195
322
        transform, root = self.get_transform()
200
327
        trans_id = target_transform.create_path('file1', target_transform.root)
201
328
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
329
        target_transform.apply()
203
 
        self.failUnlessExists('target/file1')
 
330
        self.assertPathExists('target/file1')
204
331
        source_stat = os.stat(self.wt.abspath('file1'))
205
332
        target_stat = os.stat('target/file1')
206
333
        self.assertEqual(source_stat, target_stat)
372
499
        transform.new_file('FiLe', transform.root, 'content')
373
500
        resolve_conflicts(transform)
374
501
        transform.apply()
375
 
        self.failUnlessExists('tree/file')
376
 
        self.failUnlessExists('tree/FiLe.moved')
 
502
        self.assertPathExists('tree/file')
 
503
        self.assertPathExists('tree/FiLe.moved')
377
504
 
378
505
    def test_resolve_checkout_case_conflict(self):
379
506
        tree = self.make_branch_and_tree('tree')
388
515
        resolve_conflicts(transform,
389
516
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
390
517
        transform.apply()
391
 
        self.failUnlessExists('tree/file')
392
 
        self.failUnlessExists('tree/FiLe.moved')
 
518
        self.assertPathExists('tree/file')
 
519
        self.assertPathExists('tree/FiLe.moved')
393
520
 
394
521
    def test_apply_case_conflict(self):
395
522
        """Ensure that a transform with case conflicts can always be applied"""
403
530
        transform.new_file('dirFiLe', dir, 'content')
404
531
        resolve_conflicts(transform)
405
532
        transform.apply()
406
 
        self.failUnlessExists('tree/file')
 
533
        self.assertPathExists('tree/file')
407
534
        if not os.path.exists('tree/FiLe.moved'):
408
 
            self.failUnlessExists('tree/FiLe')
409
 
        self.failUnlessExists('tree/dir/dirfile')
 
535
            self.assertPathExists('tree/FiLe')
 
536
        self.assertPathExists('tree/dir/dirfile')
410
537
        if not os.path.exists('tree/dir/dirFiLe.moved'):
411
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
538
            self.assertPathExists('tree/dir/dirFiLe')
412
539
 
413
540
    def test_case_insensitive_limbo(self):
414
541
        tree = self.make_branch_and_tree('tree')
716
843
        raw_conflicts = resolve_conflicts(tt)
717
844
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
718
845
        tt.finalize()
719
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
846
        conflicts_s = [unicode(c) for c in cooked_conflicts]
720
847
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
721
848
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
722
849
                                         'Moved existing file to '
792
919
        self.assertIs(None, self.wt.path2id('parent'))
793
920
        self.assertIs(None, self.wt.path2id('parent.new'))
794
921
 
 
922
    def test_resolve_conflicts_missing_parent(self):
 
923
        wt = self.make_branch_and_tree('.')
 
924
        tt = TreeTransform(wt)
 
925
        self.addCleanup(tt.finalize)
 
926
        parent = tt.trans_id_file_id('parent-id')
 
927
        tt.new_file('file', parent, 'Contents')
 
928
        raw_conflicts = resolve_conflicts(tt)
 
929
        # Since the directory doesn't exist it's seen as 'missing'.  So
 
930
        # 'resolve_conflicts' create a conflict asking for it to be created.
 
931
        self.assertLength(1, raw_conflicts)
 
932
        self.assertEqual(('missing parent', 'Created directory', 'new-1'),
 
933
                         raw_conflicts.pop())
 
934
        # apply fail since the missing directory doesn't exist
 
935
        self.assertRaises(errors.NoFinalPath, tt.apply)
 
936
 
795
937
    def test_moving_versioned_directories(self):
796
938
        create, root = self.get_transform()
797
939
        kansas = create.new_directory('kansas', root, 'kansas-id')
830
972
        rename.set_executability(True, myfile)
831
973
        rename.apply()
832
974
 
 
975
    def test_rename_fails(self):
 
976
        self.requireFeature(features.not_running_as_root)
 
977
        # see https://bugs.launchpad.net/bzr/+bug/491763
 
978
        create, root_id = self.get_transform()
 
979
        first_dir = create.new_directory('first-dir', root_id, 'first-id')
 
980
        myfile = create.new_file('myfile', root_id, 'myfile-text',
 
981
                                 'myfile-id')
 
982
        create.apply()
 
983
        if os.name == "posix" and sys.platform != "cygwin":
 
984
            # posix filesystems fail on renaming if the readonly bit is set
 
985
            osutils.make_readonly(self.wt.abspath('first-dir'))
 
986
        elif os.name == "nt":
 
987
            # windows filesystems fail on renaming open files
 
988
            self.addCleanup(file(self.wt.abspath('myfile')).close)
 
989
        else:
 
990
            self.skip("Don't know how to force a permissions error on rename")
 
991
        # now transform to rename
 
992
        rename_transform, root_id = self.get_transform()
 
993
        file_trans_id = rename_transform.trans_id_file_id('myfile-id')
 
994
        dir_id = rename_transform.trans_id_file_id('first-id')
 
995
        rename_transform.adjust_path('newname', dir_id, file_trans_id)
 
996
        e = self.assertRaises(errors.TransformRenameFailed,
 
997
            rename_transform.apply)
 
998
        # On nix looks like: 
 
999
        # "Failed to rename .../work/.bzr/checkout/limbo/new-1
 
1000
        # to .../first-dir/newname: [Errno 13] Permission denied"
 
1001
        # On windows looks like:
 
1002
        # "Failed to rename .../work/myfile to 
 
1003
        # .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
 
1004
        # This test isn't concerned with exactly what the error looks like,
 
1005
        # and the strerror will vary across OS and locales, but the assert
 
1006
        # that the exeception attributes are what we expect
 
1007
        self.assertEqual(e.errno, errno.EACCES)
 
1008
        if os.name == "posix":
 
1009
            self.assertEndsWith(e.to_path, "/first-dir/newname")
 
1010
        else:
 
1011
            self.assertEqual(os.path.basename(e.from_path), "myfile")
 
1012
 
833
1013
    def test_set_executability_order(self):
834
1014
        """Ensure that executability behaves the same, no matter what order.
835
1015
 
1107
1287
        parent2 = transform.new_directory('parent2', root)
1108
1288
        transform.adjust_path('child1', parent2, child1)
1109
1289
        transform.apply()
1110
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1111
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1290
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1291
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1112
1292
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1113
1293
        # no rename for child1 (counting only renames during apply)
1114
 
        self.failUnlessEqual(2, transform.rename_count)
 
1294
        self.assertEqual(2, transform.rename_count)
1115
1295
 
1116
1296
    def test_cancel_parent(self):
1117
1297
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1140
1320
        parent2 = transform.new_directory('parent2', root)
1141
1321
        transform.adjust_path('child1', parent2, child1)
1142
1322
        transform.apply()
1143
 
        self.failIfExists(self.wt.abspath('parent1'))
1144
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1323
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1324
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1145
1325
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1146
 
        self.failUnlessEqual(2, transform.rename_count)
 
1326
        self.assertEqual(2, transform.rename_count)
1147
1327
 
1148
1328
    def test_adjust_and_cancel(self):
1149
1329
        """Make sure adjust_path keeps track of limbo children properly"""
1182
1362
        child = transform.new_directory('child', parent)
1183
1363
        transform.adjust_path('parent', root, parent)
1184
1364
        transform.apply()
1185
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1365
        self.assertPathExists(self.wt.abspath('parent/child'))
1186
1366
        self.assertEqual(1, transform.rename_count)
1187
1367
 
1188
1368
    def test_reuse_name(self):
1319
1499
        tt.create_file(["aa\n"], bar_trans_id)
1320
1500
        tt.version_file("bar-1", bar_trans_id)
1321
1501
        tt.apply()
1322
 
        self.failUnlessExists("foo/bar")
 
1502
        self.assertPathExists("foo/bar")
1323
1503
        wt.lock_read()
1324
1504
        try:
1325
1505
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1342
1522
        tt.delete_contents(foo_trans_id)
1343
1523
        tt.create_symlink("bar", foo_trans_id)
1344
1524
        tt.apply()
1345
 
        self.failUnlessExists("foo")
 
1525
        self.assertPathExists("foo")
1346
1526
        wt.lock_read()
1347
1527
        self.addCleanup(wt.unlock)
1348
1528
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1361
1541
        tt.delete_versioned(bar_trans_id)
1362
1542
        tt.create_file(["aa\n"], foo_trans_id)
1363
1543
        tt.apply()
1364
 
        self.failUnlessExists("foo")
 
1544
        self.assertPathExists("foo")
1365
1545
        wt.lock_read()
1366
1546
        self.addCleanup(wt.unlock)
1367
1547
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1382
1562
        self.build_tree(['baz'])
1383
1563
        tt.create_hardlink("baz", foo_trans_id)
1384
1564
        tt.apply()
1385
 
        self.failUnlessExists("foo")
1386
 
        self.failUnlessExists("baz")
 
1565
        self.assertPathExists("foo")
 
1566
        self.assertPathExists("baz")
1387
1567
        wt.lock_read()
1388
1568
        self.addCleanup(wt.unlock)
1389
1569
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1451
1631
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1452
1632
 
1453
1633
 
 
1634
class TestInventoryAltered(tests.TestCaseWithTransport):
 
1635
 
 
1636
    def test_inventory_altered_unchanged(self):
 
1637
        tree = self.make_branch_and_tree('tree')
 
1638
        self.build_tree(['tree/foo'])
 
1639
        tree.add('foo', 'foo-id')
 
1640
        with TransformPreview(tree) as tt:
 
1641
            self.assertEqual([], tt._inventory_altered())
 
1642
 
 
1643
    def test_inventory_altered_changed_parent_id(self):
 
1644
        tree = self.make_branch_and_tree('tree')
 
1645
        self.build_tree(['tree/foo'])
 
1646
        tree.add('foo', 'foo-id')
 
1647
        with TransformPreview(tree) as tt:
 
1648
            tt.unversion_file(tt.root)
 
1649
            tt.version_file('new-id', tt.root)
 
1650
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1651
            foo_tuple = ('foo', foo_trans_id)
 
1652
            root_tuple = ('', tt.root)
 
1653
            self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
 
1654
 
 
1655
    def test_inventory_altered_noop_changed_parent_id(self):
 
1656
        tree = self.make_branch_and_tree('tree')
 
1657
        self.build_tree(['tree/foo'])
 
1658
        tree.add('foo', 'foo-id')
 
1659
        with TransformPreview(tree) as tt:
 
1660
            tt.unversion_file(tt.root)
 
1661
            tt.version_file(tree.get_root_id(), tt.root)
 
1662
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1663
            self.assertEqual([], tt._inventory_altered())
 
1664
 
 
1665
 
1454
1666
class TestTransformMerge(TestCaseInTempDir):
1455
1667
 
1456
1668
    def test_text_merge(self):
1666
1878
        tree.add_reference(subtree)
1667
1879
        tree.commit('a revision')
1668
1880
        tree.branch.create_checkout('target')
1669
 
        self.failUnlessExists('target')
1670
 
        self.failUnlessExists('target/subtree')
 
1881
        self.assertPathExists('target')
 
1882
        self.assertPathExists('target/subtree')
1671
1883
 
1672
1884
    def test_file_conflict_handling(self):
1673
1885
        """Ensure that when building trees, conflict handling is done"""
1720
1932
        source.commit('added file')
1721
1933
        build_tree(source.basis_tree(), target)
1722
1934
        self.assertEqual([], target.conflicts())
1723
 
        self.failUnlessExists('target/dir1/file')
 
1935
        self.assertPathExists('target/dir1/file')
1724
1936
 
1725
1937
        # Ensure contents are merged
1726
1938
        target = self.make_branch_and_tree('target2')
1727
1939
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1728
1940
        build_tree(source.basis_tree(), target)
1729
1941
        self.assertEqual([], target.conflicts())
1730
 
        self.failUnlessExists('target2/dir1/file2')
1731
 
        self.failUnlessExists('target2/dir1/file')
 
1942
        self.assertPathExists('target2/dir1/file2')
 
1943
        self.assertPathExists('target2/dir1/file')
1732
1944
 
1733
1945
        # Ensure new contents are suppressed for existing branches
1734
1946
        target = self.make_branch_and_tree('target3')
1735
1947
        self.make_branch('target3/dir1')
1736
1948
        self.build_tree(['target3/dir1/file2'])
1737
1949
        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')
 
1950
        self.assertPathDoesNotExist('target3/dir1/file')
 
1951
        self.assertPathExists('target3/dir1/file2')
 
1952
        self.assertPathExists('target3/dir1.diverted/file')
1741
1953
        self.assertEqual([DuplicateEntry('Diverted to',
1742
1954
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1743
1955
            target.conflicts())
1746
1958
        self.build_tree(['target4/dir1/'])
1747
1959
        self.make_branch('target4/dir1/file')
1748
1960
        build_tree(source.basis_tree(), target)
1749
 
        self.failUnlessExists('target4/dir1/file')
 
1961
        self.assertPathExists('target4/dir1/file')
1750
1962
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1751
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1963
        self.assertPathExists('target4/dir1/file.diverted')
1752
1964
        self.assertEqual([DuplicateEntry('Diverted to',
1753
1965
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1754
1966
            target.conflicts())
1822
2034
        self.addCleanup(target.unlock)
1823
2035
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1824
2036
 
 
2037
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
2038
        source = self.create_ab_tree()
 
2039
        sha1 = osutils.sha_string('A')
 
2040
        target = self.make_branch_and_tree('target')
 
2041
        target.lock_write()
 
2042
        self.addCleanup(target.unlock)
 
2043
        state = target.current_dirstate()
 
2044
        state._cutoff_time = time.time() + 60
 
2045
        build_tree(source.basis_tree(), target, source)
 
2046
        entry = state._get_entry(0, path_utf8='file1')
 
2047
        self.assertEqual(sha1, entry[1][0][1])
 
2048
 
1825
2049
    def test_build_tree_accelerator_tree_missing_file(self):
1826
2050
        source = self.create_ab_tree()
1827
2051
        os.unlink('source/file1')
1985
2209
        self.assertEqual('file.moved', target.id2path('lower-id'))
1986
2210
        self.assertEqual('FILE', target.id2path('upper-id'))
1987
2211
 
 
2212
    def test_build_tree_observes_sha(self):
 
2213
        source = self.make_branch_and_tree('source')
 
2214
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2215
        source.add(['file1', 'dir', 'dir/file2'],
 
2216
                   ['file1-id', 'dir-id', 'file2-id'])
 
2217
        source.commit('new files')
 
2218
        target = self.make_branch_and_tree('target')
 
2219
        target.lock_write()
 
2220
        self.addCleanup(target.unlock)
 
2221
        # We make use of the fact that DirState caches its cutoff time. So we
 
2222
        # set the 'safe' time to one minute in the future.
 
2223
        state = target.current_dirstate()
 
2224
        state._cutoff_time = time.time() + 60
 
2225
        build_tree(source.basis_tree(), target)
 
2226
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2227
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2228
        # entry[1] is the state information, entry[1][0] is the state of the
 
2229
        # working tree, entry[1][0][1] is the sha value for the current working
 
2230
        # tree
 
2231
        entry1 = state._get_entry(0, path_utf8='file1')
 
2232
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2233
        # The 'size' field must also be set.
 
2234
        self.assertEqual(25, entry1[1][0][2])
 
2235
        entry1_state = entry1[1][0]
 
2236
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2237
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2238
        self.assertEqual(29, entry2[1][0][2])
 
2239
        entry2_state = entry2[1][0]
 
2240
        # Now, make sure that we don't have to re-read the content. The
 
2241
        # packed_stat should match exactly.
 
2242
        self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
 
2243
        self.assertEqual(entry2_sha,
 
2244
                         target.get_file_sha1('file2-id', 'dir/file2'))
 
2245
        self.assertEqual(entry1_state, entry1[1][0])
 
2246
        self.assertEqual(entry2_state, entry2[1][0])
 
2247
 
1988
2248
 
1989
2249
class TestCommitTransform(tests.TestCaseWithTransport):
1990
2250
 
2091
2351
        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2092
2352
                          'message')
2093
2353
 
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):
 
2354
    def test_commit_rich_revision_data(self):
 
2355
        branch, tt = self.get_branch_and_transform()
 
2356
        rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
 
2357
                           committer='me <me@example.com>',
 
2358
                           revprops={'foo': 'bar'}, revision_id='revid-1',
 
2359
                           authors=['Author1 <author1@example.com>',
 
2360
                              'Author2 <author2@example.com>',
 
2361
                               ])
 
2362
        self.assertEqual('revid-1', rev_id)
 
2363
        revision = branch.repository.get_revision(rev_id)
 
2364
        self.assertEqual(1, revision.timestamp)
 
2365
        self.assertEqual(43201, revision.timezone)
 
2366
        self.assertEqual('me <me@example.com>', revision.committer)
 
2367
        self.assertEqual(['Author1 <author1@example.com>',
 
2368
                          'Author2 <author2@example.com>'],
 
2369
                         revision.get_apparent_authors())
 
2370
        del revision.properties['authors']
 
2371
        self.assertEqual({'foo': 'bar',
 
2372
                          'branch-nick': 'tree'},
 
2373
                         revision.properties)
 
2374
 
 
2375
    def test_no_explicit_revprops(self):
 
2376
        branch, tt = self.get_branch_and_transform()
 
2377
        rev_id = tt.commit(branch, 'message', authors=[
 
2378
            'Author1 <author1@example.com>',
 
2379
            'Author2 <author2@example.com>', ])
 
2380
        revision = branch.repository.get_revision(rev_id)
 
2381
        self.assertEqual(['Author1 <author1@example.com>',
 
2382
                          'Author2 <author2@example.com>'],
 
2383
                         revision.get_apparent_authors())
 
2384
        self.assertEqual('tree', revision.properties['branch-nick'])
 
2385
 
 
2386
 
 
2387
class TestBackupName(tests.TestCase):
 
2388
 
 
2389
    def test_deprecations(self):
 
2390
        class MockTransform(object):
 
2391
 
 
2392
            def has_named_child(self, by_parent, parent_id, name):
 
2393
                return name in by_parent.get(parent_id, [])
 
2394
 
 
2395
        class MockEntry(object):
 
2396
 
 
2397
            def __init__(self):
 
2398
                object.__init__(self)
 
2399
                self.name = "name"
 
2400
 
2115
2401
        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~')
 
2402
        name1 = self.applyDeprecated(
 
2403
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2404
            transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
 
2405
        self.assertEqual('name.~1~', name1)
 
2406
        name2 = self.applyDeprecated(
 
2407
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2408
            transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
 
2409
        self.assertEqual('name.~2~', name2)
2126
2410
 
2127
2411
 
2128
2412
class TestFileMover(tests.TestCaseWithTransport):
2131
2415
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2132
2416
        mover = _FileMover()
2133
2417
        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')
 
2418
        self.assertPathExists('q')
 
2419
        self.assertPathDoesNotExist('a')
 
2420
        self.assertPathExists('q/b')
 
2421
        self.assertPathExists('c')
 
2422
        self.assertPathExists('c/d')
2139
2423
 
2140
2424
    def test_pre_delete_rollback(self):
2141
2425
        self.build_tree(['a/'])
2142
2426
        mover = _FileMover()
2143
2427
        mover.pre_delete('a', 'q')
2144
 
        self.failUnlessExists('q')
2145
 
        self.failIfExists('a')
 
2428
        self.assertPathExists('q')
 
2429
        self.assertPathDoesNotExist('a')
2146
2430
        mover.rollback()
2147
 
        self.failIfExists('q')
2148
 
        self.failUnlessExists('a')
 
2431
        self.assertPathDoesNotExist('q')
 
2432
        self.assertPathExists('a')
2149
2433
 
2150
2434
    def test_apply_deletions(self):
2151
2435
        self.build_tree(['a/', 'b/'])
2152
2436
        mover = _FileMover()
2153
2437
        mover.pre_delete('a', 'q')
2154
2438
        mover.pre_delete('b', 'r')
2155
 
        self.failUnlessExists('q')
2156
 
        self.failUnlessExists('r')
2157
 
        self.failIfExists('a')
2158
 
        self.failIfExists('b')
 
2439
        self.assertPathExists('q')
 
2440
        self.assertPathExists('r')
 
2441
        self.assertPathDoesNotExist('a')
 
2442
        self.assertPathDoesNotExist('b')
2159
2443
        mover.apply_deletions()
2160
 
        self.failIfExists('q')
2161
 
        self.failIfExists('r')
2162
 
        self.failIfExists('a')
2163
 
        self.failIfExists('b')
 
2444
        self.assertPathDoesNotExist('q')
 
2445
        self.assertPathDoesNotExist('r')
 
2446
        self.assertPathDoesNotExist('a')
 
2447
        self.assertPathDoesNotExist('b')
2164
2448
 
2165
2449
    def test_file_mover_rollback(self):
2166
2450
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2171
2455
            mover.rename('a', 'c')
2172
2456
        except errors.FileExists, e:
2173
2457
            mover.rollback()
2174
 
        self.failUnlessExists('a')
2175
 
        self.failUnlessExists('c/d')
 
2458
        self.assertPathExists('a')
 
2459
        self.assertPathExists('c/d')
2176
2460
 
2177
2461
 
2178
2462
class Bogus(Exception):
2208
2492
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2209
2493
        self.assertRaises(Bogus, tt.apply,
2210
2494
                          _mover=self.ExceptionFileMover(bad_source='a'))
2211
 
        self.failUnlessExists('a')
2212
 
        self.failUnlessExists('a/b')
 
2495
        self.assertPathExists('a')
 
2496
        self.assertPathExists('a/b')
2213
2497
        tt.apply()
2214
 
        self.failUnlessExists('c')
2215
 
        self.failUnlessExists('c/d')
 
2498
        self.assertPathExists('c')
 
2499
        self.assertPathExists('c/d')
2216
2500
 
2217
2501
    def test_rollback_rename_into_place(self):
2218
2502
        tree = self.make_branch_and_tree('.')
2224
2508
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2225
2509
        self.assertRaises(Bogus, tt.apply,
2226
2510
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2227
 
        self.failUnlessExists('a')
2228
 
        self.failUnlessExists('a/b')
 
2511
        self.assertPathExists('a')
 
2512
        self.assertPathExists('a/b')
2229
2513
        tt.apply()
2230
 
        self.failUnlessExists('c')
2231
 
        self.failUnlessExists('c/d')
 
2514
        self.assertPathExists('c')
 
2515
        self.assertPathExists('c/d')
2232
2516
 
2233
2517
    def test_rollback_deletion(self):
2234
2518
        tree = self.make_branch_and_tree('.')
2240
2524
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2525
        self.assertRaises(Bogus, tt.apply,
2242
2526
                          _mover=self.ExceptionFileMover(bad_target='d'))
2243
 
        self.failUnlessExists('a')
2244
 
        self.failUnlessExists('a/b')
2245
 
 
2246
 
    def test_resolve_no_parent(self):
 
2527
        self.assertPathExists('a')
 
2528
        self.assertPathExists('a/b')
 
2529
 
 
2530
 
 
2531
class TestFinalizeRobustness(tests.TestCaseWithTransport):
 
2532
    """Ensure treetransform creation errors can be safely cleaned up after"""
 
2533
 
 
2534
    def _override_globals_in_method(self, instance, method_name, globals):
 
2535
        """Replace method on instance with one with updated globals"""
 
2536
        import types
 
2537
        func = getattr(instance, method_name).im_func
 
2538
        new_globals = dict(func.func_globals)
 
2539
        new_globals.update(globals)
 
2540
        new_func = types.FunctionType(func.func_code, new_globals,
 
2541
            func.func_name, func.func_defaults)
 
2542
        setattr(instance, method_name,
 
2543
            types.MethodType(new_func, instance, instance.__class__))
 
2544
        self.addCleanup(delattr, instance, method_name)
 
2545
 
 
2546
    @staticmethod
 
2547
    def _fake_open_raises_before(name, mode):
 
2548
        """Like open() but raises before doing anything"""
 
2549
        raise RuntimeError
 
2550
 
 
2551
    @staticmethod
 
2552
    def _fake_open_raises_after(name, mode):
 
2553
        """Like open() but raises after creating file without returning"""
 
2554
        open(name, mode).close()
 
2555
        raise RuntimeError
 
2556
 
 
2557
    def create_transform_and_root_trans_id(self):
 
2558
        """Setup a transform creating a file in limbo"""
 
2559
        tree = self.make_branch_and_tree('.')
 
2560
        tt = TreeTransform(tree)
 
2561
        return tt, tt.create_path("a", tt.root)
 
2562
 
 
2563
    def create_transform_and_subdir_trans_id(self):
 
2564
        """Setup a transform creating a directory containing a file in limbo"""
 
2565
        tree = self.make_branch_and_tree('.')
 
2566
        tt = TreeTransform(tree)
 
2567
        d_trans_id = tt.create_path("d", tt.root)
 
2568
        tt.create_directory(d_trans_id)
 
2569
        f_trans_id = tt.create_path("a", d_trans_id)
 
2570
        tt.adjust_path("a", d_trans_id, f_trans_id)
 
2571
        return tt, f_trans_id
 
2572
 
 
2573
    def test_root_create_file_open_raises_before_creation(self):
 
2574
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2575
        self._override_globals_in_method(tt, "create_file",
 
2576
            {"open": self._fake_open_raises_before})
 
2577
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2578
        path = tt._limbo_name(trans_id)
 
2579
        self.assertPathDoesNotExist(path)
 
2580
        tt.finalize()
 
2581
        self.assertPathDoesNotExist(tt._limbodir)
 
2582
 
 
2583
    def test_root_create_file_open_raises_after_creation(self):
 
2584
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2585
        self._override_globals_in_method(tt, "create_file",
 
2586
            {"open": self._fake_open_raises_after})
 
2587
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2588
        path = tt._limbo_name(trans_id)
 
2589
        self.assertPathExists(path)
 
2590
        tt.finalize()
 
2591
        self.assertPathDoesNotExist(path)
 
2592
        self.assertPathDoesNotExist(tt._limbodir)
 
2593
 
 
2594
    def test_subdir_create_file_open_raises_before_creation(self):
 
2595
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2596
        self._override_globals_in_method(tt, "create_file",
 
2597
            {"open": self._fake_open_raises_before})
 
2598
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2599
        path = tt._limbo_name(trans_id)
 
2600
        self.assertPathDoesNotExist(path)
 
2601
        tt.finalize()
 
2602
        self.assertPathDoesNotExist(tt._limbodir)
 
2603
 
 
2604
    def test_subdir_create_file_open_raises_after_creation(self):
 
2605
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2606
        self._override_globals_in_method(tt, "create_file",
 
2607
            {"open": self._fake_open_raises_after})
 
2608
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2609
        path = tt._limbo_name(trans_id)
 
2610
        self.assertPathExists(path)
 
2611
        tt.finalize()
 
2612
        self.assertPathDoesNotExist(path)
 
2613
        self.assertPathDoesNotExist(tt._limbodir)
 
2614
 
 
2615
    def test_rename_in_limbo_rename_raises_after_rename(self):
 
2616
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2617
        parent1 = tt.new_directory('parent1', tt.root)
 
2618
        child1 = tt.new_file('child1', parent1, 'contents')
 
2619
        parent2 = tt.new_directory('parent2', tt.root)
 
2620
 
 
2621
        class FakeOSModule(object):
 
2622
            def rename(self, old, new):
 
2623
                os.rename(old, new)
 
2624
                raise RuntimeError
 
2625
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2626
            {"os": FakeOSModule()})
 
2627
        self.assertRaises(
 
2628
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2629
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
 
2630
        self.assertPathExists(path)
 
2631
        tt.finalize()
 
2632
        self.assertPathDoesNotExist(path)
 
2633
        self.assertPathDoesNotExist(tt._limbodir)
 
2634
 
 
2635
    def test_rename_in_limbo_rename_raises_before_rename(self):
 
2636
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2637
        parent1 = tt.new_directory('parent1', tt.root)
 
2638
        child1 = tt.new_file('child1', parent1, 'contents')
 
2639
        parent2 = tt.new_directory('parent2', tt.root)
 
2640
 
 
2641
        class FakeOSModule(object):
 
2642
            def rename(self, old, new):
 
2643
                raise RuntimeError
 
2644
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2645
            {"os": FakeOSModule()})
 
2646
        self.assertRaises(
 
2647
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2648
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
 
2649
        self.assertPathExists(path)
 
2650
        tt.finalize()
 
2651
        self.assertPathDoesNotExist(path)
 
2652
        self.assertPathDoesNotExist(tt._limbodir)
 
2653
 
 
2654
 
 
2655
class TestTransformMissingParent(tests.TestCaseWithTransport):
 
2656
 
 
2657
    def make_tt_with_versioned_dir(self):
2247
2658
        wt = self.make_branch_and_tree('.')
 
2659
        self.build_tree(['dir/',])
 
2660
        wt.add(['dir'], ['dir-id'])
 
2661
        wt.commit('Create dir')
2248
2662
        tt = TreeTransform(wt)
2249
2663
        self.addCleanup(tt.finalize)
2250
 
        parent = tt.trans_id_file_id('parent-id')
2251
 
        tt.new_file('file', parent, 'Contents')
2252
 
        resolve_conflicts(tt)
 
2664
        return wt, tt
 
2665
 
 
2666
    def test_resolve_create_parent_for_versioned_file(self):
 
2667
        wt, tt = self.make_tt_with_versioned_dir()
 
2668
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2669
        file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
 
2670
        tt.delete_contents(dir_tid)
 
2671
        tt.unversion_file(dir_tid)
 
2672
        conflicts = resolve_conflicts(tt)
 
2673
        # one conflict for the missing directory, one for the unversioned
 
2674
        # parent
 
2675
        self.assertLength(2, conflicts)
 
2676
 
 
2677
    def test_non_versioned_file_create_conflict(self):
 
2678
        wt, tt = self.make_tt_with_versioned_dir()
 
2679
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2680
        tt.new_file('file', dir_tid, 'Contents')
 
2681
        tt.delete_contents(dir_tid)
 
2682
        tt.unversion_file(dir_tid)
 
2683
        conflicts = resolve_conflicts(tt)
 
2684
        # no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
 
2685
        self.assertLength(1, conflicts)
 
2686
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
2687
                         conflicts.pop())
2253
2688
 
2254
2689
 
2255
2690
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
2691
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2692
                  (False, False))
2258
2693
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2694
              ('', ''), ('directory', 'directory'), (False, False))
2260
2695
 
2261
2696
 
2262
2697
class TestTransformPreview(tests.TestCaseWithTransport):
2349
2784
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2350
2785
        changes = preview_tree.iter_changes(revision_tree,
2351
2786
                                            specific_files=[''])
2352
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2787
        self.assertEqual([A_ENTRY], list(changes))
2353
2788
 
2354
2789
    def test_want_unversioned(self):
2355
2790
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2356
2791
        changes = preview_tree.iter_changes(revision_tree,
2357
2792
                                            want_unversioned=True)
2358
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2793
        self.assertEqual([A_ENTRY], list(changes))
2359
2794
 
2360
2795
    def test_ignore_extra_trees_no_specific_files(self):
2361
2796
        # extra_trees is harmless without specific_files, so we'll silently
2404
2839
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2405
2840
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
2406
2841
 
 
2842
    def test_get_file_size(self):
 
2843
        work_tree = self.make_branch_and_tree('tree')
 
2844
        self.build_tree_contents([('tree/old', 'old')])
 
2845
        work_tree.add('old', 'old-id')
 
2846
        preview = TransformPreview(work_tree)
 
2847
        self.addCleanup(preview.finalize)
 
2848
        new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
 
2849
                                  'executable')
 
2850
        tree = preview.get_preview_tree()
 
2851
        self.assertEqual(len('old'), tree.get_file_size('old-id'))
 
2852
        self.assertEqual(len('contents'), tree.get_file_size('new-id'))
 
2853
 
2407
2854
    def test_get_file(self):
2408
2855
        preview = self.get_empty_preview()
2409
2856
        preview.new_file('file', preview.root, 'contents', 'file-id')
2821
3268
        merger.merge_type = Merge3Merger
2822
3269
        merger.do_merge()
2823
3270
 
 
3271
    def test_has_filename(self):
 
3272
        wt = self.make_branch_and_tree('tree')
 
3273
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3274
        tt = TransformPreview(wt)
 
3275
        removed_id = tt.trans_id_tree_path('removed')
 
3276
        tt.delete_contents(removed_id)
 
3277
        tt.new_file('new', tt.root, 'contents')
 
3278
        modified_id = tt.trans_id_tree_path('modified')
 
3279
        tt.delete_contents(modified_id)
 
3280
        tt.create_file('modified-contents', modified_id)
 
3281
        self.addCleanup(tt.finalize)
 
3282
        tree = tt.get_preview_tree()
 
3283
        self.assertTrue(tree.has_filename('unmodified'))
 
3284
        self.assertFalse(tree.has_filename('not-present'))
 
3285
        self.assertFalse(tree.has_filename('removed'))
 
3286
        self.assertTrue(tree.has_filename('new'))
 
3287
        self.assertTrue(tree.has_filename('modified'))
 
3288
 
2824
3289
    def test_is_executable(self):
2825
3290
        tree = self.make_branch_and_tree('tree')
2826
3291
        preview = TransformPreview(tree)
3132
3597
        trans_id = tt.trans_id_tree_path('file')
3133
3598
        self.assertEqual((LINES_ONE,),
3134
3599
            tt._get_parents_texts(trans_id))
 
3600
 
 
3601
 
 
3602
class TestOrphan(tests.TestCaseWithTransport):
 
3603
 
 
3604
    def test_no_orphan_for_transform_preview(self):
 
3605
        tree = self.make_branch_and_tree('tree')
 
3606
        tt = transform.TransformPreview(tree)
 
3607
        self.addCleanup(tt.finalize)
 
3608
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
3609
 
 
3610
    def _set_orphan_policy(self, wt, policy):
 
3611
        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
 
3612
                                               policy)
 
3613
 
 
3614
    def _prepare_orphan(self, wt):
 
3615
        self.build_tree(['dir/', 'dir/file', 'dir/foo'])
 
3616
        wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
 
3617
        wt.commit('add dir and file ignoring foo')
 
3618
        tt = transform.TreeTransform(wt)
 
3619
        self.addCleanup(tt.finalize)
 
3620
        # dir and bar are deleted
 
3621
        dir_tid = tt.trans_id_tree_path('dir')
 
3622
        file_tid = tt.trans_id_tree_path('dir/file')
 
3623
        orphan_tid = tt.trans_id_tree_path('dir/foo')
 
3624
        tt.delete_contents(file_tid)
 
3625
        tt.unversion_file(file_tid)
 
3626
        tt.delete_contents(dir_tid)
 
3627
        tt.unversion_file(dir_tid)
 
3628
        # There should be a conflict because dir still contain foo
 
3629
        raw_conflicts = tt.find_conflicts()
 
3630
        self.assertLength(1, raw_conflicts)
 
3631
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
 
3632
        return tt, orphan_tid
 
3633
 
 
3634
    def test_new_orphan_created(self):
 
3635
        wt = self.make_branch_and_tree('.')
 
3636
        self._set_orphan_policy(wt, 'move')
 
3637
        tt, orphan_tid = self._prepare_orphan(wt)
 
3638
        warnings = []
 
3639
        def warning(*args):
 
3640
            warnings.append(args[0] % args[1:])
 
3641
        self.overrideAttr(trace, 'warning', warning)
 
3642
        remaining_conflicts = resolve_conflicts(tt)
 
3643
        self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
 
3644
                          warnings)
 
3645
        # Yeah for resolved conflicts !
 
3646
        self.assertLength(0, remaining_conflicts)
 
3647
        # We have a new orphan
 
3648
        self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
 
3649
        self.assertEquals('bzr-orphans',
 
3650
                          tt.final_name(tt.final_parent(orphan_tid)))
 
3651
 
 
3652
    def test_never_orphan(self):
 
3653
        wt = self.make_branch_and_tree('.')
 
3654
        self._set_orphan_policy(wt, 'conflict')
 
3655
        tt, orphan_tid = self._prepare_orphan(wt)
 
3656
        remaining_conflicts = resolve_conflicts(tt)
 
3657
        self.assertLength(1, remaining_conflicts)
 
3658
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3659
                         remaining_conflicts.pop())
 
3660
 
 
3661
    def test_orphan_error(self):
 
3662
        def bogus_orphan(tt, orphan_id, parent_id):
 
3663
            raise transform.OrphaningError(tt.final_name(orphan_id),
 
3664
                                           tt.final_name(parent_id))
 
3665
        transform.orphaning_registry.register('bogus', bogus_orphan,
 
3666
                                              'Raise an error when orphaning')
 
3667
        wt = self.make_branch_and_tree('.')
 
3668
        self._set_orphan_policy(wt, 'bogus')
 
3669
        tt, orphan_tid = self._prepare_orphan(wt)
 
3670
        remaining_conflicts = resolve_conflicts(tt)
 
3671
        self.assertLength(1, remaining_conflicts)
 
3672
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3673
                         remaining_conflicts.pop())
 
3674
 
 
3675
    def test_unknown_orphan_policy(self):
 
3676
        wt = self.make_branch_and_tree('.')
 
3677
        # Set a fictional policy nobody ever implemented
 
3678
        self._set_orphan_policy(wt, 'donttouchmypreciouuus')
 
3679
        tt, orphan_tid = self._prepare_orphan(wt)
 
3680
        warnings = []
 
3681
        def warning(*args):
 
3682
            warnings.append(args[0] % args[1:])
 
3683
        self.overrideAttr(trace, 'warning', warning)
 
3684
        remaining_conflicts = resolve_conflicts(tt)
 
3685
        # We fallback to the default policy which create a conflict
 
3686
        self.assertLength(1, remaining_conflicts)
 
3687
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3688
                         remaining_conflicts.pop())
 
3689
        self.assertLength(1, warnings)
 
3690
        self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')