1999
1112
target = self.make_branch_and_tree('target')
2000
1113
self.build_tree(['target/name'])
2001
1114
target.add('name')
2002
self.assertRaises(errors.WorkingTreeAlreadyPopulated,
1115
self.assertRaises(errors.WorkingTreeAlreadyPopulated,
2003
1116
build_tree, source.basis_tree(), target)
2005
def test_build_tree_rename_count(self):
2006
source = self.make_branch_and_tree('source')
2007
self.build_tree(['source/file1', 'source/dir1/'])
2008
source.add(['file1', 'dir1'])
2009
source.commit('add1')
2010
target1 = self.make_branch_and_tree('target1')
2011
transform_result = build_tree(source.basis_tree(), target1)
2012
self.assertEqual(2, transform_result.rename_count)
2014
self.build_tree(['source/dir1/file2'])
2015
source.add(['dir1/file2'])
2016
source.commit('add3')
2017
target2 = self.make_branch_and_tree('target2')
2018
transform_result = build_tree(source.basis_tree(), target2)
2019
# children of non-root directories should not be renamed
2020
self.assertEqual(2, transform_result.rename_count)
2022
def create_ab_tree(self):
2023
"""Create a committed test tree with two files"""
2024
source = self.make_branch_and_tree('source')
2025
self.build_tree_contents([('source/file1', 'A')])
2026
self.build_tree_contents([('source/file2', 'B')])
2027
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
2028
source.commit('commit files')
2030
self.addCleanup(source.unlock)
2033
def test_build_tree_accelerator_tree(self):
2034
source = self.create_ab_tree()
2035
self.build_tree_contents([('source/file2', 'C')])
2037
real_source_get_file = source.get_file
2038
def get_file(file_id, path=None):
2039
calls.append(file_id)
2040
return real_source_get_file(file_id, path)
2041
source.get_file = get_file
2042
target = self.make_branch_and_tree('target')
2043
revision_tree = source.basis_tree()
2044
revision_tree.lock_read()
2045
self.addCleanup(revision_tree.unlock)
2046
build_tree(revision_tree, target, source)
2047
self.assertEqual(['file1-id'], calls)
2049
self.addCleanup(target.unlock)
2050
self.assertEqual([], list(target.iter_changes(revision_tree)))
2052
def test_build_tree_accelerator_tree_observes_sha1(self):
2053
source = self.create_ab_tree()
2054
sha1 = osutils.sha_string('A')
2055
target = self.make_branch_and_tree('target')
2057
self.addCleanup(target.unlock)
2058
state = target.current_dirstate()
2059
state._cutoff_time = time.time() + 60
2060
build_tree(source.basis_tree(), target, source)
2061
entry = state._get_entry(0, path_utf8='file1')
2062
self.assertEqual(sha1, entry[1][0][1])
2064
def test_build_tree_accelerator_tree_missing_file(self):
2065
source = self.create_ab_tree()
2066
os.unlink('source/file1')
2067
source.remove(['file2'])
2068
target = self.make_branch_and_tree('target')
2069
revision_tree = source.basis_tree()
2070
revision_tree.lock_read()
2071
self.addCleanup(revision_tree.unlock)
2072
build_tree(revision_tree, target, source)
2074
self.addCleanup(target.unlock)
2075
self.assertEqual([], list(target.iter_changes(revision_tree)))
2077
def test_build_tree_accelerator_wrong_kind(self):
2078
self.requireFeature(SymlinkFeature)
2079
source = self.make_branch_and_tree('source')
2080
self.build_tree_contents([('source/file1', '')])
2081
self.build_tree_contents([('source/file2', '')])
2082
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
2083
source.commit('commit files')
2084
os.unlink('source/file2')
2085
self.build_tree_contents([('source/file2/', 'C')])
2086
os.unlink('source/file1')
2087
os.symlink('file2', 'source/file1')
2089
real_source_get_file = source.get_file
2090
def get_file(file_id, path=None):
2091
calls.append(file_id)
2092
return real_source_get_file(file_id, path)
2093
source.get_file = get_file
2094
target = self.make_branch_and_tree('target')
2095
revision_tree = source.basis_tree()
2096
revision_tree.lock_read()
2097
self.addCleanup(revision_tree.unlock)
2098
build_tree(revision_tree, target, source)
2099
self.assertEqual([], calls)
2101
self.addCleanup(target.unlock)
2102
self.assertEqual([], list(target.iter_changes(revision_tree)))
2104
def test_build_tree_hardlink(self):
2105
self.requireFeature(HardlinkFeature)
2106
source = self.create_ab_tree()
2107
target = self.make_branch_and_tree('target')
2108
revision_tree = source.basis_tree()
2109
revision_tree.lock_read()
2110
self.addCleanup(revision_tree.unlock)
2111
build_tree(revision_tree, target, source, hardlink=True)
2113
self.addCleanup(target.unlock)
2114
self.assertEqual([], list(target.iter_changes(revision_tree)))
2115
source_stat = os.stat('source/file1')
2116
target_stat = os.stat('target/file1')
2117
self.assertEqual(source_stat, target_stat)
2119
# Explicitly disallowing hardlinks should prevent them.
2120
target2 = self.make_branch_and_tree('target2')
2121
build_tree(revision_tree, target2, source, hardlink=False)
2123
self.addCleanup(target2.unlock)
2124
self.assertEqual([], list(target2.iter_changes(revision_tree)))
2125
source_stat = os.stat('source/file1')
2126
target2_stat = os.stat('target2/file1')
2127
self.assertNotEqual(source_stat, target2_stat)
2129
def test_build_tree_accelerator_tree_moved(self):
2130
source = self.make_branch_and_tree('source')
2131
self.build_tree_contents([('source/file1', 'A')])
2132
source.add(['file1'], ['file1-id'])
2133
source.commit('commit files')
2134
source.rename_one('file1', 'file2')
2136
self.addCleanup(source.unlock)
2137
target = self.make_branch_and_tree('target')
2138
revision_tree = source.basis_tree()
2139
revision_tree.lock_read()
2140
self.addCleanup(revision_tree.unlock)
2141
build_tree(revision_tree, target, source)
2143
self.addCleanup(target.unlock)
2144
self.assertEqual([], list(target.iter_changes(revision_tree)))
2146
def test_build_tree_hardlinks_preserve_execute(self):
2147
self.requireFeature(HardlinkFeature)
2148
source = self.create_ab_tree()
2149
tt = TreeTransform(source)
2150
trans_id = tt.trans_id_tree_file_id('file1-id')
2151
tt.set_executability(True, trans_id)
2153
self.assertTrue(source.is_executable('file1-id'))
2154
target = self.make_branch_and_tree('target')
2155
revision_tree = source.basis_tree()
2156
revision_tree.lock_read()
2157
self.addCleanup(revision_tree.unlock)
2158
build_tree(revision_tree, target, source, hardlink=True)
2160
self.addCleanup(target.unlock)
2161
self.assertEqual([], list(target.iter_changes(revision_tree)))
2162
self.assertTrue(source.is_executable('file1-id'))
2164
def install_rot13_content_filter(self, pattern):
2166
# self.addCleanup(filters._reset_registry, filters._reset_registry())
2167
# below, but that looks a bit... hard to read even if it's exactly
2169
original_registry = filters._reset_registry()
2170
def restore_registry():
2171
filters._reset_registry(original_registry)
2172
self.addCleanup(restore_registry)
2173
def rot13(chunks, context=None):
2174
return [''.join(chunks).encode('rot13')]
2175
rot13filter = filters.ContentFilter(rot13, rot13)
2176
filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
2177
os.mkdir(self.test_home_dir + '/.bazaar')
2178
rules_filename = self.test_home_dir + '/.bazaar/rules'
2179
f = open(rules_filename, 'wb')
2180
f.write('[name %s]\nrot13=yes\n' % (pattern,))
2182
def uninstall_rules():
2183
os.remove(rules_filename)
2185
self.addCleanup(uninstall_rules)
2188
def test_build_tree_content_filtered_files_are_not_hardlinked(self):
2189
"""build_tree will not hardlink files that have content filtering rules
2190
applied to them (but will still hardlink other files from the same tree
2193
self.requireFeature(HardlinkFeature)
2194
self.install_rot13_content_filter('file1')
2195
source = self.create_ab_tree()
2196
target = self.make_branch_and_tree('target')
2197
revision_tree = source.basis_tree()
2198
revision_tree.lock_read()
2199
self.addCleanup(revision_tree.unlock)
2200
build_tree(revision_tree, target, source, hardlink=True)
2202
self.addCleanup(target.unlock)
2203
self.assertEqual([], list(target.iter_changes(revision_tree)))
2204
source_stat = os.stat('source/file1')
2205
target_stat = os.stat('target/file1')
2206
self.assertNotEqual(source_stat, target_stat)
2207
source_stat = os.stat('source/file2')
2208
target_stat = os.stat('target/file2')
2209
self.assertEqualStat(source_stat, target_stat)
2211
def test_case_insensitive_build_tree_inventory(self):
2212
if (tests.CaseInsensitiveFilesystemFeature.available()
2213
or tests.CaseInsCasePresFilenameFeature.available()):
2214
raise tests.UnavailableFeature('Fully case sensitive filesystem')
2215
source = self.make_branch_and_tree('source')
2216
self.build_tree(['source/file', 'source/FILE'])
2217
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2218
source.commit('added files')
2219
# Don't try this at home, kids!
2220
# Force the tree to report that it is case insensitive
2221
target = self.make_branch_and_tree('target')
2222
target.case_sensitive = False
2223
build_tree(source.basis_tree(), target, source, delta_from_tree=True)
2224
self.assertEqual('file.moved', target.id2path('lower-id'))
2225
self.assertEqual('FILE', target.id2path('upper-id'))
2227
def test_build_tree_observes_sha(self):
2228
source = self.make_branch_and_tree('source')
2229
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2230
source.add(['file1', 'dir', 'dir/file2'],
2231
['file1-id', 'dir-id', 'file2-id'])
2232
source.commit('new files')
2233
target = self.make_branch_and_tree('target')
2235
self.addCleanup(target.unlock)
2236
# We make use of the fact that DirState caches its cutoff time. So we
2237
# set the 'safe' time to one minute in the future.
2238
state = target.current_dirstate()
2239
state._cutoff_time = time.time() + 60
2240
build_tree(source.basis_tree(), target)
2241
entry1_sha = osutils.sha_file_by_name('source/file1')
2242
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2243
# entry[1] is the state information, entry[1][0] is the state of the
2244
# working tree, entry[1][0][1] is the sha value for the current working
2246
entry1 = state._get_entry(0, path_utf8='file1')
2247
self.assertEqual(entry1_sha, entry1[1][0][1])
2248
# The 'size' field must also be set.
2249
self.assertEqual(25, entry1[1][0][2])
2250
entry1_state = entry1[1][0]
2251
entry2 = state._get_entry(0, path_utf8='dir/file2')
2252
self.assertEqual(entry2_sha, entry2[1][0][1])
2253
self.assertEqual(29, entry2[1][0][2])
2254
entry2_state = entry2[1][0]
2255
# Now, make sure that we don't have to re-read the content. The
2256
# packed_stat should match exactly.
2257
self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
2258
self.assertEqual(entry2_sha,
2259
target.get_file_sha1('file2-id', 'dir/file2'))
2260
self.assertEqual(entry1_state, entry1[1][0])
2261
self.assertEqual(entry2_state, entry2[1][0])
2264
class TestCommitTransform(tests.TestCaseWithTransport):
2266
def get_branch(self):
2267
tree = self.make_branch_and_tree('tree')
2269
self.addCleanup(tree.unlock)
2270
tree.commit('empty commit')
2273
def get_branch_and_transform(self):
2274
branch = self.get_branch()
2275
tt = TransformPreview(branch.basis_tree())
2276
self.addCleanup(tt.finalize)
2279
def test_commit_wrong_basis(self):
2280
branch = self.get_branch()
2281
basis = branch.repository.revision_tree(
2282
_mod_revision.NULL_REVISION)
2283
tt = TransformPreview(basis)
2284
self.addCleanup(tt.finalize)
2285
e = self.assertRaises(ValueError, tt.commit, branch, '')
2286
self.assertEqual('TreeTransform not based on branch basis: null:',
2289
def test_empy_commit(self):
2290
branch, tt = self.get_branch_and_transform()
2291
rev = tt.commit(branch, 'my message')
2292
self.assertEqual(2, branch.revno())
2293
repo = branch.repository
2294
self.assertEqual('my message', repo.get_revision(rev).message)
2296
def test_merge_parents(self):
2297
branch, tt = self.get_branch_and_transform()
2298
rev = tt.commit(branch, 'my message', ['rev1b', 'rev1c'])
2299
self.assertEqual(['rev1b', 'rev1c'],
2300
branch.basis_tree().get_parent_ids()[1:])
2302
def test_first_commit(self):
2303
branch = self.make_branch('branch')
2305
self.addCleanup(branch.unlock)
2306
tt = TransformPreview(branch.basis_tree())
2307
self.addCleanup(tt.finalize)
2308
tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
2309
rev = tt.commit(branch, 'my message')
2310
self.assertEqual([], branch.basis_tree().get_parent_ids())
2311
self.assertNotEqual(_mod_revision.NULL_REVISION,
2312
branch.last_revision())
2314
def test_first_commit_with_merge_parents(self):
2315
branch = self.make_branch('branch')
2317
self.addCleanup(branch.unlock)
2318
tt = TransformPreview(branch.basis_tree())
2319
self.addCleanup(tt.finalize)
2320
e = self.assertRaises(ValueError, tt.commit, branch,
2321
'my message', ['rev1b-id'])
2322
self.assertEqual('Cannot supply merge parents for first commit.',
2324
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2326
def test_add_files(self):
2327
branch, tt = self.get_branch_and_transform()
2328
tt.new_file('file', tt.root, 'contents', 'file-id')
2329
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2330
if SymlinkFeature.available():
2331
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2332
rev = tt.commit(branch, 'message')
2333
tree = branch.basis_tree()
2334
self.assertEqual('file', tree.id2path('file-id'))
2335
self.assertEqual('contents', tree.get_file_text('file-id'))
2336
self.assertEqual('dir', tree.id2path('dir-id'))
2337
if SymlinkFeature.available():
2338
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2339
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2341
def test_add_unversioned(self):
2342
branch, tt = self.get_branch_and_transform()
2343
tt.new_file('file', tt.root, 'contents')
2344
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2345
'message', strict=True)
2347
def test_modify_strict(self):
2348
branch, tt = self.get_branch_and_transform()
2349
tt.new_file('file', tt.root, 'contents', 'file-id')
2350
tt.commit(branch, 'message', strict=True)
2351
tt = TransformPreview(branch.basis_tree())
2352
self.addCleanup(tt.finalize)
2353
trans_id = tt.trans_id_file_id('file-id')
2354
tt.delete_contents(trans_id)
2355
tt.create_file('contents', trans_id)
2356
tt.commit(branch, 'message', strict=True)
2358
def test_commit_malformed(self):
2359
"""Committing a malformed transform should raise an exception.
2361
In this case, we are adding a file without adding its parent.
2363
branch, tt = self.get_branch_and_transform()
2364
parent_id = tt.trans_id_file_id('parent-id')
2365
tt.new_file('file', parent_id, 'contents', 'file-id')
2366
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2369
def test_commit_rich_revision_data(self):
2370
branch, tt = self.get_branch_and_transform()
2371
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2372
committer='me <me@example.com>',
2373
revprops={'foo': 'bar'}, revision_id='revid-1',
2374
authors=['Author1 <author1@example.com>',
2375
'Author2 <author2@example.com>',
2377
self.assertEqual('revid-1', rev_id)
2378
revision = branch.repository.get_revision(rev_id)
2379
self.assertEqual(1, revision.timestamp)
2380
self.assertEqual(43201, revision.timezone)
2381
self.assertEqual('me <me@example.com>', revision.committer)
2382
self.assertEqual(['Author1 <author1@example.com>',
2383
'Author2 <author2@example.com>'],
2384
revision.get_apparent_authors())
2385
del revision.properties['authors']
2386
self.assertEqual({'foo': 'bar',
2387
'branch-nick': 'tree'},
2388
revision.properties)
2390
def test_no_explicit_revprops(self):
2391
branch, tt = self.get_branch_and_transform()
2392
rev_id = tt.commit(branch, 'message', authors=[
2393
'Author1 <author1@example.com>',
2394
'Author2 <author2@example.com>', ])
2395
revision = branch.repository.get_revision(rev_id)
2396
self.assertEqual(['Author1 <author1@example.com>',
2397
'Author2 <author2@example.com>'],
2398
revision.get_apparent_authors())
2399
self.assertEqual('tree', revision.properties['branch-nick'])
2402
class TestBackupName(tests.TestCase):
2404
def test_deprecations(self):
2405
class MockTransform(object):
2407
def has_named_child(self, by_parent, parent_id, name):
2408
return name in by_parent.get(parent_id, [])
2410
class MockEntry(object):
2413
object.__init__(self)
1119
class MockTransform(object):
1121
def has_named_child(self, by_parent, parent_id, name):
1122
for child_id in by_parent[parent_id]:
1126
elif name == "name.~%s~" % child_id:
1130
class MockEntry(object):
1132
object.__init__(self)
1135
class TestGetBackupName(TestCase):
1136
def test_get_backup_name(self):
2416
1137
tt = MockTransform()
2417
name1 = self.applyDeprecated(
2418
symbol_versioning.deprecated_in((2, 3, 0)),
2419
transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
2420
self.assertEqual('name.~1~', name1)
2421
name2 = self.applyDeprecated(
2422
symbol_versioning.deprecated_in((2, 3, 0)),
2423
transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
2424
self.assertEqual('name.~2~', name2)
2427
class TestFileMover(tests.TestCaseWithTransport):
2429
def test_file_mover(self):
2430
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2431
mover = _FileMover()
2432
mover.rename('a', 'q')
2433
self.assertPathExists('q')
2434
self.assertPathDoesNotExist('a')
2435
self.assertPathExists('q/b')
2436
self.assertPathExists('c')
2437
self.assertPathExists('c/d')
2439
def test_pre_delete_rollback(self):
2440
self.build_tree(['a/'])
2441
mover = _FileMover()
2442
mover.pre_delete('a', 'q')
2443
self.assertPathExists('q')
2444
self.assertPathDoesNotExist('a')
2446
self.assertPathDoesNotExist('q')
2447
self.assertPathExists('a')
2449
def test_apply_deletions(self):
2450
self.build_tree(['a/', 'b/'])
2451
mover = _FileMover()
2452
mover.pre_delete('a', 'q')
2453
mover.pre_delete('b', 'r')
2454
self.assertPathExists('q')
2455
self.assertPathExists('r')
2456
self.assertPathDoesNotExist('a')
2457
self.assertPathDoesNotExist('b')
2458
mover.apply_deletions()
2459
self.assertPathDoesNotExist('q')
2460
self.assertPathDoesNotExist('r')
2461
self.assertPathDoesNotExist('a')
2462
self.assertPathDoesNotExist('b')
2464
def test_file_mover_rollback(self):
2465
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2466
mover = _FileMover()
2467
mover.rename('c/d', 'c/f')
2468
mover.rename('c/e', 'c/d')
2470
mover.rename('a', 'c')
2471
except errors.FileExists, e:
2473
self.assertPathExists('a')
2474
self.assertPathExists('c/d')
2477
class Bogus(Exception):
2481
class TestTransformRollback(tests.TestCaseWithTransport):
2483
class ExceptionFileMover(_FileMover):
2485
def __init__(self, bad_source=None, bad_target=None):
2486
_FileMover.__init__(self)
2487
self.bad_source = bad_source
2488
self.bad_target = bad_target
2490
def rename(self, source, target):
2491
if (self.bad_source is not None and
2492
source.endswith(self.bad_source)):
2494
elif (self.bad_target is not None and
2495
target.endswith(self.bad_target)):
2498
_FileMover.rename(self, source, target)
2500
def test_rollback_rename(self):
2501
tree = self.make_branch_and_tree('.')
2502
self.build_tree(['a/', 'a/b'])
2503
tt = TreeTransform(tree)
2504
self.addCleanup(tt.finalize)
2505
a_id = tt.trans_id_tree_path('a')
2506
tt.adjust_path('c', tt.root, a_id)
2507
tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2508
self.assertRaises(Bogus, tt.apply,
2509
_mover=self.ExceptionFileMover(bad_source='a'))
2510
self.assertPathExists('a')
2511
self.assertPathExists('a/b')
2513
self.assertPathExists('c')
2514
self.assertPathExists('c/d')
2516
def test_rollback_rename_into_place(self):
2517
tree = self.make_branch_and_tree('.')
2518
self.build_tree(['a/', 'a/b'])
2519
tt = TreeTransform(tree)
2520
self.addCleanup(tt.finalize)
2521
a_id = tt.trans_id_tree_path('a')
2522
tt.adjust_path('c', tt.root, a_id)
2523
tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2524
self.assertRaises(Bogus, tt.apply,
2525
_mover=self.ExceptionFileMover(bad_target='c/d'))
2526
self.assertPathExists('a')
2527
self.assertPathExists('a/b')
2529
self.assertPathExists('c')
2530
self.assertPathExists('c/d')
2532
def test_rollback_deletion(self):
2533
tree = self.make_branch_and_tree('.')
2534
self.build_tree(['a/', 'a/b'])
2535
tt = TreeTransform(tree)
2536
self.addCleanup(tt.finalize)
2537
a_id = tt.trans_id_tree_path('a')
2538
tt.delete_contents(a_id)
2539
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2540
self.assertRaises(Bogus, tt.apply,
2541
_mover=self.ExceptionFileMover(bad_target='d'))
2542
self.assertPathExists('a')
2543
self.assertPathExists('a/b')
2546
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2547
"""Ensure treetransform creation errors can be safely cleaned up after"""
2549
def _override_globals_in_method(self, instance, method_name, globals):
2550
"""Replace method on instance with one with updated globals"""
2552
func = getattr(instance, method_name).im_func
2553
new_globals = dict(func.func_globals)
2554
new_globals.update(globals)
2555
new_func = types.FunctionType(func.func_code, new_globals,
2556
func.func_name, func.func_defaults)
2557
setattr(instance, method_name,
2558
types.MethodType(new_func, instance, instance.__class__))
2559
self.addCleanup(delattr, instance, method_name)
2562
def _fake_open_raises_before(name, mode):
2563
"""Like open() but raises before doing anything"""
2567
def _fake_open_raises_after(name, mode):
2568
"""Like open() but raises after creating file without returning"""
2569
open(name, mode).close()
2572
def create_transform_and_root_trans_id(self):
2573
"""Setup a transform creating a file in limbo"""
2574
tree = self.make_branch_and_tree('.')
2575
tt = TreeTransform(tree)
2576
return tt, tt.create_path("a", tt.root)
2578
def create_transform_and_subdir_trans_id(self):
2579
"""Setup a transform creating a directory containing a file in limbo"""
2580
tree = self.make_branch_and_tree('.')
2581
tt = TreeTransform(tree)
2582
d_trans_id = tt.create_path("d", tt.root)
2583
tt.create_directory(d_trans_id)
2584
f_trans_id = tt.create_path("a", d_trans_id)
2585
tt.adjust_path("a", d_trans_id, f_trans_id)
2586
return tt, f_trans_id
2588
def test_root_create_file_open_raises_before_creation(self):
2589
tt, trans_id = self.create_transform_and_root_trans_id()
2590
self._override_globals_in_method(tt, "create_file",
2591
{"open": self._fake_open_raises_before})
2592
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2593
path = tt._limbo_name(trans_id)
2594
self.assertPathDoesNotExist(path)
2596
self.assertPathDoesNotExist(tt._limbodir)
2598
def test_root_create_file_open_raises_after_creation(self):
2599
tt, trans_id = self.create_transform_and_root_trans_id()
2600
self._override_globals_in_method(tt, "create_file",
2601
{"open": self._fake_open_raises_after})
2602
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2603
path = tt._limbo_name(trans_id)
2604
self.assertPathExists(path)
2606
self.assertPathDoesNotExist(path)
2607
self.assertPathDoesNotExist(tt._limbodir)
2609
def test_subdir_create_file_open_raises_before_creation(self):
2610
tt, trans_id = self.create_transform_and_subdir_trans_id()
2611
self._override_globals_in_method(tt, "create_file",
2612
{"open": self._fake_open_raises_before})
2613
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2614
path = tt._limbo_name(trans_id)
2615
self.assertPathDoesNotExist(path)
2617
self.assertPathDoesNotExist(tt._limbodir)
2619
def test_subdir_create_file_open_raises_after_creation(self):
2620
tt, trans_id = self.create_transform_and_subdir_trans_id()
2621
self._override_globals_in_method(tt, "create_file",
2622
{"open": self._fake_open_raises_after})
2623
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2624
path = tt._limbo_name(trans_id)
2625
self.assertPathExists(path)
2627
self.assertPathDoesNotExist(path)
2628
self.assertPathDoesNotExist(tt._limbodir)
2630
def test_rename_in_limbo_rename_raises_after_rename(self):
2631
tt, trans_id = self.create_transform_and_root_trans_id()
2632
parent1 = tt.new_directory('parent1', tt.root)
2633
child1 = tt.new_file('child1', parent1, 'contents')
2634
parent2 = tt.new_directory('parent2', tt.root)
2636
class FakeOSModule(object):
2637
def rename(self, old, new):
2640
self._override_globals_in_method(tt, "_rename_in_limbo",
2641
{"os": FakeOSModule()})
2643
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2644
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2645
self.assertPathExists(path)
2647
self.assertPathDoesNotExist(path)
2648
self.assertPathDoesNotExist(tt._limbodir)
2650
def test_rename_in_limbo_rename_raises_before_rename(self):
2651
tt, trans_id = self.create_transform_and_root_trans_id()
2652
parent1 = tt.new_directory('parent1', tt.root)
2653
child1 = tt.new_file('child1', parent1, 'contents')
2654
parent2 = tt.new_directory('parent2', tt.root)
2656
class FakeOSModule(object):
2657
def rename(self, old, new):
2659
self._override_globals_in_method(tt, "_rename_in_limbo",
2660
{"os": FakeOSModule()})
2662
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2663
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2664
self.assertPathExists(path)
2666
self.assertPathDoesNotExist(path)
2667
self.assertPathDoesNotExist(tt._limbodir)
2670
class TestTransformMissingParent(tests.TestCaseWithTransport):
2672
def make_tt_with_versioned_dir(self):
2673
wt = self.make_branch_and_tree('.')
2674
self.build_tree(['dir/',])
2675
wt.add(['dir'], ['dir-id'])
2676
wt.commit('Create dir')
2677
tt = TreeTransform(wt)
2678
self.addCleanup(tt.finalize)
2681
def test_resolve_create_parent_for_versioned_file(self):
2682
wt, tt = self.make_tt_with_versioned_dir()
2683
dir_tid = tt.trans_id_tree_file_id('dir-id')
2684
file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
2685
tt.delete_contents(dir_tid)
2686
tt.unversion_file(dir_tid)
2687
conflicts = resolve_conflicts(tt)
2688
# one conflict for the missing directory, one for the unversioned
2690
self.assertLength(2, conflicts)
2692
def test_non_versioned_file_create_conflict(self):
2693
wt, tt = self.make_tt_with_versioned_dir()
2694
dir_tid = tt.trans_id_tree_file_id('dir-id')
2695
tt.new_file('file', dir_tid, 'Contents')
2696
tt.delete_contents(dir_tid)
2697
tt.unversion_file(dir_tid)
2698
conflicts = resolve_conflicts(tt)
2699
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2700
self.assertLength(1, conflicts)
2701
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2705
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2706
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2708
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2709
('', ''), ('directory', 'directory'), (False, False))
2712
class TestTransformPreview(tests.TestCaseWithTransport):
2714
def create_tree(self):
2715
tree = self.make_branch_and_tree('.')
2716
self.build_tree_contents([('a', 'content 1')])
2717
tree.set_root_id('TREE_ROOT')
2718
tree.add('a', 'a-id')
2719
tree.commit('rev1', rev_id='rev1')
2720
return tree.branch.repository.revision_tree('rev1')
2722
def get_empty_preview(self):
2723
repository = self.make_repository('repo')
2724
tree = repository.revision_tree(_mod_revision.NULL_REVISION)
2725
preview = TransformPreview(tree)
2726
self.addCleanup(preview.finalize)
2729
def test_transform_preview(self):
2730
revision_tree = self.create_tree()
2731
preview = TransformPreview(revision_tree)
2732
self.addCleanup(preview.finalize)
2734
def test_transform_preview_tree(self):
2735
revision_tree = self.create_tree()
2736
preview = TransformPreview(revision_tree)
2737
self.addCleanup(preview.finalize)
2738
preview.get_preview_tree()
2740
def test_transform_new_file(self):
2741
revision_tree = self.create_tree()
2742
preview = TransformPreview(revision_tree)
2743
self.addCleanup(preview.finalize)
2744
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2745
preview_tree = preview.get_preview_tree()
2746
self.assertEqual(preview_tree.kind('file2-id'), 'file')
2748
preview_tree.get_file('file2-id').read(), 'content B\n')
2750
def test_diff_preview_tree(self):
2751
revision_tree = self.create_tree()
2752
preview = TransformPreview(revision_tree)
2753
self.addCleanup(preview.finalize)
2754
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2755
preview_tree = preview.get_preview_tree()
2757
show_diff_trees(revision_tree, preview_tree, out)
2758
lines = out.getvalue().splitlines()
2759
self.assertEqual(lines[0], "=== added file 'file2'")
2760
# 3 lines of diff administrivia
2761
self.assertEqual(lines[4], "+content B")
2763
def test_transform_conflicts(self):
2764
revision_tree = self.create_tree()
2765
preview = TransformPreview(revision_tree)
2766
self.addCleanup(preview.finalize)
2767
preview.new_file('a', preview.root, 'content 2')
2768
resolve_conflicts(preview)
2769
trans_id = preview.trans_id_file_id('a-id')
2770
self.assertEqual('a.moved', preview.final_name(trans_id))
2772
def get_tree_and_preview_tree(self):
2773
revision_tree = self.create_tree()
2774
preview = TransformPreview(revision_tree)
2775
self.addCleanup(preview.finalize)
2776
a_trans_id = preview.trans_id_file_id('a-id')
2777
preview.delete_contents(a_trans_id)
2778
preview.create_file('b content', a_trans_id)
2779
preview_tree = preview.get_preview_tree()
2780
return revision_tree, preview_tree
2782
def test_iter_changes(self):
2783
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2784
root = revision_tree.inventory.root.file_id
2785
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2786
(root, root), ('a', 'a'), ('file', 'file'),
2788
list(preview_tree.iter_changes(revision_tree)))
2790
def test_include_unchanged_succeeds(self):
2791
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2792
changes = preview_tree.iter_changes(revision_tree,
2793
include_unchanged=True)
2794
root = revision_tree.inventory.root.file_id
2796
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2798
def test_specific_files(self):
2799
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2800
changes = preview_tree.iter_changes(revision_tree,
2801
specific_files=[''])
2802
self.assertEqual([A_ENTRY], list(changes))
2804
def test_want_unversioned(self):
2805
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2806
changes = preview_tree.iter_changes(revision_tree,
2807
want_unversioned=True)
2808
self.assertEqual([A_ENTRY], list(changes))
2810
def test_ignore_extra_trees_no_specific_files(self):
2811
# extra_trees is harmless without specific_files, so we'll silently
2812
# accept it, even though we won't use it.
2813
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2814
preview_tree.iter_changes(revision_tree, extra_trees=[preview_tree])
2816
def test_ignore_require_versioned_no_specific_files(self):
2817
# require_versioned is meaningless without specific_files.
2818
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2819
preview_tree.iter_changes(revision_tree, require_versioned=False)
2821
def test_ignore_pb(self):
2822
# pb could be supported, but TT.iter_changes doesn't support it.
2823
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2824
preview_tree.iter_changes(revision_tree)
2826
def test_kind(self):
2827
revision_tree = self.create_tree()
2828
preview = TransformPreview(revision_tree)
2829
self.addCleanup(preview.finalize)
2830
preview.new_file('file', preview.root, 'contents', 'file-id')
2831
preview.new_directory('directory', preview.root, 'dir-id')
2832
preview_tree = preview.get_preview_tree()
2833
self.assertEqual('file', preview_tree.kind('file-id'))
2834
self.assertEqual('directory', preview_tree.kind('dir-id'))
2836
def test_get_file_mtime(self):
2837
preview = self.get_empty_preview()
2838
file_trans_id = preview.new_file('file', preview.root, 'contents',
2840
limbo_path = preview._limbo_name(file_trans_id)
2841
preview_tree = preview.get_preview_tree()
2842
self.assertEqual(os.stat(limbo_path).st_mtime,
2843
preview_tree.get_file_mtime('file-id'))
2845
def test_get_file_mtime_renamed(self):
2846
work_tree = self.make_branch_and_tree('tree')
2847
self.build_tree(['tree/file'])
2848
work_tree.add('file', 'file-id')
2849
preview = TransformPreview(work_tree)
2850
self.addCleanup(preview.finalize)
2851
file_trans_id = preview.trans_id_tree_file_id('file-id')
2852
preview.adjust_path('renamed', preview.root, file_trans_id)
2853
preview_tree = preview.get_preview_tree()
2854
preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2855
work_mtime = work_tree.get_file_mtime('file-id', 'file')
2857
def test_get_file_size(self):
2858
work_tree = self.make_branch_and_tree('tree')
2859
self.build_tree_contents([('tree/old', 'old')])
2860
work_tree.add('old', 'old-id')
2861
preview = TransformPreview(work_tree)
2862
self.addCleanup(preview.finalize)
2863
new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
2865
tree = preview.get_preview_tree()
2866
self.assertEqual(len('old'), tree.get_file_size('old-id'))
2867
self.assertEqual(len('contents'), tree.get_file_size('new-id'))
2869
def test_get_file(self):
2870
preview = self.get_empty_preview()
2871
preview.new_file('file', preview.root, 'contents', 'file-id')
2872
preview_tree = preview.get_preview_tree()
2873
tree_file = preview_tree.get_file('file-id')
2875
self.assertEqual('contents', tree_file.read())
2879
def test_get_symlink_target(self):
2880
self.requireFeature(SymlinkFeature)
2881
preview = self.get_empty_preview()
2882
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2883
preview_tree = preview.get_preview_tree()
2884
self.assertEqual('target',
2885
preview_tree.get_symlink_target('symlink-id'))
2887
def test_all_file_ids(self):
2888
tree = self.make_branch_and_tree('tree')
2889
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2890
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2891
preview = TransformPreview(tree)
2892
self.addCleanup(preview.finalize)
2893
preview.unversion_file(preview.trans_id_file_id('b-id'))
2894
c_trans_id = preview.trans_id_file_id('c-id')
2895
preview.unversion_file(c_trans_id)
2896
preview.version_file('c-id', c_trans_id)
2897
preview_tree = preview.get_preview_tree()
2898
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2899
preview_tree.all_file_ids())
2901
def test_path2id_deleted_unchanged(self):
2902
tree = self.make_branch_and_tree('tree')
2903
self.build_tree(['tree/unchanged', 'tree/deleted'])
2904
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2905
preview = TransformPreview(tree)
2906
self.addCleanup(preview.finalize)
2907
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2908
preview_tree = preview.get_preview_tree()
2909
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2910
self.assertIs(None, preview_tree.path2id('deleted'))
2912
def test_path2id_created(self):
2913
tree = self.make_branch_and_tree('tree')
2914
self.build_tree(['tree/unchanged'])
2915
tree.add(['unchanged'], ['unchanged-id'])
2916
preview = TransformPreview(tree)
2917
self.addCleanup(preview.finalize)
2918
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2919
'contents', 'new-id')
2920
preview_tree = preview.get_preview_tree()
2921
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2923
def test_path2id_moved(self):
2924
tree = self.make_branch_and_tree('tree')
2925
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2926
tree.add(['old_parent', 'old_parent/child'],
2927
['old_parent-id', 'child-id'])
2928
preview = TransformPreview(tree)
2929
self.addCleanup(preview.finalize)
2930
new_parent = preview.new_directory('new_parent', preview.root,
2932
preview.adjust_path('child', new_parent,
2933
preview.trans_id_file_id('child-id'))
2934
preview_tree = preview.get_preview_tree()
2935
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2936
self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
2938
def test_path2id_renamed_parent(self):
2939
tree = self.make_branch_and_tree('tree')
2940
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2941
tree.add(['old_name', 'old_name/child'],
2942
['parent-id', 'child-id'])
2943
preview = TransformPreview(tree)
2944
self.addCleanup(preview.finalize)
2945
preview.adjust_path('new_name', preview.root,
2946
preview.trans_id_file_id('parent-id'))
2947
preview_tree = preview.get_preview_tree()
2948
self.assertIs(None, preview_tree.path2id('old_name/child'))
2949
self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
2951
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2952
preview_tree = tt.get_preview_tree()
2953
preview_result = list(preview_tree.iter_entries_by_dir(
2957
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2958
self.assertEqual(actual_result, preview_result)
2960
def test_iter_entries_by_dir_new(self):
2961
tree = self.make_branch_and_tree('tree')
2962
tt = TreeTransform(tree)
2963
tt.new_file('new', tt.root, 'contents', 'new-id')
2964
self.assertMatchingIterEntries(tt)
2966
def test_iter_entries_by_dir_deleted(self):
2967
tree = self.make_branch_and_tree('tree')
2968
self.build_tree(['tree/deleted'])
2969
tree.add('deleted', 'deleted-id')
2970
tt = TreeTransform(tree)
2971
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2972
self.assertMatchingIterEntries(tt)
2974
def test_iter_entries_by_dir_unversioned(self):
2975
tree = self.make_branch_and_tree('tree')
2976
self.build_tree(['tree/removed'])
2977
tree.add('removed', 'removed-id')
2978
tt = TreeTransform(tree)
2979
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2980
self.assertMatchingIterEntries(tt)
2982
def test_iter_entries_by_dir_moved(self):
2983
tree = self.make_branch_and_tree('tree')
2984
self.build_tree(['tree/moved', 'tree/new_parent/'])
2985
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2986
tt = TreeTransform(tree)
2987
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2988
tt.trans_id_file_id('moved-id'))
2989
self.assertMatchingIterEntries(tt)
2991
def test_iter_entries_by_dir_specific_file_ids(self):
2992
tree = self.make_branch_and_tree('tree')
2993
tree.set_root_id('tree-root-id')
2994
self.build_tree(['tree/parent/', 'tree/parent/child'])
2995
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2996
tt = TreeTransform(tree)
2997
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
2999
def test_symlink_content_summary(self):
3000
self.requireFeature(SymlinkFeature)
3001
preview = self.get_empty_preview()
3002
preview.new_symlink('path', preview.root, 'target', 'path-id')
3003
summary = preview.get_preview_tree().path_content_summary('path')
3004
self.assertEqual(('symlink', None, None, 'target'), summary)
3006
def test_missing_content_summary(self):
3007
preview = self.get_empty_preview()
3008
summary = preview.get_preview_tree().path_content_summary('path')
3009
self.assertEqual(('missing', None, None, None), summary)
3011
def test_deleted_content_summary(self):
3012
tree = self.make_branch_and_tree('tree')
3013
self.build_tree(['tree/path/'])
3015
preview = TransformPreview(tree)
3016
self.addCleanup(preview.finalize)
3017
preview.delete_contents(preview.trans_id_tree_path('path'))
3018
summary = preview.get_preview_tree().path_content_summary('path')
3019
self.assertEqual(('missing', None, None, None), summary)
3021
def test_file_content_summary_executable(self):
3022
preview = self.get_empty_preview()
3023
path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
3024
preview.set_executability(True, path_id)
3025
summary = preview.get_preview_tree().path_content_summary('path')
3026
self.assertEqual(4, len(summary))
3027
self.assertEqual('file', summary[0])
3028
# size must be known
3029
self.assertEqual(len('contents'), summary[1])
3031
self.assertEqual(True, summary[2])
3032
# will not have hash (not cheap to determine)
3033
self.assertIs(None, summary[3])
3035
def test_change_executability(self):
3036
tree = self.make_branch_and_tree('tree')
3037
self.build_tree(['tree/path'])
3039
preview = TransformPreview(tree)
3040
self.addCleanup(preview.finalize)
3041
path_id = preview.trans_id_tree_path('path')
3042
preview.set_executability(True, path_id)
3043
summary = preview.get_preview_tree().path_content_summary('path')
3044
self.assertEqual(True, summary[2])
3046
def test_file_content_summary_non_exec(self):
3047
preview = self.get_empty_preview()
3048
preview.new_file('path', preview.root, 'contents', 'path-id')
3049
summary = preview.get_preview_tree().path_content_summary('path')
3050
self.assertEqual(4, len(summary))
3051
self.assertEqual('file', summary[0])
3052
# size must be known
3053
self.assertEqual(len('contents'), summary[1])
3055
self.assertEqual(False, summary[2])
3056
# will not have hash (not cheap to determine)
3057
self.assertIs(None, summary[3])
3059
def test_dir_content_summary(self):
3060
preview = self.get_empty_preview()
3061
preview.new_directory('path', preview.root, 'path-id')
3062
summary = preview.get_preview_tree().path_content_summary('path')
3063
self.assertEqual(('directory', None, None, None), summary)
3065
def test_tree_content_summary(self):
3066
preview = self.get_empty_preview()
3067
path = preview.new_directory('path', preview.root, 'path-id')
3068
preview.set_tree_reference('rev-1', path)
3069
summary = preview.get_preview_tree().path_content_summary('path')
3070
self.assertEqual(4, len(summary))
3071
self.assertEqual('tree-reference', summary[0])
3073
def test_annotate(self):
3074
tree = self.make_branch_and_tree('tree')
3075
self.build_tree_contents([('tree/file', 'a\n')])
3076
tree.add('file', 'file-id')
3077
tree.commit('a', rev_id='one')
3078
self.build_tree_contents([('tree/file', 'a\nb\n')])
3079
preview = TransformPreview(tree)
3080
self.addCleanup(preview.finalize)
3081
file_trans_id = preview.trans_id_file_id('file-id')
3082
preview.delete_contents(file_trans_id)
3083
preview.create_file('a\nb\nc\n', file_trans_id)
3084
preview_tree = preview.get_preview_tree()
3090
annotation = preview_tree.annotate_iter('file-id', 'me:')
3091
self.assertEqual(expected, annotation)
3093
def test_annotate_missing(self):
3094
preview = self.get_empty_preview()
3095
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3096
preview_tree = preview.get_preview_tree()
3102
annotation = preview_tree.annotate_iter('file-id', 'me:')
3103
self.assertEqual(expected, annotation)
3105
def test_annotate_rename(self):
3106
tree = self.make_branch_and_tree('tree')
3107
self.build_tree_contents([('tree/file', 'a\n')])
3108
tree.add('file', 'file-id')
3109
tree.commit('a', rev_id='one')
3110
preview = TransformPreview(tree)
3111
self.addCleanup(preview.finalize)
3112
file_trans_id = preview.trans_id_file_id('file-id')
3113
preview.adjust_path('newname', preview.root, file_trans_id)
3114
preview_tree = preview.get_preview_tree()
3118
annotation = preview_tree.annotate_iter('file-id', 'me:')
3119
self.assertEqual(expected, annotation)
3121
def test_annotate_deleted(self):
3122
tree = self.make_branch_and_tree('tree')
3123
self.build_tree_contents([('tree/file', 'a\n')])
3124
tree.add('file', 'file-id')
3125
tree.commit('a', rev_id='one')
3126
self.build_tree_contents([('tree/file', 'a\nb\n')])
3127
preview = TransformPreview(tree)
3128
self.addCleanup(preview.finalize)
3129
file_trans_id = preview.trans_id_file_id('file-id')
3130
preview.delete_contents(file_trans_id)
3131
preview_tree = preview.get_preview_tree()
3132
annotation = preview_tree.annotate_iter('file-id', 'me:')
3133
self.assertIs(None, annotation)
3135
def test_stored_kind(self):
3136
preview = self.get_empty_preview()
3137
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3138
preview_tree = preview.get_preview_tree()
3139
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3141
def test_is_executable(self):
3142
preview = self.get_empty_preview()
3143
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3144
preview.set_executability(True, preview.trans_id_file_id('file-id'))
3145
preview_tree = preview.get_preview_tree()
3146
self.assertEqual(True, preview_tree.is_executable('file-id'))
3148
def test_get_set_parent_ids(self):
3149
revision_tree, preview_tree = self.get_tree_and_preview_tree()
3150
self.assertEqual([], preview_tree.get_parent_ids())
3151
preview_tree.set_parent_ids(['rev-1'])
3152
self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
3154
def test_plan_file_merge(self):
3155
work_a = self.make_branch_and_tree('wta')
3156
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3157
work_a.add('file', 'file-id')
3158
base_id = work_a.commit('base version')
3159
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3160
preview = TransformPreview(work_a)
3161
self.addCleanup(preview.finalize)
3162
trans_id = preview.trans_id_file_id('file-id')
3163
preview.delete_contents(trans_id)
3164
preview.create_file('b\nc\nd\ne\n', trans_id)
3165
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3166
tree_a = preview.get_preview_tree()
3167
tree_a.set_parent_ids([base_id])
3169
('killed-a', 'a\n'),
3170
('killed-b', 'b\n'),
3171
('unchanged', 'c\n'),
3172
('unchanged', 'd\n'),
3175
], list(tree_a.plan_file_merge('file-id', tree_b)))
3177
def test_plan_file_merge_revision_tree(self):
3178
work_a = self.make_branch_and_tree('wta')
3179
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3180
work_a.add('file', 'file-id')
3181
base_id = work_a.commit('base version')
3182
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3183
preview = TransformPreview(work_a.basis_tree())
3184
self.addCleanup(preview.finalize)
3185
trans_id = preview.trans_id_file_id('file-id')
3186
preview.delete_contents(trans_id)
3187
preview.create_file('b\nc\nd\ne\n', trans_id)
3188
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3189
tree_a = preview.get_preview_tree()
3190
tree_a.set_parent_ids([base_id])
3192
('killed-a', 'a\n'),
3193
('killed-b', 'b\n'),
3194
('unchanged', 'c\n'),
3195
('unchanged', 'd\n'),
3198
], list(tree_a.plan_file_merge('file-id', tree_b)))
3200
def test_walkdirs(self):
3201
preview = self.get_empty_preview()
3202
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3203
# FIXME: new_directory should mark root.
3204
preview.fixup_new_roots()
3205
preview_tree = preview.get_preview_tree()
3206
file_trans_id = preview.new_file('a', preview.root, 'contents',
3208
expected = [(('', 'tree-root'),
3209
[('a', 'a', 'file', None, 'a-id', 'file')])]
3210
self.assertEqual(expected, list(preview_tree.walkdirs()))
3212
def test_extras(self):
3213
work_tree = self.make_branch_and_tree('tree')
3214
self.build_tree(['tree/removed-file', 'tree/existing-file',
3215
'tree/not-removed-file'])
3216
work_tree.add(['removed-file', 'not-removed-file'])
3217
preview = TransformPreview(work_tree)
3218
self.addCleanup(preview.finalize)
3219
preview.new_file('new-file', preview.root, 'contents')
3220
preview.new_file('new-versioned-file', preview.root, 'contents',
3222
tree = preview.get_preview_tree()
3223
preview.unversion_file(preview.trans_id_tree_path('removed-file'))
3224
self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
3227
def test_merge_into_preview(self):
3228
work_tree = self.make_branch_and_tree('tree')
3229
self.build_tree_contents([('tree/file','b\n')])
3230
work_tree.add('file', 'file-id')
3231
work_tree.commit('first commit')
3232
child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
3233
self.build_tree_contents([('child/file','b\nc\n')])
3234
child_tree.commit('child commit')
3235
child_tree.lock_write()
3236
self.addCleanup(child_tree.unlock)
3237
work_tree.lock_write()
3238
self.addCleanup(work_tree.unlock)
3239
preview = TransformPreview(work_tree)
3240
self.addCleanup(preview.finalize)
3241
file_trans_id = preview.trans_id_file_id('file-id')
3242
preview.delete_contents(file_trans_id)
3243
preview.create_file('a\nb\n', file_trans_id)
3244
preview_tree = preview.get_preview_tree()
3245
merger = Merger.from_revision_ids(None, preview_tree,
3246
child_tree.branch.last_revision(),
3247
other_branch=child_tree.branch,
3248
tree_branch=work_tree.branch)
3249
merger.merge_type = Merge3Merger
3250
tt = merger.make_merger().make_preview_transform()
3251
self.addCleanup(tt.finalize)
3252
final_tree = tt.get_preview_tree()
3253
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3255
def test_merge_preview_into_workingtree(self):
3256
tree = self.make_branch_and_tree('tree')
3257
tree.set_root_id('TREE_ROOT')
3258
tt = TransformPreview(tree)
3259
self.addCleanup(tt.finalize)
3260
tt.new_file('name', tt.root, 'content', 'file-id')
3261
tree2 = self.make_branch_and_tree('tree2')
3262
tree2.set_root_id('TREE_ROOT')
3263
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3264
None, tree.basis_tree())
3265
merger.merge_type = Merge3Merger
3268
def test_merge_preview_into_workingtree_handles_conflicts(self):
3269
tree = self.make_branch_and_tree('tree')
3270
self.build_tree_contents([('tree/foo', 'bar')])
3271
tree.add('foo', 'foo-id')
3273
tt = TransformPreview(tree)
3274
self.addCleanup(tt.finalize)
3275
trans_id = tt.trans_id_file_id('foo-id')
3276
tt.delete_contents(trans_id)
3277
tt.create_file('baz', trans_id)
3278
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
3279
self.build_tree_contents([('tree2/foo', 'qux')])
3281
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3282
pb, tree.basis_tree())
3283
merger.merge_type = Merge3Merger
3286
def test_has_filename(self):
3287
wt = self.make_branch_and_tree('tree')
3288
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3289
tt = TransformPreview(wt)
3290
removed_id = tt.trans_id_tree_path('removed')
3291
tt.delete_contents(removed_id)
3292
tt.new_file('new', tt.root, 'contents')
3293
modified_id = tt.trans_id_tree_path('modified')
3294
tt.delete_contents(modified_id)
3295
tt.create_file('modified-contents', modified_id)
3296
self.addCleanup(tt.finalize)
3297
tree = tt.get_preview_tree()
3298
self.assertTrue(tree.has_filename('unmodified'))
3299
self.assertFalse(tree.has_filename('not-present'))
3300
self.assertFalse(tree.has_filename('removed'))
3301
self.assertTrue(tree.has_filename('new'))
3302
self.assertTrue(tree.has_filename('modified'))
3304
def test_is_executable(self):
3305
tree = self.make_branch_and_tree('tree')
3306
preview = TransformPreview(tree)
3307
self.addCleanup(preview.finalize)
3308
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3309
preview_tree = preview.get_preview_tree()
3310
self.assertEqual(False, preview_tree.is_executable('baz-id',
3312
self.assertEqual(False, preview_tree.is_executable('baz-id'))
3314
def test_commit_preview_tree(self):
3315
tree = self.make_branch_and_tree('tree')
3316
rev_id = tree.commit('rev1')
3317
tree.branch.lock_write()
3318
self.addCleanup(tree.branch.unlock)
3319
tt = TransformPreview(tree)
3320
tt.new_file('file', tt.root, 'contents', 'file_id')
3321
self.addCleanup(tt.finalize)
3322
preview = tt.get_preview_tree()
3323
preview.set_parent_ids([rev_id])
3324
builder = tree.branch.get_commit_builder([rev_id])
3325
list(builder.record_iter_changes(preview, rev_id, tt.iter_changes()))
3326
builder.finish_inventory()
3327
rev2_id = builder.commit('rev2')
3328
rev2_tree = tree.branch.repository.revision_tree(rev2_id)
3329
self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
3331
def test_ascii_limbo_paths(self):
3332
self.requireFeature(tests.UnicodeFilenameFeature)
3333
branch = self.make_branch('any')
3334
tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
3335
tt = TransformPreview(tree)
3336
self.addCleanup(tt.finalize)
3337
foo_id = tt.new_directory('', ROOT_PARENT)
3338
bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')
3339
limbo_path = tt._limbo_name(bar_id)
3340
self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)
3343
class FakeSerializer(object):
3344
"""Serializer implementation that simply returns the input.
3346
The input is returned in the order used by pack.ContainerPushParser.
3349
def bytes_record(bytes, names):
3353
class TestSerializeTransform(tests.TestCaseWithTransport):
3355
_test_needs_features = [tests.UnicodeFilenameFeature]
3357
def get_preview(self, tree=None):
3359
tree = self.make_branch_and_tree('tree')
3360
tt = TransformPreview(tree)
3361
self.addCleanup(tt.finalize)
3364
def assertSerializesTo(self, expected, tt):
3365
records = list(tt.serialize(FakeSerializer()))
3366
self.assertEqual(expected, records)
3369
def default_attribs():
3374
'_new_executability': {},
3376
'_tree_path_ids': {'': 'new-0'},
3378
'_removed_contents': [],
3379
'_non_present_ids': {},
3382
def make_records(self, attribs, contents):
3384
(((('attribs'),),), bencode.bencode(attribs))]
3385
records.extend([(((n, k),), c) for n, k, c in contents])
3388
def creation_records(self):
3389
attribs = self.default_attribs()
3390
attribs['_id_number'] = 3
3391
attribs['_new_name'] = {
3392
'new-1': u'foo\u1234'.encode('utf-8'), 'new-2': 'qux'}
3393
attribs['_new_id'] = {'new-1': 'baz', 'new-2': 'quxx'}
3394
attribs['_new_parent'] = {'new-1': 'new-0', 'new-2': 'new-0'}
3395
attribs['_new_executability'] = {'new-1': 1}
3397
('new-1', 'file', 'i 1\nbar\n'),
3398
('new-2', 'directory', ''),
3400
return self.make_records(attribs, contents)
3402
def test_serialize_creation(self):
3403
tt = self.get_preview()
3404
tt.new_file(u'foo\u1234', tt.root, 'bar', 'baz', True)
3405
tt.new_directory('qux', tt.root, 'quxx')
3406
self.assertSerializesTo(self.creation_records(), tt)
3408
def test_deserialize_creation(self):
3409
tt = self.get_preview()
3410
tt.deserialize(iter(self.creation_records()))
3411
self.assertEqual(3, tt._id_number)
3412
self.assertEqual({'new-1': u'foo\u1234',
3413
'new-2': 'qux'}, tt._new_name)
3414
self.assertEqual({'new-1': 'baz', 'new-2': 'quxx'}, tt._new_id)
3415
self.assertEqual({'new-1': tt.root, 'new-2': tt.root}, tt._new_parent)
3416
self.assertEqual({'baz': 'new-1', 'quxx': 'new-2'}, tt._r_new_id)
3417
self.assertEqual({'new-1': True}, tt._new_executability)
3418
self.assertEqual({'new-1': 'file',
3419
'new-2': 'directory'}, tt._new_contents)
3420
foo_limbo = open(tt._limbo_name('new-1'), 'rb')
3422
foo_content = foo_limbo.read()
3425
self.assertEqual('bar', foo_content)
3427
def symlink_creation_records(self):
3428
attribs = self.default_attribs()
3429
attribs['_id_number'] = 2
3430
attribs['_new_name'] = {'new-1': u'foo\u1234'.encode('utf-8')}
3431
attribs['_new_parent'] = {'new-1': 'new-0'}
3432
contents = [('new-1', 'symlink', u'bar\u1234'.encode('utf-8'))]
3433
return self.make_records(attribs, contents)
3435
def test_serialize_symlink_creation(self):
3436
self.requireFeature(tests.SymlinkFeature)
3437
tt = self.get_preview()
3438
tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3439
self.assertSerializesTo(self.symlink_creation_records(), tt)
3441
def test_deserialize_symlink_creation(self):
3442
self.requireFeature(tests.SymlinkFeature)
3443
tt = self.get_preview()
3444
tt.deserialize(iter(self.symlink_creation_records()))
3445
abspath = tt._limbo_name('new-1')
3446
foo_content = osutils.readlink(abspath)
3447
self.assertEqual(u'bar\u1234', foo_content)
3449
def make_destruction_preview(self):
3450
tree = self.make_branch_and_tree('.')
3451
self.build_tree([u'foo\u1234', 'bar'])
3452
tree.add([u'foo\u1234', 'bar'], ['foo-id', 'bar-id'])
3453
return self.get_preview(tree)
3455
def destruction_records(self):
3456
attribs = self.default_attribs()
3457
attribs['_id_number'] = 3
3458
attribs['_removed_id'] = ['new-1']
3459
attribs['_removed_contents'] = ['new-2']
3460
attribs['_tree_path_ids'] = {
3462
u'foo\u1234'.encode('utf-8'): 'new-1',
3465
return self.make_records(attribs, [])
3467
def test_serialize_destruction(self):
3468
tt = self.make_destruction_preview()
3469
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
3470
tt.unversion_file(foo_trans_id)
3471
bar_trans_id = tt.trans_id_tree_file_id('bar-id')
3472
tt.delete_contents(bar_trans_id)
3473
self.assertSerializesTo(self.destruction_records(), tt)
3475
def test_deserialize_destruction(self):
3476
tt = self.make_destruction_preview()
3477
tt.deserialize(iter(self.destruction_records()))
3478
self.assertEqual({u'foo\u1234': 'new-1',
3480
'': tt.root}, tt._tree_path_ids)
3481
self.assertEqual({'new-1': u'foo\u1234',
3483
tt.root: ''}, tt._tree_id_paths)
3484
self.assertEqual(set(['new-1']), tt._removed_id)
3485
self.assertEqual(set(['new-2']), tt._removed_contents)
3487
def missing_records(self):
3488
attribs = self.default_attribs()
3489
attribs['_id_number'] = 2
3490
attribs['_non_present_ids'] = {
3492
return self.make_records(attribs, [])
3494
def test_serialize_missing(self):
3495
tt = self.get_preview()
3496
boo_trans_id = tt.trans_id_file_id('boo')
3497
self.assertSerializesTo(self.missing_records(), tt)
3499
def test_deserialize_missing(self):
3500
tt = self.get_preview()
3501
tt.deserialize(iter(self.missing_records()))
3502
self.assertEqual({'boo': 'new-1'}, tt._non_present_ids)
3504
def make_modification_preview(self):
3505
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3506
LINES_TWO = 'z\nbb\nx\ndd\n'
3507
tree = self.make_branch_and_tree('tree')
3508
self.build_tree_contents([('tree/file', LINES_ONE)])
3509
tree.add('file', 'file-id')
3510
return self.get_preview(tree), LINES_TWO
3512
def modification_records(self):
3513
attribs = self.default_attribs()
3514
attribs['_id_number'] = 2
3515
attribs['_tree_path_ids'] = {
3518
attribs['_removed_contents'] = ['new-1']
3519
contents = [('new-1', 'file',
3520
'i 1\nz\n\nc 0 1 1 1\ni 1\nx\n\nc 0 3 3 1\n')]
3521
return self.make_records(attribs, contents)
3523
def test_serialize_modification(self):
3524
tt, LINES = self.make_modification_preview()
3525
trans_id = tt.trans_id_file_id('file-id')
3526
tt.delete_contents(trans_id)
3527
tt.create_file(LINES, trans_id)
3528
self.assertSerializesTo(self.modification_records(), tt)
3530
def test_deserialize_modification(self):
3531
tt, LINES = self.make_modification_preview()
3532
tt.deserialize(iter(self.modification_records()))
3533
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3535
def make_kind_change_preview(self):
3536
LINES = 'a\nb\nc\nd\n'
3537
tree = self.make_branch_and_tree('tree')
3538
self.build_tree(['tree/foo/'])
3539
tree.add('foo', 'foo-id')
3540
return self.get_preview(tree), LINES
3542
def kind_change_records(self):
3543
attribs = self.default_attribs()
3544
attribs['_id_number'] = 2
3545
attribs['_tree_path_ids'] = {
3548
attribs['_removed_contents'] = ['new-1']
3549
contents = [('new-1', 'file',
3550
'i 4\na\nb\nc\nd\n\n')]
3551
return self.make_records(attribs, contents)
3553
def test_serialize_kind_change(self):
3554
tt, LINES = self.make_kind_change_preview()
3555
trans_id = tt.trans_id_file_id('foo-id')
3556
tt.delete_contents(trans_id)
3557
tt.create_file(LINES, trans_id)
3558
self.assertSerializesTo(self.kind_change_records(), tt)
3560
def test_deserialize_kind_change(self):
3561
tt, LINES = self.make_kind_change_preview()
3562
tt.deserialize(iter(self.kind_change_records()))
3563
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3565
def make_add_contents_preview(self):
3566
LINES = 'a\nb\nc\nd\n'
3567
tree = self.make_branch_and_tree('tree')
3568
self.build_tree(['tree/foo'])
3570
os.unlink('tree/foo')
3571
return self.get_preview(tree), LINES
3573
def add_contents_records(self):
3574
attribs = self.default_attribs()
3575
attribs['_id_number'] = 2
3576
attribs['_tree_path_ids'] = {
3579
contents = [('new-1', 'file',
3580
'i 4\na\nb\nc\nd\n\n')]
3581
return self.make_records(attribs, contents)
3583
def test_serialize_add_contents(self):
3584
tt, LINES = self.make_add_contents_preview()
3585
trans_id = tt.trans_id_tree_path('foo')
3586
tt.create_file(LINES, trans_id)
3587
self.assertSerializesTo(self.add_contents_records(), tt)
3589
def test_deserialize_add_contents(self):
3590
tt, LINES = self.make_add_contents_preview()
3591
tt.deserialize(iter(self.add_contents_records()))
3592
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3594
def test_get_parents_lines(self):
3595
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3596
LINES_TWO = 'z\nbb\nx\ndd\n'
3597
tree = self.make_branch_and_tree('tree')
3598
self.build_tree_contents([('tree/file', LINES_ONE)])
3599
tree.add('file', 'file-id')
3600
tt = self.get_preview(tree)
3601
trans_id = tt.trans_id_tree_path('file')
3602
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3603
tt._get_parents_lines(trans_id))
3605
def test_get_parents_texts(self):
3606
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3607
LINES_TWO = 'z\nbb\nx\ndd\n'
3608
tree = self.make_branch_and_tree('tree')
3609
self.build_tree_contents([('tree/file', LINES_ONE)])
3610
tree.add('file', 'file-id')
3611
tt = self.get_preview(tree)
3612
trans_id = tt.trans_id_tree_path('file')
3613
self.assertEqual((LINES_ONE,),
3614
tt._get_parents_texts(trans_id))
3617
class TestOrphan(tests.TestCaseWithTransport):
3619
def test_no_orphan_for_transform_preview(self):
3620
tree = self.make_branch_and_tree('tree')
3621
tt = transform.TransformPreview(tree)
3622
self.addCleanup(tt.finalize)
3623
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3625
def _set_orphan_policy(self, wt, policy):
3626
wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
3629
def _prepare_orphan(self, wt):
3630
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3631
wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
3632
wt.commit('add dir and file ignoring foo')
3633
tt = transform.TreeTransform(wt)
3634
self.addCleanup(tt.finalize)
3635
# dir and bar are deleted
3636
dir_tid = tt.trans_id_tree_path('dir')
3637
file_tid = tt.trans_id_tree_path('dir/file')
3638
orphan_tid = tt.trans_id_tree_path('dir/foo')
3639
tt.delete_contents(file_tid)
3640
tt.unversion_file(file_tid)
3641
tt.delete_contents(dir_tid)
3642
tt.unversion_file(dir_tid)
3643
# There should be a conflict because dir still contain foo
3644
raw_conflicts = tt.find_conflicts()
3645
self.assertLength(1, raw_conflicts)
3646
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3647
return tt, orphan_tid
3649
def test_new_orphan_created(self):
3650
wt = self.make_branch_and_tree('.')
3651
self._set_orphan_policy(wt, 'move')
3652
tt, orphan_tid = self._prepare_orphan(wt)
3655
warnings.append(args[0] % args[1:])
3656
self.overrideAttr(trace, 'warning', warning)
3657
remaining_conflicts = resolve_conflicts(tt)
3658
self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
3660
# Yeah for resolved conflicts !
3661
self.assertLength(0, remaining_conflicts)
3662
# We have a new orphan
3663
self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
3664
self.assertEquals('bzr-orphans',
3665
tt.final_name(tt.final_parent(orphan_tid)))
3667
def test_never_orphan(self):
3668
wt = self.make_branch_and_tree('.')
3669
self._set_orphan_policy(wt, 'conflict')
3670
tt, orphan_tid = self._prepare_orphan(wt)
3671
remaining_conflicts = resolve_conflicts(tt)
3672
self.assertLength(1, remaining_conflicts)
3673
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3674
remaining_conflicts.pop())
3676
def test_orphan_error(self):
3677
def bogus_orphan(tt, orphan_id, parent_id):
3678
raise transform.OrphaningError(tt.final_name(orphan_id),
3679
tt.final_name(parent_id))
3680
transform.orphaning_registry.register('bogus', bogus_orphan,
3681
'Raise an error when orphaning')
3682
wt = self.make_branch_and_tree('.')
3683
self._set_orphan_policy(wt, 'bogus')
3684
tt, orphan_tid = self._prepare_orphan(wt)
3685
remaining_conflicts = resolve_conflicts(tt)
3686
self.assertLength(1, remaining_conflicts)
3687
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3688
remaining_conflicts.pop())
3690
def test_unknown_orphan_policy(self):
3691
wt = self.make_branch_and_tree('.')
3692
# Set a fictional policy nobody ever implemented
3693
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3694
tt, orphan_tid = self._prepare_orphan(wt)
3697
warnings.append(args[0] % args[1:])
3698
self.overrideAttr(trace, 'warning', warning)
3699
remaining_conflicts = resolve_conflicts(tt)
3700
# We fallback to the default policy which create a conflict
3701
self.assertLength(1, remaining_conflicts)
3702
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3703
remaining_conflicts.pop())
3704
self.assertLength(1, warnings)
3705
self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')
1138
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
1139
self.assertEqual(name, 'name.~1~')
1140
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
1141
self.assertEqual(name, 'name.~2~')
1142
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
1143
self.assertEqual(name, 'name.~1~')
1144
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
1145
self.assertEqual(name, 'name.~1~')
1146
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
1147
self.assertEqual(name, 'name.~4~')
added
removed
bzrlib/tests/test_transform.py
