← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-19 14:19:50 UTC
  • mfrom: (5804 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5808.
  • Revision ID: jelmer@samba.org-20110419141950-b5no329iig0ludz9
merge bzr.dev/.

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()
224
295
        trans_id = target_transform.create_path('file1', target_transform.root)
225
296
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
226
297
        target_transform.apply()
227
 
        self.failUnlessExists('target/file1')
 
298
        self.assertPathExists('target/file1')
228
299
        source_stat = os.stat(self.wt.abspath('file1'))
229
300
        target_stat = os.stat('target/file1')
230
301
        self.assertEqual(source_stat, target_stat)
396
467
        transform.new_file('FiLe', transform.root, 'content')
397
468
        resolve_conflicts(transform)
398
469
        transform.apply()
399
 
        self.failUnlessExists('tree/file')
400
 
        self.failUnlessExists('tree/FiLe.moved')
 
470
        self.assertPathExists('tree/file')
 
471
        self.assertPathExists('tree/FiLe.moved')
401
472
 
402
473
    def test_resolve_checkout_case_conflict(self):
403
474
        tree = self.make_branch_and_tree('tree')
412
483
        resolve_conflicts(transform,
413
484
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
414
485
        transform.apply()
415
 
        self.failUnlessExists('tree/file')
416
 
        self.failUnlessExists('tree/FiLe.moved')
 
486
        self.assertPathExists('tree/file')
 
487
        self.assertPathExists('tree/FiLe.moved')
417
488
 
418
489
    def test_apply_case_conflict(self):
419
490
        """Ensure that a transform with case conflicts can always be applied"""
427
498
        transform.new_file('dirFiLe', dir, 'content')
428
499
        resolve_conflicts(transform)
429
500
        transform.apply()
430
 
        self.failUnlessExists('tree/file')
 
501
        self.assertPathExists('tree/file')
431
502
        if not os.path.exists('tree/FiLe.moved'):
432
 
            self.failUnlessExists('tree/FiLe')
433
 
        self.failUnlessExists('tree/dir/dirfile')
 
503
            self.assertPathExists('tree/FiLe')
 
504
        self.assertPathExists('tree/dir/dirfile')
434
505
        if not os.path.exists('tree/dir/dirFiLe.moved'):
435
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
506
            self.assertPathExists('tree/dir/dirFiLe')
436
507
 
437
508
    def test_case_insensitive_limbo(self):
438
509
        tree = self.make_branch_and_tree('tree')
1184
1255
        parent2 = transform.new_directory('parent2', root)
1185
1256
        transform.adjust_path('child1', parent2, child1)
1186
1257
        transform.apply()
1187
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1188
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1258
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1259
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1189
1260
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1190
1261
        # no rename for child1 (counting only renames during apply)
1191
 
        self.failUnlessEqual(2, transform.rename_count)
 
1262
        self.assertEqual(2, transform.rename_count)
1192
1263
 
1193
1264
    def test_cancel_parent(self):
1194
1265
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1217
1288
        parent2 = transform.new_directory('parent2', root)
1218
1289
        transform.adjust_path('child1', parent2, child1)
1219
1290
        transform.apply()
1220
 
        self.failIfExists(self.wt.abspath('parent1'))
1221
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1291
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1292
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1222
1293
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1223
 
        self.failUnlessEqual(2, transform.rename_count)
 
1294
        self.assertEqual(2, transform.rename_count)
1224
1295
 
1225
1296
    def test_adjust_and_cancel(self):
1226
1297
        """Make sure adjust_path keeps track of limbo children properly"""
1259
1330
        child = transform.new_directory('child', parent)
1260
1331
        transform.adjust_path('parent', root, parent)
1261
1332
        transform.apply()
1262
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1333
        self.assertPathExists(self.wt.abspath('parent/child'))
1263
1334
        self.assertEqual(1, transform.rename_count)
1264
1335
 
1265
1336
    def test_reuse_name(self):
1396
1467
        tt.create_file(["aa\n"], bar_trans_id)
1397
1468
        tt.version_file("bar-1", bar_trans_id)
1398
1469
        tt.apply()
1399
 
        self.failUnlessExists("foo/bar")
 
1470
        self.assertPathExists("foo/bar")
1400
1471
        wt.lock_read()
1401
1472
        try:
1402
1473
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1419
1490
        tt.delete_contents(foo_trans_id)
1420
1491
        tt.create_symlink("bar", foo_trans_id)
1421
1492
        tt.apply()
1422
 
        self.failUnlessExists("foo")
 
1493
        self.assertPathExists("foo")
1423
1494
        wt.lock_read()
1424
1495
        self.addCleanup(wt.unlock)
1425
1496
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1438
1509
        tt.delete_versioned(bar_trans_id)
1439
1510
        tt.create_file(["aa\n"], foo_trans_id)
1440
1511
        tt.apply()
1441
 
        self.failUnlessExists("foo")
 
1512
        self.assertPathExists("foo")
1442
1513
        wt.lock_read()
1443
1514
        self.addCleanup(wt.unlock)
1444
1515
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1459
1530
        self.build_tree(['baz'])
1460
1531
        tt.create_hardlink("baz", foo_trans_id)
1461
1532
        tt.apply()
1462
 
        self.failUnlessExists("foo")
1463
 
        self.failUnlessExists("baz")
 
1533
        self.assertPathExists("foo")
 
1534
        self.assertPathExists("baz")
1464
1535
        wt.lock_read()
1465
1536
        self.addCleanup(wt.unlock)
1466
1537
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1743
1814
        tree.add_reference(subtree)
1744
1815
        tree.commit('a revision')
1745
1816
        tree.branch.create_checkout('target')
1746
 
        self.failUnlessExists('target')
1747
 
        self.failUnlessExists('target/subtree')
 
1817
        self.assertPathExists('target')
 
1818
        self.assertPathExists('target/subtree')
1748
1819
 
1749
1820
    def test_file_conflict_handling(self):
1750
1821
        """Ensure that when building trees, conflict handling is done"""
1797
1868
        source.commit('added file')
1798
1869
        build_tree(source.basis_tree(), target)
1799
1870
        self.assertEqual([], target.conflicts())
1800
 
        self.failUnlessExists('target/dir1/file')
 
1871
        self.assertPathExists('target/dir1/file')
1801
1872
 
1802
1873
        # Ensure contents are merged
1803
1874
        target = self.make_branch_and_tree('target2')
1804
1875
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1805
1876
        build_tree(source.basis_tree(), target)
1806
1877
        self.assertEqual([], target.conflicts())
1807
 
        self.failUnlessExists('target2/dir1/file2')
1808
 
        self.failUnlessExists('target2/dir1/file')
 
1878
        self.assertPathExists('target2/dir1/file2')
 
1879
        self.assertPathExists('target2/dir1/file')
1809
1880
 
1810
1881
        # Ensure new contents are suppressed for existing branches
1811
1882
        target = self.make_branch_and_tree('target3')
1812
1883
        self.make_branch('target3/dir1')
1813
1884
        self.build_tree(['target3/dir1/file2'])
1814
1885
        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')
 
1886
        self.assertPathDoesNotExist('target3/dir1/file')
 
1887
        self.assertPathExists('target3/dir1/file2')
 
1888
        self.assertPathExists('target3/dir1.diverted/file')
1818
1889
        self.assertEqual([DuplicateEntry('Diverted to',
1819
1890
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1820
1891
            target.conflicts())
1823
1894
        self.build_tree(['target4/dir1/'])
1824
1895
        self.make_branch('target4/dir1/file')
1825
1896
        build_tree(source.basis_tree(), target)
1826
 
        self.failUnlessExists('target4/dir1/file')
 
1897
        self.assertPathExists('target4/dir1/file')
1827
1898
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1828
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1899
        self.assertPathExists('target4/dir1/file.diverted')
1829
1900
        self.assertEqual([DuplicateEntry('Diverted to',
1830
1901
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1831
1902
            target.conflicts())
1899
1970
        self.addCleanup(target.unlock)
1900
1971
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1901
1972
 
 
1973
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
1974
        source = self.create_ab_tree()
 
1975
        sha1 = osutils.sha_string('A')
 
1976
        target = self.make_branch_and_tree('target')
 
1977
        target.lock_write()
 
1978
        self.addCleanup(target.unlock)
 
1979
        state = target.current_dirstate()
 
1980
        state._cutoff_time = time.time() + 60
 
1981
        build_tree(source.basis_tree(), target, source)
 
1982
        entry = state._get_entry(0, path_utf8='file1')
 
1983
        self.assertEqual(sha1, entry[1][0][1])
 
1984
 
1902
1985
    def test_build_tree_accelerator_tree_missing_file(self):
1903
1986
        source = self.create_ab_tree()
1904
1987
        os.unlink('source/file1')
2062
2145
        self.assertEqual('file.moved', target.id2path('lower-id'))
2063
2146
        self.assertEqual('FILE', target.id2path('upper-id'))
2064
2147
 
 
2148
    def test_build_tree_observes_sha(self):
 
2149
        source = self.make_branch_and_tree('source')
 
2150
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2151
        source.add(['file1', 'dir', 'dir/file2'],
 
2152
                   ['file1-id', 'dir-id', 'file2-id'])
 
2153
        source.commit('new files')
 
2154
        target = self.make_branch_and_tree('target')
 
2155
        target.lock_write()
 
2156
        self.addCleanup(target.unlock)
 
2157
        # We make use of the fact that DirState caches its cutoff time. So we
 
2158
        # set the 'safe' time to one minute in the future.
 
2159
        state = target.current_dirstate()
 
2160
        state._cutoff_time = time.time() + 60
 
2161
        build_tree(source.basis_tree(), target)
 
2162
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2163
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2164
        # entry[1] is the state information, entry[1][0] is the state of the
 
2165
        # working tree, entry[1][0][1] is the sha value for the current working
 
2166
        # tree
 
2167
        entry1 = state._get_entry(0, path_utf8='file1')
 
2168
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2169
        # The 'size' field must also be set.
 
2170
        self.assertEqual(25, entry1[1][0][2])
 
2171
        entry1_state = entry1[1][0]
 
2172
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2173
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2174
        self.assertEqual(29, entry2[1][0][2])
 
2175
        entry2_state = entry2[1][0]
 
2176
        # Now, make sure that we don't have to re-read the content. The
 
2177
        # packed_stat should match exactly.
 
2178
        self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
 
2179
        self.assertEqual(entry2_sha,
 
2180
                         target.get_file_sha1('file2-id', 'dir/file2'))
 
2181
        self.assertEqual(entry1_state, entry1[1][0])
 
2182
        self.assertEqual(entry2_state, entry2[1][0])
 
2183
 
2065
2184
 
2066
2185
class TestCommitTransform(tests.TestCaseWithTransport):
2067
2186
 
2232
2351
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2233
2352
        mover = _FileMover()
2234
2353
        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')
 
2354
        self.assertPathExists('q')
 
2355
        self.assertPathDoesNotExist('a')
 
2356
        self.assertPathExists('q/b')
 
2357
        self.assertPathExists('c')
 
2358
        self.assertPathExists('c/d')
2240
2359
 
2241
2360
    def test_pre_delete_rollback(self):
2242
2361
        self.build_tree(['a/'])
2243
2362
        mover = _FileMover()
2244
2363
        mover.pre_delete('a', 'q')
2245
 
        self.failUnlessExists('q')
2246
 
        self.failIfExists('a')
 
2364
        self.assertPathExists('q')
 
2365
        self.assertPathDoesNotExist('a')
2247
2366
        mover.rollback()
2248
 
        self.failIfExists('q')
2249
 
        self.failUnlessExists('a')
 
2367
        self.assertPathDoesNotExist('q')
 
2368
        self.assertPathExists('a')
2250
2369
 
2251
2370
    def test_apply_deletions(self):
2252
2371
        self.build_tree(['a/', 'b/'])
2253
2372
        mover = _FileMover()
2254
2373
        mover.pre_delete('a', 'q')
2255
2374
        mover.pre_delete('b', 'r')
2256
 
        self.failUnlessExists('q')
2257
 
        self.failUnlessExists('r')
2258
 
        self.failIfExists('a')
2259
 
        self.failIfExists('b')
 
2375
        self.assertPathExists('q')
 
2376
        self.assertPathExists('r')
 
2377
        self.assertPathDoesNotExist('a')
 
2378
        self.assertPathDoesNotExist('b')
2260
2379
        mover.apply_deletions()
2261
 
        self.failIfExists('q')
2262
 
        self.failIfExists('r')
2263
 
        self.failIfExists('a')
2264
 
        self.failIfExists('b')
 
2380
        self.assertPathDoesNotExist('q')
 
2381
        self.assertPathDoesNotExist('r')
 
2382
        self.assertPathDoesNotExist('a')
 
2383
        self.assertPathDoesNotExist('b')
2265
2384
 
2266
2385
    def test_file_mover_rollback(self):
2267
2386
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2272
2391
            mover.rename('a', 'c')
2273
2392
        except errors.FileExists, e:
2274
2393
            mover.rollback()
2275
 
        self.failUnlessExists('a')
2276
 
        self.failUnlessExists('c/d')
 
2394
        self.assertPathExists('a')
 
2395
        self.assertPathExists('c/d')
2277
2396
 
2278
2397
 
2279
2398
class Bogus(Exception):
2309
2428
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2310
2429
        self.assertRaises(Bogus, tt.apply,
2311
2430
                          _mover=self.ExceptionFileMover(bad_source='a'))
2312
 
        self.failUnlessExists('a')
2313
 
        self.failUnlessExists('a/b')
 
2431
        self.assertPathExists('a')
 
2432
        self.assertPathExists('a/b')
2314
2433
        tt.apply()
2315
 
        self.failUnlessExists('c')
2316
 
        self.failUnlessExists('c/d')
 
2434
        self.assertPathExists('c')
 
2435
        self.assertPathExists('c/d')
2317
2436
 
2318
2437
    def test_rollback_rename_into_place(self):
2319
2438
        tree = self.make_branch_and_tree('.')
2325
2444
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2326
2445
        self.assertRaises(Bogus, tt.apply,
2327
2446
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2328
 
        self.failUnlessExists('a')
2329
 
        self.failUnlessExists('a/b')
 
2447
        self.assertPathExists('a')
 
2448
        self.assertPathExists('a/b')
2330
2449
        tt.apply()
2331
 
        self.failUnlessExists('c')
2332
 
        self.failUnlessExists('c/d')
 
2450
        self.assertPathExists('c')
 
2451
        self.assertPathExists('c/d')
2333
2452
 
2334
2453
    def test_rollback_deletion(self):
2335
2454
        tree = self.make_branch_and_tree('.')
2341
2460
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2342
2461
        self.assertRaises(Bogus, tt.apply,
2343
2462
                          _mover=self.ExceptionFileMover(bad_target='d'))
2344
 
        self.failUnlessExists('a')
2345
 
        self.failUnlessExists('a/b')
 
2463
        self.assertPathExists('a')
 
2464
        self.assertPathExists('a/b')
2346
2465
 
2347
2466
 
2348
2467
class TestTransformMissingParent(tests.TestCaseWithTransport):