← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
93
93
        self.addCleanup(transform.finalize)
94
94
        return transform, transform.root
95
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
 
96
106
    def test_existing_limbo(self):
97
107
        transform, root = self.get_transform()
98
108
        limbo_name = transform._limbodir
161
171
        transform.finalize()
162
172
        transform.finalize()
163
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
 
164
235
    def test_create_files_same_timestamp(self):
165
236
        transform, root = self.get_transform()
166
237
        self.wt.lock_tree_write()
214
285
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
215
286
        self.assertRaises(ValueError, transform.fixup_new_roots)
216
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
 
217
320
    def test_hardlink(self):
218
321
        self.requireFeature(HardlinkFeature)
219
322
        transform, root = self.get_transform()
740
843
        raw_conflicts = resolve_conflicts(tt)
741
844
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
742
845
        tt.finalize()
743
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
846
        conflicts_s = [unicode(c) for c in cooked_conflicts]
744
847
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
745
848
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
746
849
                                         'Moved existing file to '
1528
1631
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1529
1632
 
1530
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
 
1531
1666
class TestTransformMerge(TestCaseInTempDir):
1532
1667
 
1533
1668
    def test_text_merge(self):
1899
2034
        self.addCleanup(target.unlock)
1900
2035
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1901
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
 
1902
2049
    def test_build_tree_accelerator_tree_missing_file(self):
1903
2050
        source = self.create_ab_tree()
1904
2051
        os.unlink('source/file1')
2062
2209
        self.assertEqual('file.moved', target.id2path('lower-id'))
2063
2210
        self.assertEqual('FILE', target.id2path('upper-id'))
2064
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
 
2065
2248
 
2066
2249
class TestCommitTransform(tests.TestCaseWithTransport):
2067
2250
 
2345
2528
        self.assertPathExists('a/b')
2346
2529
 
2347
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
 
2348
2655
class TestTransformMissingParent(tests.TestCaseWithTransport):
2349
2656
 
2350
2657
    def make_tt_with_versioned_dir(self):
2532
2839
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2533
2840
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
2534
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
 
2535
2854
    def test_get_file(self):
2536
2855
        preview = self.get_empty_preview()
2537
2856
        preview.new_file('file', preview.root, 'contents', 'file-id')
2949
3268
        merger.merge_type = Merge3Merger
2950
3269
        merger.do_merge()
2951
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
 
2952
3289
    def test_is_executable(self):
2953
3290
        tree = self.make_branch_and_tree('tree')
2954
3291
        preview = TransformPreview(tree)