29
29
revision as _mod_revision,
34
37
from bzrlib.bzrdir import BzrDir
35
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
36
UnversionedParent, ParentLoop, DeletingParent,
38
from bzrlib.conflicts import (
38
47
from bzrlib.diff import show_diff_trees
39
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
40
ReusingTransform, CantMoveRoot,
41
PathsNotVersionedError, ExistingLimbo,
42
ExistingPendingDeletion, ImmortalLimbo,
43
ImmortalPendingDeletion, LockError)
44
from bzrlib.osutils import file_kind, pathjoin
48
from bzrlib.errors import (
51
ExistingPendingDeletion,
53
ImmortalPendingDeletion,
58
from bzrlib.osutils import (
45
62
from bzrlib.merge import Merge3Merger, Merger
46
63
from bzrlib.tests import (
53
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
54
resolve_conflicts, cook_conflicts,
55
build_tree, get_backup_name,
56
_FileMover, resolve_checkout,
57
TransformPreview, create_from_tree)
70
from bzrlib.transform import (
60
84
class TestTreeTransform(tests.TestCaseWithTransport):
137
171
transform.finalize()
138
172
transform.finalize()
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',
179
orig = self.wt._observed_sha1
180
def _observed_sha1(*args):
183
self.wt._observed_sha1 = _observed_sha1
185
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
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)
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))
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)
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',
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)
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',
231
self.assertTrue(trans_id in trans._observed_sha1s)
232
trans.cancel_creation(trans_id)
233
self.assertFalse(trans_id in trans._observed_sha1s)
140
235
def test_create_files_same_timestamp(self):
141
236
transform, root = self.get_transform()
142
237
self.wt.lock_tree_write()
190
285
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
191
286
self.assertRaises(ValueError, transform.fixup_new_roots)
288
def test_retain_existing_root(self):
289
tt, root = self.get_transform()
291
tt.new_directory('', ROOT_PARENT, 'new-root-id')
293
self.assertNotEqual('new-root-id', tt.final_file_id(tt.root))
295
def test_retain_existing_root_added_file(self):
296
tt, root = self.get_transform()
297
new_trans_id = tt.new_directory('', ROOT_PARENT, 'new-root-id')
298
child = tt.new_directory('child', new_trans_id, 'child-id')
300
self.assertEqual(tt.root, tt.final_parent(child))
302
def test_add_unversioned_root(self):
303
transform, root = self.get_transform()
304
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
305
transform.delete_contents(transform.root)
306
transform.fixup_new_roots()
307
self.assertNotIn(transform.root, transform._new_id)
309
def test_remove_root_fixup(self):
310
transform, root = self.get_transform()
311
old_root_id = self.wt.get_root_id()
312
self.assertNotEqual('new-root-id', old_root_id)
313
transform.delete_contents(root)
314
transform.unversion_file(root)
315
transform.fixup_new_roots()
317
self.assertEqual(old_root_id, self.wt.get_root_id())
319
transform, root = self.get_transform()
320
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
321
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
322
self.assertRaises(ValueError, transform.fixup_new_roots)
324
def test_apply_retains_root_directory(self):
325
# Do not attempt to delete the physical root directory, because that
327
transform, root = self.get_transform()
329
transform.delete_contents(root)
330
e = self.assertRaises(AssertionError, self.assertRaises,
331
errors.TransformRenameFailed,
333
self.assertContainsRe('TransformRenameFailed not raised', str(e))
193
335
def test_hardlink(self):
194
336
self.requireFeature(HardlinkFeature)
195
337
transform, root = self.get_transform()
830
987
rename.set_executability(True, myfile)
990
def test_rename_fails(self):
991
self.requireFeature(features.not_running_as_root)
992
# see https://bugs.launchpad.net/bzr/+bug/491763
993
create, root_id = self.get_transform()
994
first_dir = create.new_directory('first-dir', root_id, 'first-id')
995
myfile = create.new_file('myfile', root_id, 'myfile-text',
998
if os.name == "posix" and sys.platform != "cygwin":
999
# posix filesystems fail on renaming if the readonly bit is set
1000
osutils.make_readonly(self.wt.abspath('first-dir'))
1001
elif os.name == "nt":
1002
# windows filesystems fail on renaming open files
1003
self.addCleanup(file(self.wt.abspath('myfile')).close)
1005
self.skip("Don't know how to force a permissions error on rename")
1006
# now transform to rename
1007
rename_transform, root_id = self.get_transform()
1008
file_trans_id = rename_transform.trans_id_file_id('myfile-id')
1009
dir_id = rename_transform.trans_id_file_id('first-id')
1010
rename_transform.adjust_path('newname', dir_id, file_trans_id)
1011
e = self.assertRaises(errors.TransformRenameFailed,
1012
rename_transform.apply)
1013
# On nix looks like:
1014
# "Failed to rename .../work/.bzr/checkout/limbo/new-1
1015
# to .../first-dir/newname: [Errno 13] Permission denied"
1016
# On windows looks like:
1017
# "Failed to rename .../work/myfile to
1018
# .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
1019
# This test isn't concerned with exactly what the error looks like,
1020
# and the strerror will vary across OS and locales, but the assert
1021
# that the exeception attributes are what we expect
1022
self.assertEqual(e.errno, errno.EACCES)
1023
if os.name == "posix":
1024
self.assertEndsWith(e.to_path, "/first-dir/newname")
1026
self.assertEqual(os.path.basename(e.from_path), "myfile")
833
1028
def test_set_executability_order(self):
834
1029
"""Ensure that executability behaves the same, no matter what order.
1451
1646
return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1649
class TestInventoryAltered(tests.TestCaseWithTransport):
1651
def test_inventory_altered_unchanged(self):
1652
tree = self.make_branch_and_tree('tree')
1653
self.build_tree(['tree/foo'])
1654
tree.add('foo', 'foo-id')
1655
with TransformPreview(tree) as tt:
1656
self.assertEqual([], tt._inventory_altered())
1658
def test_inventory_altered_changed_parent_id(self):
1659
tree = self.make_branch_and_tree('tree')
1660
self.build_tree(['tree/foo'])
1661
tree.add('foo', 'foo-id')
1662
with TransformPreview(tree) as tt:
1663
tt.unversion_file(tt.root)
1664
tt.version_file('new-id', tt.root)
1665
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
1666
foo_tuple = ('foo', foo_trans_id)
1667
root_tuple = ('', tt.root)
1668
self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
1670
def test_inventory_altered_noop_changed_parent_id(self):
1671
tree = self.make_branch_and_tree('tree')
1672
self.build_tree(['tree/foo'])
1673
tree.add('foo', 'foo-id')
1674
with TransformPreview(tree) as tt:
1675
tt.unversion_file(tt.root)
1676
tt.version_file(tree.get_root_id(), tt.root)
1677
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
1678
self.assertEqual([], tt._inventory_altered())
1454
1681
class TestTransformMerge(TestCaseInTempDir):
1456
1683
def test_text_merge(self):
1985
2224
self.assertEqual('file.moved', target.id2path('lower-id'))
1986
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])
1989
2264
class TestCommitTransform(tests.TestCaseWithTransport):
2091
2366
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2095
class MockTransform(object):
2097
def has_named_child(self, by_parent, parent_id, name):
2098
for child_id in by_parent[parent_id]:
2102
elif name == "name.~%s~" % child_id:
2107
class MockEntry(object):
2109
object.__init__(self)
2113
class TestGetBackupName(TestCase):
2114
def test_get_backup_name(self):
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)
2115
2416
tt = MockTransform()
2116
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2117
self.assertEqual(name, 'name.~1~')
2118
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2119
self.assertEqual(name, 'name.~2~')
2120
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2121
self.assertEqual(name, 'name.~1~')
2122
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2123
self.assertEqual(name, 'name.~1~')
2124
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2125
self.assertEqual(name, 'name.~4~')
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)
2128
2427
class TestFileMover(tests.TestCaseWithTransport):
2131
2430
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2132
2431
mover = _FileMover()
2133
2432
mover.rename('a', 'q')
2134
self.failUnlessExists('q')
2135
self.failIfExists('a')
2136
self.failUnlessExists('q/b')
2137
self.failUnlessExists('c')
2138
self.failUnlessExists('c/d')
2433
self.assertPathExists('q')
2434
self.assertPathDoesNotExist('a')
2435
self.assertPathExists('q/b')
2436
self.assertPathExists('c')
2437
self.assertPathExists('c/d')
2140
2439
def test_pre_delete_rollback(self):
2141
2440
self.build_tree(['a/'])
2142
2441
mover = _FileMover()
2143
2442
mover.pre_delete('a', 'q')
2144
self.failUnlessExists('q')
2145
self.failIfExists('a')
2443
self.assertPathExists('q')
2444
self.assertPathDoesNotExist('a')
2146
2445
mover.rollback()
2147
self.failIfExists('q')
2148
self.failUnlessExists('a')
2446
self.assertPathDoesNotExist('q')
2447
self.assertPathExists('a')
2150
2449
def test_apply_deletions(self):
2151
2450
self.build_tree(['a/', 'b/'])
2152
2451
mover = _FileMover()
2153
2452
mover.pre_delete('a', 'q')
2154
2453
mover.pre_delete('b', 'r')
2155
self.failUnlessExists('q')
2156
self.failUnlessExists('r')
2157
self.failIfExists('a')
2158
self.failIfExists('b')
2454
self.assertPathExists('q')
2455
self.assertPathExists('r')
2456
self.assertPathDoesNotExist('a')
2457
self.assertPathDoesNotExist('b')
2159
2458
mover.apply_deletions()
2160
self.failIfExists('q')
2161
self.failIfExists('r')
2162
self.failIfExists('a')
2163
self.failIfExists('b')
2459
self.assertPathDoesNotExist('q')
2460
self.assertPathDoesNotExist('r')
2461
self.assertPathDoesNotExist('a')
2462
self.assertPathDoesNotExist('b')
2165
2464
def test_file_mover_rollback(self):
2166
2465
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2240
2539
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2540
self.assertRaises(Bogus, tt.apply,
2242
2541
_mover=self.ExceptionFileMover(bad_target='d'))
2243
self.failUnlessExists('a')
2244
self.failUnlessExists('a/b')
2246
def test_resolve_no_parent(self):
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):
2247
2673
wt = self.make_branch_and_tree('.')
2674
self.build_tree(['dir/',])
2675
wt.add(['dir'], ['dir-id'])
2676
wt.commit('Create dir')
2248
2677
tt = TreeTransform(wt)
2249
2678
self.addCleanup(tt.finalize)
2250
parent = tt.trans_id_file_id('parent-id')
2251
tt.new_file('file', parent, 'Contents')
2252
resolve_conflicts(tt)
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'),
2255
2705
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
2706
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2707
(False, False))
2258
2708
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
('', ''), ('directory', 'directory'), (False, None))
2709
('', ''), ('directory', 'directory'), (False, False))
2262
2712
class TestTransformPreview(tests.TestCaseWithTransport):
3132
3612
trans_id = tt.trans_id_tree_path('file')
3133
3613
self.assertEqual((LINES_ONE,),
3134
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')
added
removed
bzrlib/tests/test_transform.py
