/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: Vincent Ladeuil
  • Date: 2011-08-16 13:12:40 UTC
  • mfrom: (6071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6076.
  • Revision ID: v.ladeuil+lp@free.fr-20110816131240-gcyn9cik86dxwgz3
Merge into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
62
62
from bzrlib.merge import Merge3Merger, Merger
63
63
from bzrlib.tests import (
64
64
    features,
 
65
    TestCaseInTempDir,
 
66
    TestSkipped,
 
67
    )
 
68
from bzrlib.tests.features import (
65
69
    HardlinkFeature,
66
70
    SymlinkFeature,
67
 
    TestCaseInTempDir,
68
 
    TestSkipped,
69
 
)
 
71
    )
70
72
from bzrlib.transform import (
71
73
    build_tree,
72
74
    create_from_tree,
93
95
        self.addCleanup(transform.finalize)
94
96
        return transform, transform.root
95
97
 
 
98
    def get_transform_for_sha1_test(self):
 
99
        trans, root = self.get_transform()
 
100
        self.wt.lock_tree_write()
 
101
        self.addCleanup(self.wt.unlock)
 
102
        contents = ['just some content\n']
 
103
        sha1 = osutils.sha_strings(contents)
 
104
        # Roll back the clock
 
105
        trans._creation_mtime = time.time() - 20.0
 
106
        return trans, root, contents, sha1
 
107
 
96
108
    def test_existing_limbo(self):
97
109
        transform, root = self.get_transform()
98
110
        limbo_name = transform._limbodir
161
173
        transform.finalize()
162
174
        transform.finalize()
163
175
 
 
176
    def test_apply_informs_tree_of_observed_sha1(self):
 
177
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
178
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
179
                                  sha1=sha1)
 
180
        calls = []
 
181
        orig = self.wt._observed_sha1
 
182
        def _observed_sha1(*args):
 
183
            calls.append(args)
 
184
            orig(*args)
 
185
        self.wt._observed_sha1 = _observed_sha1
 
186
        trans.apply()
 
187
        self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
 
188
                         calls)
 
189
 
 
190
    def test_create_file_caches_sha1(self):
 
191
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
192
        trans_id = trans.create_path('file1', root)
 
193
        trans.create_file(contents, trans_id, sha1=sha1)
 
194
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
195
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
196
        self.assertEqual(o_sha1, sha1)
 
197
        self.assertEqualStat(o_st_val, st_val)
 
198
 
 
199
    def test__apply_insertions_updates_sha1(self):
 
200
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
201
        trans_id = trans.create_path('file1', root)
 
202
        trans.create_file(contents, trans_id, sha1=sha1)
 
203
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
204
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
205
        self.assertEqual(o_sha1, sha1)
 
206
        self.assertEqualStat(o_st_val, st_val)
 
207
        creation_mtime = trans._creation_mtime + 10.0
 
208
        # We fake a time difference from when the file was created until now it
 
209
        # is being renamed by using os.utime. Note that the change we actually
 
210
        # want to see is the real ctime change from 'os.rename()', but as long
 
211
        # as we observe a new stat value, we should be fine.
 
212
        os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
 
213
        trans.apply()
 
214
        new_st_val = osutils.lstat(self.wt.abspath('file1'))
 
215
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
216
        self.assertEqual(o_sha1, sha1)
 
217
        self.assertEqualStat(o_st_val, new_st_val)
 
218
        self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
 
219
 
 
220
    def test_new_file_caches_sha1(self):
 
221
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
222
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
223
                                  sha1=sha1)
 
224
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
225
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
226
        self.assertEqual(o_sha1, sha1)
 
227
        self.assertEqualStat(o_st_val, st_val)
 
228
 
 
229
    def test_cancel_creation_removes_observed_sha1(self):
 
230
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
231
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
232
                                  sha1=sha1)
 
233
        self.assertTrue(trans_id in trans._observed_sha1s)
 
234
        trans.cancel_creation(trans_id)
 
235
        self.assertFalse(trans_id in trans._observed_sha1s)
 
236
 
164
237
    def test_create_files_same_timestamp(self):
165
238
        transform, root = self.get_transform()
166
239
        self.wt.lock_tree_write()
214
287
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
215
288
        self.assertRaises(ValueError, transform.fixup_new_roots)
216
289
 
 
290
    def test_retain_existing_root(self):
 
291
        tt, root = self.get_transform()
 
292
        with tt:
 
293
            tt.new_directory('', ROOT_PARENT, 'new-root-id')
 
294
            tt.fixup_new_roots()
 
295
            self.assertNotEqual('new-root-id', tt.final_file_id(tt.root))
 
296
 
 
297
    def test_retain_existing_root_added_file(self):
 
298
        tt, root = self.get_transform()
 
299
        new_trans_id = tt.new_directory('', ROOT_PARENT, 'new-root-id')
 
300
        child = tt.new_directory('child', new_trans_id, 'child-id')
 
301
        tt.fixup_new_roots()
 
302
        self.assertEqual(tt.root, tt.final_parent(child))
 
303
 
 
304
    def test_add_unversioned_root(self):
 
305
        transform, root = self.get_transform()
 
306
        new_trans_id = transform.new_directory('', ROOT_PARENT, None)
 
307
        transform.delete_contents(transform.root)
 
308
        transform.fixup_new_roots()
 
309
        self.assertNotIn(transform.root, transform._new_id)
 
310
 
 
311
    def test_remove_root_fixup(self):
 
312
        transform, root = self.get_transform()
 
313
        old_root_id = self.wt.get_root_id()
 
314
        self.assertNotEqual('new-root-id', old_root_id)
 
315
        transform.delete_contents(root)
 
316
        transform.unversion_file(root)
 
317
        transform.fixup_new_roots()
 
318
        transform.apply()
 
319
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
320
 
 
321
        transform, root = self.get_transform()
 
322
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
 
323
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
 
324
        self.assertRaises(ValueError, transform.fixup_new_roots)
 
325
 
 
326
    def test_fixup_new_roots_permits_empty_tree(self):
 
327
        transform, root = self.get_transform()
 
328
        transform.delete_contents(root)
 
329
        transform.unversion_file(root)
 
330
        transform.fixup_new_roots()
 
331
        self.assertIs(None, transform.final_kind(root))
 
332
        self.assertIs(None, transform.final_file_id(root))
 
333
 
 
334
    def test_apply_retains_root_directory(self):
 
335
        # Do not attempt to delete the physical root directory, because that
 
336
        # is impossible.
 
337
        transform, root = self.get_transform()
 
338
        with transform:
 
339
            transform.delete_contents(root)
 
340
            e = self.assertRaises(AssertionError, self.assertRaises,
 
341
                                  errors.TransformRenameFailed,
 
342
                                  transform.apply)
 
343
        self.assertContainsRe('TransformRenameFailed not raised', str(e))
 
344
 
 
345
    def test_apply_retains_file_id(self):
 
346
        transform, root = self.get_transform()
 
347
        old_root_id = transform.tree_file_id(root)
 
348
        transform.unversion_file(root)
 
349
        transform.apply()
 
350
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
351
 
217
352
    def test_hardlink(self):
218
353
        self.requireFeature(HardlinkFeature)
219
354
        transform, root = self.get_transform()
224
359
        trans_id = target_transform.create_path('file1', target_transform.root)
225
360
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
226
361
        target_transform.apply()
227
 
        self.failUnlessExists('target/file1')
 
362
        self.assertPathExists('target/file1')
228
363
        source_stat = os.stat(self.wt.abspath('file1'))
229
364
        target_stat = os.stat('target/file1')
230
365
        self.assertEqual(source_stat, target_stat)
396
531
        transform.new_file('FiLe', transform.root, 'content')
397
532
        resolve_conflicts(transform)
398
533
        transform.apply()
399
 
        self.failUnlessExists('tree/file')
400
 
        self.failUnlessExists('tree/FiLe.moved')
 
534
        self.assertPathExists('tree/file')
 
535
        self.assertPathExists('tree/FiLe.moved')
401
536
 
402
537
    def test_resolve_checkout_case_conflict(self):
403
538
        tree = self.make_branch_and_tree('tree')
412
547
        resolve_conflicts(transform,
413
548
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
414
549
        transform.apply()
415
 
        self.failUnlessExists('tree/file')
416
 
        self.failUnlessExists('tree/FiLe.moved')
 
550
        self.assertPathExists('tree/file')
 
551
        self.assertPathExists('tree/FiLe.moved')
417
552
 
418
553
    def test_apply_case_conflict(self):
419
554
        """Ensure that a transform with case conflicts can always be applied"""
427
562
        transform.new_file('dirFiLe', dir, 'content')
428
563
        resolve_conflicts(transform)
429
564
        transform.apply()
430
 
        self.failUnlessExists('tree/file')
 
565
        self.assertPathExists('tree/file')
431
566
        if not os.path.exists('tree/FiLe.moved'):
432
 
            self.failUnlessExists('tree/FiLe')
433
 
        self.failUnlessExists('tree/dir/dirfile')
 
567
            self.assertPathExists('tree/FiLe')
 
568
        self.assertPathExists('tree/dir/dirfile')
434
569
        if not os.path.exists('tree/dir/dirFiLe.moved'):
435
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
570
            self.assertPathExists('tree/dir/dirFiLe')
436
571
 
437
572
    def test_case_insensitive_limbo(self):
438
573
        tree = self.make_branch_and_tree('tree')
646
781
                            'wizard2', 'behind_curtain')
647
782
 
648
783
    def test_symlinks_unicode(self):
649
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
784
        self.requireFeature(features.UnicodeFilenameFeature)
650
785
        self._test_symlinks(u'\N{Euro Sign}wizard',
651
786
                            u'wizard-targ\N{Euro Sign}t',
652
787
                            u'\N{Euro Sign}wizard2',
740
875
        raw_conflicts = resolve_conflicts(tt)
741
876
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
742
877
        tt.finalize()
743
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
878
        conflicts_s = [unicode(c) for c in cooked_conflicts]
744
879
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
745
880
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
746
881
                                         'Moved existing file to '
1184
1319
        parent2 = transform.new_directory('parent2', root)
1185
1320
        transform.adjust_path('child1', parent2, child1)
1186
1321
        transform.apply()
1187
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1188
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1322
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1323
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1189
1324
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1190
1325
        # no rename for child1 (counting only renames during apply)
1191
 
        self.failUnlessEqual(2, transform.rename_count)
 
1326
        self.assertEqual(2, transform.rename_count)
1192
1327
 
1193
1328
    def test_cancel_parent(self):
1194
1329
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1217
1352
        parent2 = transform.new_directory('parent2', root)
1218
1353
        transform.adjust_path('child1', parent2, child1)
1219
1354
        transform.apply()
1220
 
        self.failIfExists(self.wt.abspath('parent1'))
1221
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1355
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1356
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1222
1357
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1223
 
        self.failUnlessEqual(2, transform.rename_count)
 
1358
        self.assertEqual(2, transform.rename_count)
1224
1359
 
1225
1360
    def test_adjust_and_cancel(self):
1226
1361
        """Make sure adjust_path keeps track of limbo children properly"""
1259
1394
        child = transform.new_directory('child', parent)
1260
1395
        transform.adjust_path('parent', root, parent)
1261
1396
        transform.apply()
1262
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1397
        self.assertPathExists(self.wt.abspath('parent/child'))
1263
1398
        self.assertEqual(1, transform.rename_count)
1264
1399
 
1265
1400
    def test_reuse_name(self):
1396
1531
        tt.create_file(["aa\n"], bar_trans_id)
1397
1532
        tt.version_file("bar-1", bar_trans_id)
1398
1533
        tt.apply()
1399
 
        self.failUnlessExists("foo/bar")
 
1534
        self.assertPathExists("foo/bar")
1400
1535
        wt.lock_read()
1401
1536
        try:
1402
1537
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1419
1554
        tt.delete_contents(foo_trans_id)
1420
1555
        tt.create_symlink("bar", foo_trans_id)
1421
1556
        tt.apply()
1422
 
        self.failUnlessExists("foo")
 
1557
        self.assertPathExists("foo")
1423
1558
        wt.lock_read()
1424
1559
        self.addCleanup(wt.unlock)
1425
1560
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1438
1573
        tt.delete_versioned(bar_trans_id)
1439
1574
        tt.create_file(["aa\n"], foo_trans_id)
1440
1575
        tt.apply()
1441
 
        self.failUnlessExists("foo")
 
1576
        self.assertPathExists("foo")
1442
1577
        wt.lock_read()
1443
1578
        self.addCleanup(wt.unlock)
1444
1579
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1459
1594
        self.build_tree(['baz'])
1460
1595
        tt.create_hardlink("baz", foo_trans_id)
1461
1596
        tt.apply()
1462
 
        self.failUnlessExists("foo")
1463
 
        self.failUnlessExists("baz")
 
1597
        self.assertPathExists("foo")
 
1598
        self.assertPathExists("baz")
1464
1599
        wt.lock_read()
1465
1600
        self.addCleanup(wt.unlock)
1466
1601
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1528
1663
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1529
1664
 
1530
1665
 
 
1666
class TestInventoryAltered(tests.TestCaseWithTransport):
 
1667
 
 
1668
    def test_inventory_altered_unchanged(self):
 
1669
        tree = self.make_branch_and_tree('tree')
 
1670
        self.build_tree(['tree/foo'])
 
1671
        tree.add('foo', 'foo-id')
 
1672
        with TransformPreview(tree) as tt:
 
1673
            self.assertEqual([], tt._inventory_altered())
 
1674
 
 
1675
    def test_inventory_altered_changed_parent_id(self):
 
1676
        tree = self.make_branch_and_tree('tree')
 
1677
        self.build_tree(['tree/foo'])
 
1678
        tree.add('foo', 'foo-id')
 
1679
        with TransformPreview(tree) as tt:
 
1680
            tt.unversion_file(tt.root)
 
1681
            tt.version_file('new-id', tt.root)
 
1682
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1683
            foo_tuple = ('foo', foo_trans_id)
 
1684
            root_tuple = ('', tt.root)
 
1685
            self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
 
1686
 
 
1687
    def test_inventory_altered_noop_changed_parent_id(self):
 
1688
        tree = self.make_branch_and_tree('tree')
 
1689
        self.build_tree(['tree/foo'])
 
1690
        tree.add('foo', 'foo-id')
 
1691
        with TransformPreview(tree) as tt:
 
1692
            tt.unversion_file(tt.root)
 
1693
            tt.version_file(tree.get_root_id(), tt.root)
 
1694
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1695
            self.assertEqual([], tt._inventory_altered())
 
1696
 
 
1697
 
1531
1698
class TestTransformMerge(TestCaseInTempDir):
1532
1699
 
1533
1700
    def test_text_merge(self):
1743
1910
        tree.add_reference(subtree)
1744
1911
        tree.commit('a revision')
1745
1912
        tree.branch.create_checkout('target')
1746
 
        self.failUnlessExists('target')
1747
 
        self.failUnlessExists('target/subtree')
 
1913
        self.assertPathExists('target')
 
1914
        self.assertPathExists('target/subtree')
1748
1915
 
1749
1916
    def test_file_conflict_handling(self):
1750
1917
        """Ensure that when building trees, conflict handling is done"""
1797
1964
        source.commit('added file')
1798
1965
        build_tree(source.basis_tree(), target)
1799
1966
        self.assertEqual([], target.conflicts())
1800
 
        self.failUnlessExists('target/dir1/file')
 
1967
        self.assertPathExists('target/dir1/file')
1801
1968
 
1802
1969
        # Ensure contents are merged
1803
1970
        target = self.make_branch_and_tree('target2')
1804
1971
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1805
1972
        build_tree(source.basis_tree(), target)
1806
1973
        self.assertEqual([], target.conflicts())
1807
 
        self.failUnlessExists('target2/dir1/file2')
1808
 
        self.failUnlessExists('target2/dir1/file')
 
1974
        self.assertPathExists('target2/dir1/file2')
 
1975
        self.assertPathExists('target2/dir1/file')
1809
1976
 
1810
1977
        # Ensure new contents are suppressed for existing branches
1811
1978
        target = self.make_branch_and_tree('target3')
1812
1979
        self.make_branch('target3/dir1')
1813
1980
        self.build_tree(['target3/dir1/file2'])
1814
1981
        build_tree(source.basis_tree(), target)
1815
 
        self.failIfExists('target3/dir1/file')
1816
 
        self.failUnlessExists('target3/dir1/file2')
1817
 
        self.failUnlessExists('target3/dir1.diverted/file')
 
1982
        self.assertPathDoesNotExist('target3/dir1/file')
 
1983
        self.assertPathExists('target3/dir1/file2')
 
1984
        self.assertPathExists('target3/dir1.diverted/file')
1818
1985
        self.assertEqual([DuplicateEntry('Diverted to',
1819
1986
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1820
1987
            target.conflicts())
1823
1990
        self.build_tree(['target4/dir1/'])
1824
1991
        self.make_branch('target4/dir1/file')
1825
1992
        build_tree(source.basis_tree(), target)
1826
 
        self.failUnlessExists('target4/dir1/file')
 
1993
        self.assertPathExists('target4/dir1/file')
1827
1994
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1828
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1995
        self.assertPathExists('target4/dir1/file.diverted')
1829
1996
        self.assertEqual([DuplicateEntry('Diverted to',
1830
1997
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1831
1998
            target.conflicts())
1899
2066
        self.addCleanup(target.unlock)
1900
2067
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1901
2068
 
 
2069
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
2070
        source = self.create_ab_tree()
 
2071
        sha1 = osutils.sha_string('A')
 
2072
        target = self.make_branch_and_tree('target')
 
2073
        target.lock_write()
 
2074
        self.addCleanup(target.unlock)
 
2075
        state = target.current_dirstate()
 
2076
        state._cutoff_time = time.time() + 60
 
2077
        build_tree(source.basis_tree(), target, source)
 
2078
        entry = state._get_entry(0, path_utf8='file1')
 
2079
        self.assertEqual(sha1, entry[1][0][1])
 
2080
 
1902
2081
    def test_build_tree_accelerator_tree_missing_file(self):
1903
2082
        source = self.create_ab_tree()
1904
2083
        os.unlink('source/file1')
2047
2226
        self.assertEqualStat(source_stat, target_stat)
2048
2227
 
2049
2228
    def test_case_insensitive_build_tree_inventory(self):
2050
 
        if (tests.CaseInsensitiveFilesystemFeature.available()
2051
 
            or tests.CaseInsCasePresFilenameFeature.available()):
 
2229
        if (features.CaseInsensitiveFilesystemFeature.available()
 
2230
            or features.CaseInsCasePresFilenameFeature.available()):
2052
2231
            raise tests.UnavailableFeature('Fully case sensitive filesystem')
2053
2232
        source = self.make_branch_and_tree('source')
2054
2233
        self.build_tree(['source/file', 'source/FILE'])
2062
2241
        self.assertEqual('file.moved', target.id2path('lower-id'))
2063
2242
        self.assertEqual('FILE', target.id2path('upper-id'))
2064
2243
 
 
2244
    def test_build_tree_observes_sha(self):
 
2245
        source = self.make_branch_and_tree('source')
 
2246
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2247
        source.add(['file1', 'dir', 'dir/file2'],
 
2248
                   ['file1-id', 'dir-id', 'file2-id'])
 
2249
        source.commit('new files')
 
2250
        target = self.make_branch_and_tree('target')
 
2251
        target.lock_write()
 
2252
        self.addCleanup(target.unlock)
 
2253
        # We make use of the fact that DirState caches its cutoff time. So we
 
2254
        # set the 'safe' time to one minute in the future.
 
2255
        state = target.current_dirstate()
 
2256
        state._cutoff_time = time.time() + 60
 
2257
        build_tree(source.basis_tree(), target)
 
2258
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2259
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2260
        # entry[1] is the state information, entry[1][0] is the state of the
 
2261
        # working tree, entry[1][0][1] is the sha value for the current working
 
2262
        # tree
 
2263
        entry1 = state._get_entry(0, path_utf8='file1')
 
2264
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2265
        # The 'size' field must also be set.
 
2266
        self.assertEqual(25, entry1[1][0][2])
 
2267
        entry1_state = entry1[1][0]
 
2268
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2269
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2270
        self.assertEqual(29, entry2[1][0][2])
 
2271
        entry2_state = entry2[1][0]
 
2272
        # Now, make sure that we don't have to re-read the content. The
 
2273
        # packed_stat should match exactly.
 
2274
        self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
 
2275
        self.assertEqual(entry2_sha,
 
2276
                         target.get_file_sha1('file2-id', 'dir/file2'))
 
2277
        self.assertEqual(entry1_state, entry1[1][0])
 
2278
        self.assertEqual(entry2_state, entry2[1][0])
 
2279
 
2065
2280
 
2066
2281
class TestCommitTransform(tests.TestCaseWithTransport):
2067
2282
 
2232
2447
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2233
2448
        mover = _FileMover()
2234
2449
        mover.rename('a', 'q')
2235
 
        self.failUnlessExists('q')
2236
 
        self.failIfExists('a')
2237
 
        self.failUnlessExists('q/b')
2238
 
        self.failUnlessExists('c')
2239
 
        self.failUnlessExists('c/d')
 
2450
        self.assertPathExists('q')
 
2451
        self.assertPathDoesNotExist('a')
 
2452
        self.assertPathExists('q/b')
 
2453
        self.assertPathExists('c')
 
2454
        self.assertPathExists('c/d')
2240
2455
 
2241
2456
    def test_pre_delete_rollback(self):
2242
2457
        self.build_tree(['a/'])
2243
2458
        mover = _FileMover()
2244
2459
        mover.pre_delete('a', 'q')
2245
 
        self.failUnlessExists('q')
2246
 
        self.failIfExists('a')
 
2460
        self.assertPathExists('q')
 
2461
        self.assertPathDoesNotExist('a')
2247
2462
        mover.rollback()
2248
 
        self.failIfExists('q')
2249
 
        self.failUnlessExists('a')
 
2463
        self.assertPathDoesNotExist('q')
 
2464
        self.assertPathExists('a')
2250
2465
 
2251
2466
    def test_apply_deletions(self):
2252
2467
        self.build_tree(['a/', 'b/'])
2253
2468
        mover = _FileMover()
2254
2469
        mover.pre_delete('a', 'q')
2255
2470
        mover.pre_delete('b', 'r')
2256
 
        self.failUnlessExists('q')
2257
 
        self.failUnlessExists('r')
2258
 
        self.failIfExists('a')
2259
 
        self.failIfExists('b')
 
2471
        self.assertPathExists('q')
 
2472
        self.assertPathExists('r')
 
2473
        self.assertPathDoesNotExist('a')
 
2474
        self.assertPathDoesNotExist('b')
2260
2475
        mover.apply_deletions()
2261
 
        self.failIfExists('q')
2262
 
        self.failIfExists('r')
2263
 
        self.failIfExists('a')
2264
 
        self.failIfExists('b')
 
2476
        self.assertPathDoesNotExist('q')
 
2477
        self.assertPathDoesNotExist('r')
 
2478
        self.assertPathDoesNotExist('a')
 
2479
        self.assertPathDoesNotExist('b')
2265
2480
 
2266
2481
    def test_file_mover_rollback(self):
2267
2482
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2272
2487
            mover.rename('a', 'c')
2273
2488
        except errors.FileExists, e:
2274
2489
            mover.rollback()
2275
 
        self.failUnlessExists('a')
2276
 
        self.failUnlessExists('c/d')
 
2490
        self.assertPathExists('a')
 
2491
        self.assertPathExists('c/d')
2277
2492
 
2278
2493
 
2279
2494
class Bogus(Exception):
2309
2524
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2310
2525
        self.assertRaises(Bogus, tt.apply,
2311
2526
                          _mover=self.ExceptionFileMover(bad_source='a'))
2312
 
        self.failUnlessExists('a')
2313
 
        self.failUnlessExists('a/b')
 
2527
        self.assertPathExists('a')
 
2528
        self.assertPathExists('a/b')
2314
2529
        tt.apply()
2315
 
        self.failUnlessExists('c')
2316
 
        self.failUnlessExists('c/d')
 
2530
        self.assertPathExists('c')
 
2531
        self.assertPathExists('c/d')
2317
2532
 
2318
2533
    def test_rollback_rename_into_place(self):
2319
2534
        tree = self.make_branch_and_tree('.')
2325
2540
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2326
2541
        self.assertRaises(Bogus, tt.apply,
2327
2542
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2328
 
        self.failUnlessExists('a')
2329
 
        self.failUnlessExists('a/b')
 
2543
        self.assertPathExists('a')
 
2544
        self.assertPathExists('a/b')
2330
2545
        tt.apply()
2331
 
        self.failUnlessExists('c')
2332
 
        self.failUnlessExists('c/d')
 
2546
        self.assertPathExists('c')
 
2547
        self.assertPathExists('c/d')
2333
2548
 
2334
2549
    def test_rollback_deletion(self):
2335
2550
        tree = self.make_branch_and_tree('.')
2341
2556
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2342
2557
        self.assertRaises(Bogus, tt.apply,
2343
2558
                          _mover=self.ExceptionFileMover(bad_target='d'))
2344
 
        self.failUnlessExists('a')
2345
 
        self.failUnlessExists('a/b')
 
2559
        self.assertPathExists('a')
 
2560
        self.assertPathExists('a/b')
 
2561
 
 
2562
 
 
2563
class TestFinalizeRobustness(tests.TestCaseWithTransport):
 
2564
    """Ensure treetransform creation errors can be safely cleaned up after"""
 
2565
 
 
2566
    def _override_globals_in_method(self, instance, method_name, globals):
 
2567
        """Replace method on instance with one with updated globals"""
 
2568
        import types
 
2569
        func = getattr(instance, method_name).im_func
 
2570
        new_globals = dict(func.func_globals)
 
2571
        new_globals.update(globals)
 
2572
        new_func = types.FunctionType(func.func_code, new_globals,
 
2573
            func.func_name, func.func_defaults)
 
2574
        setattr(instance, method_name,
 
2575
            types.MethodType(new_func, instance, instance.__class__))
 
2576
        self.addCleanup(delattr, instance, method_name)
 
2577
 
 
2578
    @staticmethod
 
2579
    def _fake_open_raises_before(name, mode):
 
2580
        """Like open() but raises before doing anything"""
 
2581
        raise RuntimeError
 
2582
 
 
2583
    @staticmethod
 
2584
    def _fake_open_raises_after(name, mode):
 
2585
        """Like open() but raises after creating file without returning"""
 
2586
        open(name, mode).close()
 
2587
        raise RuntimeError
 
2588
 
 
2589
    def create_transform_and_root_trans_id(self):
 
2590
        """Setup a transform creating a file in limbo"""
 
2591
        tree = self.make_branch_and_tree('.')
 
2592
        tt = TreeTransform(tree)
 
2593
        return tt, tt.create_path("a", tt.root)
 
2594
 
 
2595
    def create_transform_and_subdir_trans_id(self):
 
2596
        """Setup a transform creating a directory containing a file in limbo"""
 
2597
        tree = self.make_branch_and_tree('.')
 
2598
        tt = TreeTransform(tree)
 
2599
        d_trans_id = tt.create_path("d", tt.root)
 
2600
        tt.create_directory(d_trans_id)
 
2601
        f_trans_id = tt.create_path("a", d_trans_id)
 
2602
        tt.adjust_path("a", d_trans_id, f_trans_id)
 
2603
        return tt, f_trans_id
 
2604
 
 
2605
    def test_root_create_file_open_raises_before_creation(self):
 
2606
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2607
        self._override_globals_in_method(tt, "create_file",
 
2608
            {"open": self._fake_open_raises_before})
 
2609
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2610
        path = tt._limbo_name(trans_id)
 
2611
        self.assertPathDoesNotExist(path)
 
2612
        tt.finalize()
 
2613
        self.assertPathDoesNotExist(tt._limbodir)
 
2614
 
 
2615
    def test_root_create_file_open_raises_after_creation(self):
 
2616
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2617
        self._override_globals_in_method(tt, "create_file",
 
2618
            {"open": self._fake_open_raises_after})
 
2619
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2620
        path = tt._limbo_name(trans_id)
 
2621
        self.assertPathExists(path)
 
2622
        tt.finalize()
 
2623
        self.assertPathDoesNotExist(path)
 
2624
        self.assertPathDoesNotExist(tt._limbodir)
 
2625
 
 
2626
    def test_subdir_create_file_open_raises_before_creation(self):
 
2627
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2628
        self._override_globals_in_method(tt, "create_file",
 
2629
            {"open": self._fake_open_raises_before})
 
2630
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2631
        path = tt._limbo_name(trans_id)
 
2632
        self.assertPathDoesNotExist(path)
 
2633
        tt.finalize()
 
2634
        self.assertPathDoesNotExist(tt._limbodir)
 
2635
 
 
2636
    def test_subdir_create_file_open_raises_after_creation(self):
 
2637
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2638
        self._override_globals_in_method(tt, "create_file",
 
2639
            {"open": self._fake_open_raises_after})
 
2640
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2641
        path = tt._limbo_name(trans_id)
 
2642
        self.assertPathExists(path)
 
2643
        tt.finalize()
 
2644
        self.assertPathDoesNotExist(path)
 
2645
        self.assertPathDoesNotExist(tt._limbodir)
 
2646
 
 
2647
    def test_rename_in_limbo_rename_raises_after_rename(self):
 
2648
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2649
        parent1 = tt.new_directory('parent1', tt.root)
 
2650
        child1 = tt.new_file('child1', parent1, 'contents')
 
2651
        parent2 = tt.new_directory('parent2', tt.root)
 
2652
 
 
2653
        class FakeOSModule(object):
 
2654
            def rename(self, old, new):
 
2655
                os.rename(old, new)
 
2656
                raise RuntimeError
 
2657
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2658
            {"os": FakeOSModule()})
 
2659
        self.assertRaises(
 
2660
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2661
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
 
2662
        self.assertPathExists(path)
 
2663
        tt.finalize()
 
2664
        self.assertPathDoesNotExist(path)
 
2665
        self.assertPathDoesNotExist(tt._limbodir)
 
2666
 
 
2667
    def test_rename_in_limbo_rename_raises_before_rename(self):
 
2668
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2669
        parent1 = tt.new_directory('parent1', tt.root)
 
2670
        child1 = tt.new_file('child1', parent1, 'contents')
 
2671
        parent2 = tt.new_directory('parent2', tt.root)
 
2672
 
 
2673
        class FakeOSModule(object):
 
2674
            def rename(self, old, new):
 
2675
                raise RuntimeError
 
2676
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2677
            {"os": FakeOSModule()})
 
2678
        self.assertRaises(
 
2679
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2680
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
 
2681
        self.assertPathExists(path)
 
2682
        tt.finalize()
 
2683
        self.assertPathDoesNotExist(path)
 
2684
        self.assertPathDoesNotExist(tt._limbodir)
2346
2685
 
2347
2686
 
2348
2687
class TestTransformMissingParent(tests.TestCaseWithTransport):
2532
2871
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2533
2872
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
2534
2873
 
 
2874
    def test_get_file_size(self):
 
2875
        work_tree = self.make_branch_and_tree('tree')
 
2876
        self.build_tree_contents([('tree/old', 'old')])
 
2877
        work_tree.add('old', 'old-id')
 
2878
        preview = TransformPreview(work_tree)
 
2879
        self.addCleanup(preview.finalize)
 
2880
        new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
 
2881
                                  'executable')
 
2882
        tree = preview.get_preview_tree()
 
2883
        self.assertEqual(len('old'), tree.get_file_size('old-id'))
 
2884
        self.assertEqual(len('contents'), tree.get_file_size('new-id'))
 
2885
 
2535
2886
    def test_get_file(self):
2536
2887
        preview = self.get_empty_preview()
2537
2888
        preview.new_file('file', preview.root, 'contents', 'file-id')
2949
3300
        merger.merge_type = Merge3Merger
2950
3301
        merger.do_merge()
2951
3302
 
 
3303
    def test_has_filename(self):
 
3304
        wt = self.make_branch_and_tree('tree')
 
3305
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3306
        tt = TransformPreview(wt)
 
3307
        removed_id = tt.trans_id_tree_path('removed')
 
3308
        tt.delete_contents(removed_id)
 
3309
        tt.new_file('new', tt.root, 'contents')
 
3310
        modified_id = tt.trans_id_tree_path('modified')
 
3311
        tt.delete_contents(modified_id)
 
3312
        tt.create_file('modified-contents', modified_id)
 
3313
        self.addCleanup(tt.finalize)
 
3314
        tree = tt.get_preview_tree()
 
3315
        self.assertTrue(tree.has_filename('unmodified'))
 
3316
        self.assertFalse(tree.has_filename('not-present'))
 
3317
        self.assertFalse(tree.has_filename('removed'))
 
3318
        self.assertTrue(tree.has_filename('new'))
 
3319
        self.assertTrue(tree.has_filename('modified'))
 
3320
 
2952
3321
    def test_is_executable(self):
2953
3322
        tree = self.make_branch_and_tree('tree')
2954
3323
        preview = TransformPreview(tree)
2977
3346
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
2978
3347
 
2979
3348
    def test_ascii_limbo_paths(self):
2980
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
3349
        self.requireFeature(features.UnicodeFilenameFeature)
2981
3350
        branch = self.make_branch('any')
2982
3351
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
2983
3352
        tt = TransformPreview(tree)
3000
3369
 
3001
3370
class TestSerializeTransform(tests.TestCaseWithTransport):
3002
3371
 
3003
 
    _test_needs_features = [tests.UnicodeFilenameFeature]
 
3372
    _test_needs_features = [features.UnicodeFilenameFeature]
3004
3373
 
3005
3374
    def get_preview(self, tree=None):
3006
3375
        if tree is None:
3081
3450
        return self.make_records(attribs, contents)
3082
3451
 
3083
3452
    def test_serialize_symlink_creation(self):
3084
 
        self.requireFeature(tests.SymlinkFeature)
 
3453
        self.requireFeature(features.SymlinkFeature)
3085
3454
        tt = self.get_preview()
3086
3455
        tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3087
3456
        self.assertSerializesTo(self.symlink_creation_records(), tt)
3088
3457
 
3089
3458
    def test_deserialize_symlink_creation(self):
3090
 
        self.requireFeature(tests.SymlinkFeature)
 
3459
        self.requireFeature(features.SymlinkFeature)
3091
3460
        tt = self.get_preview()
3092
3461
        tt.deserialize(iter(self.symlink_creation_records()))
3093
3462
        abspath = tt._limbo_name('new-1')