~bzr-pqm/bzr/bzr.dev : contents of bzrlib/tests/test

~bzr-pqm/bzr/bzr.dev : (revision 3126)

1534.7.106 by Aaron Bentley Cleaned up imports, added copyright statements	1	# Copyright (C) 2006 Canonical Ltd
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	2	#
1534.7.106 by Aaron Bentley Cleaned up imports, added copyright statements	3	# This program is free software; you can redistribute it and/or modify
	4	# it under the terms of the GNU General Public License as published by
	5	# the Free Software Foundation; either version 2 of the License, or
	6	# (at your option) any later version.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	7	#
1534.7.106 by Aaron Bentley Cleaned up imports, added copyright statements	8	# This program is distributed in the hope that it will be useful,
	9	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	# GNU General Public License for more details.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	12	#
1534.7.106 by Aaron Bentley Cleaned up imports, added copyright statements	13	# You should have received a copy of the GNU General Public License
	14	# along with this program; if not, write to the Free Software
	15	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	16
	17	import os
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	18	import stat
	19	import sys
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	20
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	21	from bzrlib import (
2090.2.1 by Martin Pool Fix some code which relies on assertions and breaks under python -O	22	errors,
2116.4.1 by John Arbash Meinel Update file and revision id generators.	23	generate_ids,
2255.7.48 by Robert Collins Deprecated and make work with DirState trees 'transform.find_interesting'.	24	symbol_versioning,
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	25	tests,
	26	urlutils,
	27	)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	28	from bzrlib.bzrdir import BzrDir
1534.10.24 by Aaron Bentley Eliminated conflicts_to_strings, made remove_files a ConflictList member	29	from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	30	UnversionedParent, ParentLoop, DeletingParent,)
1534.7.32 by Aaron Bentley Got conflict handling working when conflicts involve existing files	31	from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
1551.7.17 by Aaron Bentley Switch to PathsNotVersioned, accept extra_trees	32	ReusingTransform, CantMoveRoot,
	33	PathsNotVersionedError, ExistingLimbo,
2733.2.11 by Aaron Bentley Detect irregularities with the pending-deletion directory	34	ExistingPendingDeletion, ImmortalLimbo,
	35	ImmortalPendingDeletion, LockError)
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	36	from bzrlib.osutils import file_kind, pathjoin
1534.7.140 by Aaron Bentley Moved the merge stuff into merge.py	37	from bzrlib.merge import Merge3Merger
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	38	from bzrlib.tests import (
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	39	CaseInsensitiveFilesystemFeature,
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	40	SymlinkFeature,
	41	TestCase,
	42	TestCaseInTempDir,
	43	TestSkipped,
	44	)
1534.7.106 by Aaron Bentley Cleaned up imports, added copyright statements	45	from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	46	resolve_conflicts, cook_conflicts,
2625.4.3 by Ian Clatworthy Add a test to ensure the deprecation worked.	47	find_interesting, build_tree, get_backup_name,
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	48	change_entry, _FileMover, resolve_checkout)
1731.1.33 by Aaron Bentley Revert no-special-root changes	49
1534.7.1 by Aaron Bentley Got creation of a versioned file working	50
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	51	class TestTreeTransform(tests.TestCaseWithTransport):
1740.2.4 by Aaron Bentley Update transform tests and docs	52
1534.7.59 by Aaron Bentley Simplified tests	53	def setUp(self):
1534.7.59 by Aaron Bentley Simplified tests	54	super(TestTreeTransform, self).setUp()
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	55	self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
1534.7.161 by Aaron Bentley Used appropriate control_files	56	os.chdir('..')
1534.7.59 by Aaron Bentley Simplified tests	57
	58	def get_transform(self):
	59	transform = TreeTransform(self.wt)
1534.7.100 by Aaron Bentley Fixed path-relative test cases	60	#self.addCleanup(transform.finalize)
1731.1.33 by Aaron Bentley Revert no-special-root changes	61	return transform, transform.root
1534.7.59 by Aaron Bentley Simplified tests	62
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	63	def test_existing_limbo(self):
	64	transform, root = self.get_transform()
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	65	limbo_name = transform._limbodir
	66	deletion_path = transform._deletiondir
1534.7.176 by abentley Fixed up tests for Windows	67	os.mkdir(pathjoin(limbo_name, 'hehe'))
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	68	self.assertRaises(ImmortalLimbo, transform.apply)
	69	self.assertRaises(LockError, self.wt.unlock)
	70	self.assertRaises(ExistingLimbo, self.get_transform)
	71	self.assertRaises(LockError, self.wt.unlock)
1534.7.176 by abentley Fixed up tests for Windows	72	os.rmdir(pathjoin(limbo_name, 'hehe'))
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	73	os.rmdir(limbo_name)
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	74	os.rmdir(deletion_path)
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	75	transform, root = self.get_transform()
	76	transform.apply()
1534.7.59 by Aaron Bentley Simplified tests	77
2733.2.11 by Aaron Bentley Detect irregularities with the pending-deletion directory	78	def test_existing_pending_deletion(self):
	79	transform, root = self.get_transform()
	80	deletion_path = self._limbodir = urlutils.local_path_from_url(
	81	transform._tree._control_files.controlfilename('pending-deletion'))
	82	os.mkdir(pathjoin(deletion_path, 'blocking-directory'))
	83	self.assertRaises(ImmortalPendingDeletion, transform.apply)
	84	self.assertRaises(LockError, self.wt.unlock)
	85	self.assertRaises(ExistingPendingDeletion, self.get_transform)
	86
1534.7.1 by Aaron Bentley Got creation of a versioned file working	87	def test_build(self):
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	88	transform, root = self.get_transform()
	89	self.wt.lock_tree_write()
	90	self.addCleanup(self.wt.unlock)
1534.7.59 by Aaron Bentley Simplified tests	91	self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	92	imaginary_id = transform.trans_id_tree_path('imaginary')
1534.10.32 by Aaron Bentley Test and fix case where name has trailing slash	93	imaginary_id2 = transform.trans_id_tree_path('imaginary/')
	94	self.assertEqual(imaginary_id, imaginary_id2)
1534.7.59 by Aaron Bentley Simplified tests	95	self.assertEqual(transform.get_tree_parent(imaginary_id), root)
	96	self.assertEqual(transform.final_kind(root), 'directory')
	97	self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
	98	trans_id = transform.create_path('name', root)
	99	self.assertIs(transform.final_file_id(trans_id), None)
	100	self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
	101	transform.create_file('contents', trans_id)
	102	transform.set_executability(True, trans_id)
	103	transform.version_file('my_pretties', trans_id)
	104	self.assertRaises(DuplicateKey, transform.version_file,
	105	'my_pretties', trans_id)
	106	self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
	107	self.assertEqual(transform.final_parent(trans_id), root)
	108	self.assertIs(transform.final_parent(root), ROOT_PARENT)
	109	self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
	110	oz_id = transform.create_path('oz', root)
	111	transform.create_directory(oz_id)
	112	transform.version_file('ozzie', oz_id)
	113	trans_id2 = transform.create_path('name2', root)
	114	transform.create_file('contents', trans_id2)
	115	transform.set_executability(False, trans_id2)
	116	transform.version_file('my_pretties2', trans_id2)
1534.7.191 by Aaron Bentley Got transform.apply to list modified paths	117	modified_paths = transform.apply().modified_paths
1534.7.100 by Aaron Bentley Fixed path-relative test cases	118	self.assertEqual('contents', self.wt.get_file_byname('name').read())
1534.7.59 by Aaron Bentley Simplified tests	119	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	120	self.assertIs(self.wt.is_executable('my_pretties'), True)
	121	self.assertIs(self.wt.is_executable('my_pretties2'), False)
1534.7.100 by Aaron Bentley Fixed path-relative test cases	122	self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
1534.7.191 by Aaron Bentley Got transform.apply to list modified paths	123	self.assertEqual(len(modified_paths), 3)
	124	tree_mod_paths = [self.wt.id2abspath(f) for f in
	125	('ozzie', 'my_pretties', 'my_pretties2')]
	126	self.assertSubset(tree_mod_paths, modified_paths)
1534.7.1 by Aaron Bentley Got creation of a versioned file working	127	# is it safe to finalize repeatedly?
	128	transform.finalize()
1534.7.59 by Aaron Bentley Simplified tests	129	transform.finalize()
1534.7.2 by Aaron Bentley Added convenience function	130
1534.7.2 by Aaron Bentley Added convenience function	131	def test_convenience(self):
1534.7.59 by Aaron Bentley Simplified tests	132	transform, root = self.get_transform()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	133	self.wt.lock_tree_write()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	134	self.addCleanup(self.wt.unlock)
1534.7.59 by Aaron Bentley Simplified tests	135	trans_id = transform.new_file('name', root, 'contents',
	136	'my_pretties', True)
	137	oz = transform.new_directory('oz', root, 'oz-id')
	138	dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
	139	toto = transform.new_file('toto', dorothy, 'toto-contents',
	140	'toto-id', False)
	141
	142	self.assertEqual(len(transform.find_conflicts()), 0)
	143	transform.apply()
	144	self.assertRaises(ReusingTransform, transform.find_conflicts)
1534.7.100 by Aaron Bentley Fixed path-relative test cases	145	self.assertEqual('contents', file(self.wt.abspath('name')).read())
1534.7.59 by Aaron Bentley Simplified tests	146	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	147	self.assertIs(self.wt.is_executable('my_pretties'), True)
	148	self.assertEqual(self.wt.path2id('oz'), 'oz-id')
	149	self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
	150	self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
	151
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	152	self.assertEqual('toto-contents',
1534.7.100 by Aaron Bentley Fixed path-relative test cases	153	self.wt.get_file_byname('oz/dorothy/toto').read())
1534.7.59 by Aaron Bentley Simplified tests	154	self.assertIs(self.wt.is_executable('toto-id'), False)
1534.7.6 by Aaron Bentley Added conflict handling	155
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	156	def test_tree_reference(self):
	157	transform, root = self.get_transform()
	158	tree = transform._tree
	159	trans_id = transform.new_directory('reference', root, 'subtree-id')
	160	transform.set_tree_reference('subtree-revision', trans_id)
	161	transform.apply()
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	162	tree.lock_read()
	163	self.addCleanup(tree.unlock)
	164	self.assertEqual('subtree-revision',
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	165	tree.inventory['subtree-id'].reference_revision)
	166
1534.7.6 by Aaron Bentley Added conflict handling	167	def test_conflicts(self):
1534.7.59 by Aaron Bentley Simplified tests	168	transform, root = self.get_transform()
	169	trans_id = transform.new_file('name', root, 'contents',
	170	'my_pretties')
	171	self.assertEqual(len(transform.find_conflicts()), 0)
	172	trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
	173	self.assertEqual(transform.find_conflicts(),
	174	[('duplicate', trans_id, trans_id2, 'name')])
	175	self.assertRaises(MalformedTransform, transform.apply)
	176	transform.adjust_path('name', trans_id, trans_id2)
	177	self.assertEqual(transform.find_conflicts(),
	178	[('non-directory parent', trans_id)])
1534.7.181 by Aaron Bentley Renamed a bunch of functions	179	tinman_id = transform.trans_id_tree_path('tinman')
1534.7.59 by Aaron Bentley Simplified tests	180	transform.adjust_path('name', tinman_id, trans_id2)
	181	self.assertEqual(transform.find_conflicts(),
	182	[('unversioned parent', tinman_id),
	183	('missing parent', tinman_id)])
	184	lion_id = transform.create_path('lion', root)
	185	self.assertEqual(transform.find_conflicts(),
	186	[('unversioned parent', tinman_id),
	187	('missing parent', tinman_id)])
	188	transform.adjust_path('name', lion_id, trans_id2)
	189	self.assertEqual(transform.find_conflicts(),
	190	[('unversioned parent', lion_id),
	191	('missing parent', lion_id)])
	192	transform.version_file("Courage", lion_id)
	193	self.assertEqual(transform.find_conflicts(),
	194	[('missing parent', lion_id),
	195	('versioning no contents', lion_id)])
	196	transform.adjust_path('name2', root, trans_id2)
	197	self.assertEqual(transform.find_conflicts(),
	198	[('versioning no contents', lion_id)])
	199	transform.create_file('Contents, okay?', lion_id)
	200	transform.adjust_path('name2', trans_id2, trans_id2)
	201	self.assertEqual(transform.find_conflicts(),
	202	[('parent loop', trans_id2),
	203	('non-directory parent', trans_id2)])
	204	transform.adjust_path('name2', root, trans_id2)
	205	oz_id = transform.new_directory('oz', root)
	206	transform.set_executability(True, oz_id)
	207	self.assertEqual(transform.find_conflicts(),
	208	[('unversioned executability', oz_id)])
	209	transform.version_file('oz-id', oz_id)
	210	self.assertEqual(transform.find_conflicts(),
	211	[('non-file executability', oz_id)])
	212	transform.set_executability(None, oz_id)
1534.7.71 by abentley All tests pass under Windows	213	tip_id = transform.new_file('tip', oz_id, 'ozma', 'tip-id')
1534.7.59 by Aaron Bentley Simplified tests	214	transform.apply()
	215	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	216	self.assertEqual('contents', file(self.wt.abspath('name')).read())
	217	transform2, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	218	oz_id = transform2.trans_id_tree_file_id('oz-id')
1534.7.59 by Aaron Bentley Simplified tests	219	newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
1534.7.59 by Aaron Bentley Simplified tests	220	result = transform2.find_conflicts()
1534.7.135 by Aaron Bentley Fixed deletion handling	221	fp = FinalPaths(transform2)
1534.7.59 by Aaron Bentley Simplified tests	222	self.assert_('oz/tip' in transform2._tree_path_ids)
1534.7.176 by abentley Fixed up tests for Windows	223	self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
1534.7.59 by Aaron Bentley Simplified tests	224	self.assertEqual(len(result), 2)
	225	self.assertEqual((result[0][0], result[0][1]),
	226	('duplicate', newtip))
	227	self.assertEqual((result[1][0], result[1][2]),
	228	('duplicate id', newtip))
1534.7.73 by Aaron Bentley Changed model again. Now iterator is used immediately.	229	transform2.finalize()
1534.7.59 by Aaron Bentley Simplified tests	230	transform3 = TreeTransform(self.wt)
1534.7.59 by Aaron Bentley Simplified tests	231	self.addCleanup(transform3.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	232	oz_id = transform3.trans_id_tree_file_id('oz-id')
1534.7.59 by Aaron Bentley Simplified tests	233	transform3.delete_contents(oz_id)
	234	self.assertEqual(transform3.find_conflicts(),
	235	[('missing parent', oz_id)])
1731.1.33 by Aaron Bentley Revert no-special-root changes	236	root_id = transform3.root
1534.7.181 by Aaron Bentley Renamed a bunch of functions	237	tip_id = transform3.trans_id_tree_file_id('tip-id')
1534.7.59 by Aaron Bentley Simplified tests	238	transform3.adjust_path('tip', root_id, tip_id)
1534.7.59 by Aaron Bentley Simplified tests	239	transform3.apply()
1534.7.36 by Aaron Bentley Added rename tests	240
3034.4.1 by Aaron Bentley Start handling case-insensitivity	241	def test_conflict_on_case_insensitive(self):
	242	tree = self.make_branch_and_tree('tree')
	243	# Don't try this at home, kids!
	244	# Force the tree to report that it is case sensitive, for conflict
	245	# resolution tests
	246	tree.case_sensitive = True
	247	transform = TreeTransform(tree)
	248	self.addCleanup(transform.finalize)
	249	transform.new_file('file', transform.root, 'content')
	250	transform.new_file('FiLe', transform.root, 'content')
	251	result = transform.find_conflicts()
	252	self.assertEqual([], result)
	253	# Force the tree to report that it is case insensitive, for conflict
	254	# generation tests
	255	tree.case_sensitive = False
	256	result = transform.find_conflicts()
	257	self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
	258
3034.4.7 by Aaron Bentley Add test for filename conflicts with existing files	259	def test_conflict_on_case_insensitive_existing(self):
	260	tree = self.make_branch_and_tree('tree')
	261	self.build_tree(['tree/FiLe'])
	262	# Don't try this at home, kids!
	263	# Force the tree to report that it is case sensitive, for conflict
	264	# resolution tests
	265	tree.case_sensitive = True
	266	transform = TreeTransform(tree)
	267	self.addCleanup(transform.finalize)
	268	transform.new_file('file', transform.root, 'content')
	269	result = transform.find_conflicts()
	270	self.assertEqual([], result)
	271	# Force the tree to report that it is case insensitive, for conflict
	272	# generation tests
	273	tree.case_sensitive = False
	274	result = transform.find_conflicts()
	275	self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
	276
3034.4.1 by Aaron Bentley Start handling case-insensitivity	277	def test_resolve_case_insensitive_conflict(self):
	278	tree = self.make_branch_and_tree('tree')
	279	# Don't try this at home, kids!
	280	# Force the tree to report that it is case insensitive, for conflict
	281	# resolution tests
	282	tree.case_sensitive = False
	283	transform = TreeTransform(tree)
	284	self.addCleanup(transform.finalize)
	285	transform.new_file('file', transform.root, 'content')
	286	transform.new_file('FiLe', transform.root, 'content')
	287	resolve_conflicts(transform)
	288	transform.apply()
	289	self.failUnlessExists('tree/file')
	290	self.failUnlessExists('tree/FiLe.moved')
	291
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	292	def test_resolve_checkout_case_conflict(self):
3034.4.1 by Aaron Bentley Start handling case-insensitivity	293	tree = self.make_branch_and_tree('tree')
	294	# Don't try this at home, kids!
	295	# Force the tree to report that it is case insensitive, for conflict
	296	# resolution tests
	297	tree.case_sensitive = False
	298	transform = TreeTransform(tree)
	299	self.addCleanup(transform.finalize)
	300	transform.new_file('file', transform.root, 'content')
	301	transform.new_file('FiLe', transform.root, 'content')
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	302	resolve_conflicts(transform,
	303	pass_func=lambda t, c: resolve_checkout(t, c, []))
3034.4.1 by Aaron Bentley Start handling case-insensitivity	304	transform.apply()
	305	self.failUnlessExists('tree/file')
	306	self.failUnlessExists('tree/FiLe.moved')
	307
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	308	def test_apply_case_conflict(self):
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	309	"""Ensure that a transform with case conflicts can always be applied"""
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	310	tree = self.make_branch_and_tree('tree')
	311	transform = TreeTransform(tree)
	312	self.addCleanup(transform.finalize)
	313	transform.new_file('file', transform.root, 'content')
	314	transform.new_file('FiLe', transform.root, 'content')
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	315	dir = transform.new_directory('dir', transform.root)
	316	transform.new_file('dirfile', dir, 'content')
	317	transform.new_file('dirFiLe', dir, 'content')
	318	resolve_conflicts(transform)
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	319	transform.apply()
3034.4.3 by Aaron Bentley Add case-sensitivity handling to WorkingTree	320	self.failUnlessExists('tree/file')
	321	if not os.path.exists('tree/FiLe.moved'):
	322	self.failUnlessExists('tree/FiLe')
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	323	self.failUnlessExists('tree/dir/dirfile')
	324	if not os.path.exists('tree/dir/dirFiLe.moved'):
	325	self.failUnlessExists('tree/dir/dirFiLe')
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	326
3034.4.1 by Aaron Bentley Start handling case-insensitivity	327	def test_case_insensitive_limbo(self):
	328	tree = self.make_branch_and_tree('tree')
	329	# Don't try this at home, kids!
	330	# Force the tree to report that it is case insensitive
	331	tree.case_sensitive = False
	332	transform = TreeTransform(tree)
	333	self.addCleanup(transform.finalize)
	334	dir = transform.new_directory('dir', transform.root)
	335	first = transform.new_file('file', dir, 'content')
	336	second = transform.new_file('FiLe', dir, 'content')
	337	self.assertContainsRe(transform._limbo_name(first), 'new-1/file')
	338	self.assertNotContainsRe(transform._limbo_name(second), 'new-1/FiLe')
	339
1558.7.11 by Aaron Bentley Avoid spurious conflict on add/delete	340	def test_add_del(self):
	341	start, root = self.get_transform()
	342	start.new_directory('a', root, 'a')
	343	start.apply()
	344	transform, root = self.get_transform()
	345	transform.delete_versioned(transform.trans_id_tree_file_id('a'))
	346	transform.new_directory('a', root, 'a')
	347	transform.apply()
	348
1534.7.46 by Aaron Bentley Ensured a conflict when parents of versioned files are unversioned	349	def test_unversioning(self):
1534.7.59 by Aaron Bentley Simplified tests	350	create_tree, root = self.get_transform()
	351	parent_id = create_tree.new_directory('parent', root, 'parent-id')
	352	create_tree.new_file('child', parent_id, 'child', 'child-id')
	353	create_tree.apply()
	354	unversion = TreeTransform(self.wt)
	355	self.addCleanup(unversion.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	356	parent = unversion.trans_id_tree_path('parent')
1534.7.59 by Aaron Bentley Simplified tests	357	unversion.unversion_file(parent)
	358	self.assertEqual(unversion.find_conflicts(),
	359	[('unversioned parent', parent_id)])
1534.7.181 by Aaron Bentley Renamed a bunch of functions	360	file_id = unversion.trans_id_tree_file_id('child-id')
1534.7.59 by Aaron Bentley Simplified tests	361	unversion.unversion_file(file_id)
1534.7.59 by Aaron Bentley Simplified tests	362	unversion.apply()
1534.7.46 by Aaron Bentley Ensured a conflict when parents of versioned files are unversioned	363
1534.7.36 by Aaron Bentley Added rename tests	364	def test_name_invariants(self):
1534.7.59 by Aaron Bentley Simplified tests	365	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	366	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	367	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	368	create_tree.new_file('name1', root, 'hello1', 'name1')
	369	create_tree.new_file('name2', root, 'hello2', 'name2')
	370	ddir = create_tree.new_directory('dying_directory', root, 'ddir')
	371	create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
	372	create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
	373	create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
	374	create_tree.apply()
	375
	376	mangle_tree,root = self.get_transform()
1731.1.33 by Aaron Bentley Revert no-special-root changes	377	root = mangle_tree.root
1534.7.59 by Aaron Bentley Simplified tests	378	#swap names
1534.7.181 by Aaron Bentley Renamed a bunch of functions	379	name1 = mangle_tree.trans_id_tree_file_id('name1')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	380	name2 = mangle_tree.trans_id_tree_file_id('name2')
1534.7.59 by Aaron Bentley Simplified tests	381	mangle_tree.adjust_path('name2', root, name1)
	382	mangle_tree.adjust_path('name1', root, name2)
	383
	384	#tests for deleting parent directories
1534.7.181 by Aaron Bentley Renamed a bunch of functions	385	ddir = mangle_tree.trans_id_tree_file_id('ddir')
1534.7.59 by Aaron Bentley Simplified tests	386	mangle_tree.delete_contents(ddir)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	387	dfile = mangle_tree.trans_id_tree_file_id('dfile')
1534.7.59 by Aaron Bentley Simplified tests	388	mangle_tree.delete_versioned(dfile)
1534.7.59 by Aaron Bentley Simplified tests	389	mangle_tree.unversion_file(dfile)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	390	mfile = mangle_tree.trans_id_tree_file_id('mfile')
1534.7.59 by Aaron Bentley Simplified tests	391	mangle_tree.adjust_path('mfile', root, mfile)
	392
	393	#tests for adding parent directories
	394	newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	395	mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
1534.7.59 by Aaron Bentley Simplified tests	396	mangle_tree.adjust_path('mfile2', newdir, mfile2)
	397	mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
	398	self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
	399	self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
	400	self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
	401	mangle_tree.apply()
	402	self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
	403	self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
1534.7.176 by abentley Fixed up tests for Windows	404	mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
1534.7.41 by Aaron Bentley Got inventory ID movement working	405	self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
1534.7.38 by Aaron Bentley Tested adding paths	406	self.assertEqual(file(mfile2_path).read(), 'later2')
1534.7.59 by Aaron Bentley Simplified tests	407	self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
1534.7.59 by Aaron Bentley Simplified tests	408	self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
1534.7.176 by abentley Fixed up tests for Windows	409	newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
1534.7.38 by Aaron Bentley Tested adding paths	410	self.assertEqual(file(newfile_path).read(), 'hello3')
1534.7.59 by Aaron Bentley Simplified tests	411	self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
1534.7.59 by Aaron Bentley Simplified tests	412	self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
1534.7.176 by abentley Fixed up tests for Windows	413	mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
1534.7.43 by abentley Fixed some Windows bugs, introduced a conflicts bug	414
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	415	def test_both_rename(self):
	416	create_tree,root = self.get_transform()
	417	newdir = create_tree.new_directory('selftest', root, 'selftest-id')
	418	create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
	419	create_tree.apply()
	420	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	421	selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	422	blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	423	mangle_tree.adjust_path('test', root, selftest)
	424	mangle_tree.adjust_path('test_too_much', root, selftest)
	425	mangle_tree.set_executability(True, blackbox)
	426	mangle_tree.apply()
	427
	428	def test_both_rename2(self):
	429	create_tree,root = self.get_transform()
	430	bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
	431	tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
	432	blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
	433	create_tree.new_file('test_too_much.py', blackbox, 'hello1',
	434	'test_too_much-id')
	435	create_tree.apply()
	436	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	437	bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
	438	tests = mangle_tree.trans_id_tree_file_id('tests-id')
	439	test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	440	mangle_tree.adjust_path('selftest', bzrlib, tests)
	441	mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
	442	mangle_tree.set_executability(True, test_too_much)
	443	mangle_tree.apply()
	444
	445	def test_both_rename3(self):
	446	create_tree,root = self.get_transform()
	447	tests = create_tree.new_directory('tests', root, 'tests-id')
	448	create_tree.new_file('test_too_much.py', tests, 'hello1',
	449	'test_too_much-id')
	450	create_tree.apply()
	451	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	452	tests = mangle_tree.trans_id_tree_file_id('tests-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	453	test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	454	mangle_tree.adjust_path('selftest', root, tests)
	455	mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
	456	mangle_tree.set_executability(True, test_too_much)
	457	mangle_tree.apply()
	458
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	459	def test_move_dangling_ie(self):
1534.7.59 by Aaron Bentley Simplified tests	460	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	461	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	462	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	463	create_tree.new_file('name1', root, 'hello1', 'name1')
	464	create_tree.apply()
	465	delete_contents, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	466	file = delete_contents.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	467	delete_contents.delete_contents(file)
	468	delete_contents.apply()
	469	move_id, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	470	name1 = move_id.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	471	newdir = move_id.new_directory('dir', root, 'newdir')
	472	move_id.adjust_path('name2', newdir, name1)
	473	move_id.apply()
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	474
1534.7.50 by Aaron Bentley Detect duplicate inventory ids	475	def test_replace_dangling_ie(self):
1534.7.59 by Aaron Bentley Simplified tests	476	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	477	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	478	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	479	create_tree.new_file('name1', root, 'hello1', 'name1')
	480	create_tree.apply()
	481	delete_contents = TreeTransform(self.wt)
	482	self.addCleanup(delete_contents.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	483	file = delete_contents.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	484	delete_contents.delete_contents(file)
	485	delete_contents.apply()
	486	delete_contents.finalize()
	487	replace = TreeTransform(self.wt)
	488	self.addCleanup(replace.finalize)
	489	name2 = replace.new_file('name2', root, 'hello2', 'name1')
	490	conflicts = replace.find_conflicts()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	491	name1 = replace.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	492	self.assertEqual(conflicts, [('duplicate id', name1, name2)])
	493	resolve_conflicts(replace)
	494	replace.apply()
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	495
1534.7.43 by abentley Fixed some Windows bugs, introduced a conflicts bug	496	def test_symlinks(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	497	self.requireFeature(SymlinkFeature)
1534.7.59 by Aaron Bentley Simplified tests	498	transform,root = self.get_transform()
	499	oz_id = transform.new_directory('oz', root, 'oz-id')
	500	wizard = transform.new_symlink('wizard', oz_id, 'wizard-target',
	501	'wizard-id')
	502	wiz_id = transform.create_path('wizard2', oz_id)
	503	transform.create_symlink('behind_curtain', wiz_id)
	504	transform.version_file('wiz-id2', wiz_id)
1534.7.71 by abentley All tests pass under Windows	505	transform.set_executability(True, wiz_id)
	506	self.assertEqual(transform.find_conflicts(),
	507	[('non-file executability', wiz_id)])
	508	transform.set_executability(None, wiz_id)
1534.7.59 by Aaron Bentley Simplified tests	509	transform.apply()
1534.7.59 by Aaron Bentley Simplified tests	510	self.assertEqual(self.wt.path2id('oz/wizard'), 'wizard-id')
1534.7.100 by Aaron Bentley Fixed path-relative test cases	511	self.assertEqual(file_kind(self.wt.abspath('oz/wizard')), 'symlink')
	512	self.assertEqual(os.readlink(self.wt.abspath('oz/wizard2')),
	513	'behind_curtain')
	514	self.assertEqual(os.readlink(self.wt.abspath('oz/wizard')),
	515	'wizard-target')
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	516
3006.2.2 by Alexander Belchenko tests added.	517	def test_unable_create_symlink(self):
	518	def tt_helper():
	519	wt = self.make_branch_and_tree('.')
	520	tt = TreeTransform(wt) # TreeTransform obtains write lock
	521	try:
	522	tt.new_symlink('foo', tt.root, 'bar')
	523	tt.apply()
	524	finally:
	525	wt.unlock()
	526	os_symlink = getattr(os, 'symlink', None)
	527	os.symlink = None
	528	try:
	529	err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
	530	self.assertEquals(
	531	"Unable to create symlink 'foo' on this platform",
	532	str(err))
	533	finally:
	534	if os_symlink:
	535	os.symlink = os_symlink
	536
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	537	def get_conflicted(self):
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	538	create,root = self.get_transform()
	539	create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
1534.7.61 by Aaron Bentley Handled parent loops, missing parents, unversioned parents	540	oz = create.new_directory('oz', root, 'oz-id')
	541	create.new_directory('emeraldcity', oz, 'emerald-id')
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	542	create.apply()
	543	conflicts,root = self.get_transform()
1534.7.65 by Aaron Bentley Text cleaup/docs	544	# set up duplicate entry, duplicate id
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	545	new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
	546	'dorothy-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	547	old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	548	oz = conflicts.trans_id_tree_file_id('oz-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	549	# set up DeletedParent parent conflict
1534.7.65 by Aaron Bentley Text cleaup/docs	550	conflicts.delete_versioned(oz)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	551	emerald = conflicts.trans_id_tree_file_id('emerald-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	552	# set up MissingParent conflict
	553	munchkincity = conflicts.trans_id_file_id('munchkincity-id')
	554	conflicts.adjust_path('munchkincity', root, munchkincity)
	555	conflicts.new_directory('auntem', munchkincity, 'auntem-id')
1534.7.65 by Aaron Bentley Text cleaup/docs	556	# set up parent loop
1534.7.61 by Aaron Bentley Handled parent loops, missing parents, unversioned parents	557	conflicts.adjust_path('emeraldcity', emerald, emerald)
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	558	return conflicts, emerald, oz, old_dorothy, new_dorothy
	559
	560	def test_conflict_resolution(self):
	561	conflicts, emerald, oz, old_dorothy, new_dorothy =\
	562	self.get_conflicted()
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	563	resolve_conflicts(conflicts)
	564	self.assertEqual(conflicts.final_name(old_dorothy), 'dorothy.moved')
	565	self.assertIs(conflicts.final_file_id(old_dorothy), None)
	566	self.assertEqual(conflicts.final_name(new_dorothy), 'dorothy')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	567	self.assertEqual(conflicts.final_file_id(new_dorothy), 'dorothy-id')
1534.7.64 by Aaron Bentley Extra testing	568	self.assertEqual(conflicts.final_parent(emerald), oz)
1534.7.63 by Aaron Bentley Ensure transform can be applied after resolution	569	conflicts.apply()
1534.7.62 by Aaron Bentley Fixed moving versioned directories	570
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	571	def test_cook_conflicts(self):
	572	tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
	573	raw_conflicts = resolve_conflicts(tt)
	574	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
1534.10.20 by Aaron Bentley Got all tests passing	575	duplicate = DuplicateEntry('Moved existing file to', 'dorothy.moved',
1534.10.20 by Aaron Bentley Got all tests passing	576	'dorothy', None, 'dorothy-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	577	self.assertEqual(cooked_conflicts[0], duplicate)
1534.10.20 by Aaron Bentley Got all tests passing	578	duplicate_id = DuplicateID('Unversioned existing file',
	579	'dorothy.moved', 'dorothy', None,
	580	'dorothy-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	581	self.assertEqual(cooked_conflicts[1], duplicate_id)
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	582	missing_parent = MissingParent('Created directory', 'munchkincity',
	583	'munchkincity-id')
	584	deleted_parent = DeletingParent('Not deleting', 'oz', 'oz-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	585	self.assertEqual(cooked_conflicts[2], missing_parent)
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	586	unversioned_parent = UnversionedParent('Versioned directory',
	587	'munchkincity',
	588	'munchkincity-id')
	589	unversioned_parent2 = UnversionedParent('Versioned directory', 'oz',
1534.10.20 by Aaron Bentley Got all tests passing	590	'oz-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	591	self.assertEqual(cooked_conflicts[3], unversioned_parent)
1534.10.20 by Aaron Bentley Got all tests passing	592	parent_loop = ParentLoop('Cancelled move', 'oz/emeraldcity',
1534.10.20 by Aaron Bentley Got all tests passing	593	'oz/emeraldcity', 'emerald-id', 'emerald-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	594	self.assertEqual(cooked_conflicts[4], deleted_parent)
	595	self.assertEqual(cooked_conflicts[5], unversioned_parent2)
	596	self.assertEqual(cooked_conflicts[6], parent_loop)
	597	self.assertEqual(len(cooked_conflicts), 7)
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	598	tt.finalize()
	599
	600	def test_string_conflicts(self):
	601	tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
	602	raw_conflicts = resolve_conflicts(tt)
	603	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
	604	tt.finalize()
1534.10.24 by Aaron Bentley Eliminated conflicts_to_strings, made remove_files a ConflictList member	605	conflicts_s = [str(c) for c in cooked_conflicts]
1534.7.171 by Aaron Bentley Implemented stringifying filesystem conflicts	606	self.assertEqual(len(cooked_conflicts), len(conflicts_s))
	607	self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy. '
	608	'Moved existing file to '
	609	'dorothy.moved.')
	610	self.assertEqual(conflicts_s[1], 'Conflict adding id to dorothy. '
	611	'Unversioned existing file '
	612	'dorothy.moved.')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	613	self.assertEqual(conflicts_s[2], 'Conflict adding files to'
	614	' munchkincity. Created directory.')
	615	self.assertEqual(conflicts_s[3], 'Conflict because munchkincity is not'
	616	' versioned, but has versioned'
	617	' children. Versioned directory.')
1551.8.23 by Aaron Bentley Tweaked conflict message to be more understandable	618	self.assertEqualDiff(conflicts_s[4], "Conflict: can't delete oz because it"
	619	" is not empty. Not deleting.")
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	620	self.assertEqual(conflicts_s[5], 'Conflict because oz is not'
	621	' versioned, but has versioned'
	622	' children. Versioned directory.')
	623	self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
1534.7.171 by Aaron Bentley Implemented stringifying filesystem conflicts	624	' oz/emeraldcity. Cancelled move.')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	625
1534.7.62 by Aaron Bentley Fixed moving versioned directories	626	def test_moving_versioned_directories(self):
	627	create, root = self.get_transform()
	628	kansas = create.new_directory('kansas', root, 'kansas-id')
	629	create.new_directory('house', kansas, 'house-id')
	630	create.new_directory('oz', root, 'oz-id')
	631	create.apply()
	632	cyclone, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	633	oz = cyclone.trans_id_tree_file_id('oz-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	634	house = cyclone.trans_id_tree_file_id('house-id')
1534.7.62 by Aaron Bentley Fixed moving versioned directories	635	cyclone.adjust_path('house', oz, house)
	636	cyclone.apply()
1534.7.66 by Aaron Bentley Ensured we don't accidentally move the root directory	637
	638	def test_moving_root(self):
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	639	create, root = self.get_transform()
	640	fun = create.new_directory('fun', root, 'fun-id')
	641	create.new_directory('sun', root, 'sun-id')
	642	create.new_directory('moon', root, 'moon')
	643	create.apply()
1534.7.66 by Aaron Bentley Ensured we don't accidentally move the root directory	644	transform, root = self.get_transform()
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	645	transform.adjust_root_path('oldroot', fun)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	646	new_root=transform.trans_id_tree_path('')
1534.7.69 by Aaron Bentley Got real root moves working	647	transform.version_file('new-root', new_root)
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	648	transform.apply()
1534.7.93 by Aaron Bentley Added text merge test	649
1534.7.114 by Aaron Bentley Added file renaming test case	650	def test_renames(self):
	651	create, root = self.get_transform()
	652	old = create.new_directory('old-parent', root, 'old-id')
	653	intermediate = create.new_directory('intermediate', old, 'im-id')
	654	myfile = create.new_file('myfile', intermediate, 'myfile-text',
	655	'myfile-id')
	656	create.apply()
	657	rename, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	658	old = rename.trans_id_file_id('old-id')
1534.7.114 by Aaron Bentley Added file renaming test case	659	rename.adjust_path('new', root, old)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	660	myfile = rename.trans_id_file_id('myfile-id')
1534.7.114 by Aaron Bentley Added file renaming test case	661	rename.set_executability(True, myfile)
	662	rename.apply()
	663
1534.7.123 by Aaron Bentley Fixed handling of unversioned files	664	def test_find_interesting(self):
	665	create, root = self.get_transform()
	666	wt = create._tree
	667	create.new_file('vfile', root, 'myfile-text', 'myfile-id')
	668	create.new_file('uvfile', root, 'othertext')
	669	create.apply()
2255.7.48 by Robert Collins Deprecated and make work with DirState trees 'transform.find_interesting'.	670	result = self.applyDeprecated(symbol_versioning.zero_fifteen,
	671	find_interesting, wt, wt, ['vfile'])
	672	self.assertEqual(result, set(['myfile-id']))
1534.7.123 by Aaron Bentley Fixed handling of unversioned files	673
1740.2.4 by Aaron Bentley Update transform tests and docs	674	def test_set_executability_order(self):
	675	"""Ensure that executability behaves the same, no matter what order.
	676
	677	- create file and set executability simultaneously
	678	- create file and set executability afterward
	679	- unsetting the executability of a file whose executability has not been
	680	declared should throw an exception (this may happen when a
	681	merge attempts to create a file with a duplicate ID)
	682	"""
	683	transform, root = self.get_transform()
	684	wt = transform._tree
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	685	wt.lock_read()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	686	self.addCleanup(wt.unlock)
1740.2.4 by Aaron Bentley Update transform tests and docs	687	transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
1740.2.4 by Aaron Bentley Update transform tests and docs	688	True)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	689	sac = transform.new_file('set_after_creation', root,
	690	'Set after creation', 'sac')
1740.2.4 by Aaron Bentley Update transform tests and docs	691	transform.set_executability(True, sac)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	692	uws = transform.new_file('unset_without_set', root, 'Unset badly',
	693	'uws')
1740.2.4 by Aaron Bentley Update transform tests and docs	694	self.assertRaises(KeyError, transform.set_executability, None, uws)
	695	transform.apply()
	696	self.assertTrue(wt.is_executable('soc'))
	697	self.assertTrue(wt.is_executable('sac'))
	698
1534.12.2 by Aaron Bentley Added test for preserving file mode	699	def test_preserve_mode(self):
	700	"""File mode is preserved when replacing content"""
	701	if sys.platform == 'win32':
	702	raise TestSkipped('chmod has no effect on win32')
	703	transform, root = self.get_transform()
	704	transform.new_file('file1', root, 'contents', 'file1-id', True)
	705	transform.apply()
	706	self.assertTrue(self.wt.is_executable('file1-id'))
	707	transform, root = self.get_transform()
	708	file1_id = transform.trans_id_tree_file_id('file1-id')
	709	transform.delete_contents(file1_id)
	710	transform.create_file('contents2', file1_id)
	711	transform.apply()
	712	self.assertTrue(self.wt.is_executable('file1-id'))
	713
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	714	def test__set_mode_stats_correctly(self):
	715	"""_set_mode stats to determine file mode."""
	716	if sys.platform == 'win32':
	717	raise TestSkipped('chmod has no effect on win32')
	718
	719	stat_paths = []
	720	real_stat = os.stat
	721	def instrumented_stat(path):
	722	stat_paths.append(path)
	723	return real_stat(path)
	724
	725	transform, root = self.get_transform()
	726
	727	bar1_id = transform.new_file('bar', root, 'bar contents 1\n',
	728	file_id='bar-id-1', executable=False)
	729	transform.apply()
	730
	731	transform, root = self.get_transform()
	732	bar1_id = transform.trans_id_tree_path('bar')
	733	bar2_id = transform.trans_id_tree_path('bar2')
	734	try:
	735	os.stat = instrumented_stat
	736	transform.create_file('bar2 contents\n', bar2_id, mode_id=bar1_id)
	737	finally:
	738	os.stat = real_stat
	739	transform.finalize()
	740
	741	bar1_abspath = self.wt.abspath('bar')
	742	self.assertEqual([bar1_abspath], stat_paths)
	743
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	744	def test_iter_changes(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	745	self.wt.set_root_id('eert_toor')
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	746	transform, root = self.get_transform()
	747	transform.new_file('old', root, 'blah', 'id-1', True)
	748	transform.apply()
	749	transform, root = self.get_transform()
	750	try:
	751	self.assertEqual([], list(transform._iter_changes()))
	752	old = transform.trans_id_tree_file_id('id-1')
	753	transform.unversion_file(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	754	self.assertEqual([('id-1', ('old', None), False, (True, False),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	755	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	756	(True, True))], list(transform._iter_changes()))
	757	transform.new_directory('new', root, 'id-1')
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	758	self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	759	('eert_toor', 'eert_toor'), ('old', 'new'),
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	760	('file', 'directory'),
	761	(True, False))], list(transform._iter_changes()))
	762	finally:
	763	transform.finalize()
	764
	765	def test_iter_changes_new(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	766	self.wt.set_root_id('eert_toor')
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	767	transform, root = self.get_transform()
	768	transform.new_file('old', root, 'blah')
	769	transform.apply()
	770	transform, root = self.get_transform()
	771	try:
	772	old = transform.trans_id_tree_path('old')
	773	transform.version_file('id-1', old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	774	self.assertEqual([('id-1', (None, 'old'), False, (False, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	775	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	776	(False, False))], list(transform._iter_changes()))
	777	finally:
	778	transform.finalize()
	779
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	780	def test_iter_changes_modifications(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	781	self.wt.set_root_id('eert_toor')
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	782	transform, root = self.get_transform()
	783	transform.new_file('old', root, 'blah', 'id-1')
	784	transform.new_file('new', root, 'blah')
	785	transform.new_directory('subdir', root, 'subdir-id')
	786	transform.apply()
	787	transform, root = self.get_transform()
	788	try:
	789	old = transform.trans_id_tree_path('old')
	790	subdir = transform.trans_id_tree_file_id('subdir-id')
	791	new = transform.trans_id_tree_path('new')
	792	self.assertEqual([], list(transform._iter_changes()))
	793
	794	#content deletion
	795	transform.delete_contents(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	796	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	797	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	798	(False, False))], list(transform._iter_changes()))
	799
	800	#content change
	801	transform.create_file('blah', old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	802	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	803	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	804	(False, False))], list(transform._iter_changes()))
	805	transform.cancel_deletion(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	806	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	807	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	808	(False, False))], list(transform._iter_changes()))
	809	transform.cancel_creation(old)
	810
	811	# move file_id to a different file
	812	self.assertEqual([], list(transform._iter_changes()))
	813	transform.unversion_file(old)
	814	transform.version_file('id-1', new)
	815	transform.adjust_path('old', root, new)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	816	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	817	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	818	(False, False))], list(transform._iter_changes()))
	819	transform.cancel_versioning(new)
	820	transform._removed_id = set()
	821
	822	#execute bit
	823	self.assertEqual([], list(transform._iter_changes()))
	824	transform.set_executability(True, old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	825	self.assertEqual([('id-1', ('old', 'old'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	826	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	827	(False, True))], list(transform._iter_changes()))
	828	transform.set_executability(None, old)
	829
	830	# filename
	831	self.assertEqual([], list(transform._iter_changes()))
	832	transform.adjust_path('new', root, old)
	833	transform._new_parent = {}
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	834	self.assertEqual([('id-1', ('old', 'new'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	835	('eert_toor', 'eert_toor'), ('old', 'new'), ('file', 'file'),
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	836	(False, False))], list(transform._iter_changes()))
	837	transform._new_name = {}
	838
	839	# parent directory
	840	self.assertEqual([], list(transform._iter_changes()))
	841	transform.adjust_path('new', subdir, old)
	842	transform._new_name = {}
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	843	self.assertEqual([('id-1', ('old', 'subdir/old'), False,
2255.2.180 by Martin Pool merge dirstate	844	(True, True), ('eert_toor', 'subdir-id'), ('old', 'old'),
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	845	('file', 'file'), (False, False))],
	846	list(transform._iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	847	transform._new_path = {}
	848
	849	finally:
	850	transform.finalize()
	851
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	852	def test_iter_changes_modified_bleed(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	853	self.wt.set_root_id('eert_toor')
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	854	"""Modified flag should not bleed from one change to another"""
	855	# unfortunately, we have no guarantee that file1 (which is modified)
	856	# will be applied before file2. And if it's applied after file2, it
	857	# obviously can't bleed into file2's change output. But for now, it
	858	# works.
	859	transform, root = self.get_transform()
	860	transform.new_file('file1', root, 'blah', 'id-1')
	861	transform.new_file('file2', root, 'blah', 'id-2')
	862	transform.apply()
	863	transform, root = self.get_transform()
	864	try:
	865	transform.delete_contents(transform.trans_id_file_id('id-1'))
	866	transform.set_executability(True,
	867	transform.trans_id_file_id('id-2'))
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	868	self.assertEqual([('id-1', (u'file1', u'file1'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	869	('eert_toor', 'eert_toor'), ('file1', u'file1'),
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	870	('file', None), (False, False)),
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	871	('id-2', (u'file2', u'file2'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	872	('eert_toor', 'eert_toor'), ('file2', u'file2'),
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	873	('file', 'file'), (False, True))],
	874	list(transform._iter_changes()))
	875	finally:
	876	transform.finalize()
	877
1551.10.37 by Aaron Bentley recommit of TreeTransform._iter_changes fix with missing files	878	def test_iter_changes_move_missing(self):
	879	"""Test moving ids with no files around"""
	880	self.wt.set_root_id('toor_eert')
	881	# Need two steps because versioning a non-existant file is a conflict.
	882	transform, root = self.get_transform()
	883	transform.new_directory('floater', root, 'floater-id')
	884	transform.apply()
	885	transform, root = self.get_transform()
	886	transform.delete_contents(transform.trans_id_tree_path('floater'))
	887	transform.apply()
	888	transform, root = self.get_transform()
	889	floater = transform.trans_id_tree_path('floater')
	890	try:
	891	transform.adjust_path('flitter', root, floater)
	892	self.assertEqual([('floater-id', ('floater', 'flitter'), False,
	893	(True, True), ('toor_eert', 'toor_eert'), ('floater', 'flitter'),
	894	(None, None), (False, False))], list(transform._iter_changes()))
	895	finally:
	896	transform.finalize()
	897
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	898	def test_iter_changes_pointless(self):
	899	"""Ensure that no-ops are not treated as modifications"""
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	900	self.wt.set_root_id('eert_toor')
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	901	transform, root = self.get_transform()
	902	transform.new_file('old', root, 'blah', 'id-1')
	903	transform.new_directory('subdir', root, 'subdir-id')
	904	transform.apply()
	905	transform, root = self.get_transform()
	906	try:
	907	old = transform.trans_id_tree_path('old')
	908	subdir = transform.trans_id_tree_file_id('subdir-id')
	909	self.assertEqual([], list(transform._iter_changes()))
	910	transform.delete_contents(subdir)
	911	transform.create_directory(subdir)
	912	transform.set_executability(False, old)
	913	transform.unversion_file(old)
	914	transform.version_file('id-1', old)
	915	transform.adjust_path('old', root, old)
	916	self.assertEqual([], list(transform._iter_changes()))
	917	finally:
	918	transform.finalize()
1534.7.93 by Aaron Bentley Added text merge test	919
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	920	def test_rename_count(self):
	921	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	922	transform.new_file('name1', root, 'contents')
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	923	self.assertEqual(transform.rename_count, 0)
	924	transform.apply()
	925	self.assertEqual(transform.rename_count, 1)
	926	transform2, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	927	transform2.adjust_path('name2', root,
2502.1.8 by Aaron Bentley Updates from review comments	928	transform2.trans_id_tree_path('name1'))
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	929	self.assertEqual(transform2.rename_count, 0)
	930	transform2.apply()
	931	self.assertEqual(transform2.rename_count, 2)
	932
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	933	def test_change_parent(self):
2502.1.8 by Aaron Bentley Updates from review comments	934	"""Ensure that after we change a parent, the results are still right.
	935
	936	Renames and parent changes on pending transforms can happen as part
	937	of conflict resolution, and are explicitly permitted by the
	938	TreeTransform API.
	939
	940	This test ensures they work correctly with the rename-avoidance
	941	optimization.
	942	"""
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	943	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	944	parent1 = transform.new_directory('parent1', root)
	945	child1 = transform.new_file('child1', parent1, 'contents')
	946	parent2 = transform.new_directory('parent2', root)
	947	transform.adjust_path('child1', parent2, child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	948	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	949	self.failIfExists(self.wt.abspath('parent1/child1'))
	950	self.failUnlessExists(self.wt.abspath('parent2/child1'))
	951	# rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
	952	# no rename for child1 (counting only renames during apply)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	953	self.failUnlessEqual(2, transform.rename_count)
	954
	955	def test_cancel_parent(self):
	956	"""Cancelling a parent doesn't cause deletion of a non-empty directory
	957
	958	This is like the test_change_parent, except that we cancel the parent
	959	before adjusting the path. The transform must detect that the
	960	directory is non-empty, and move children to safe locations.
	961	"""
	962	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	963	parent1 = transform.new_directory('parent1', root)
	964	child1 = transform.new_file('child1', parent1, 'contents')
	965	child2 = transform.new_file('child2', parent1, 'contents')
	966	try:
	967	transform.cancel_creation(parent1)
	968	except OSError:
	969	self.fail('Failed to move child1 before deleting parent1')
	970	transform.cancel_creation(child2)
	971	transform.create_directory(parent1)
	972	try:
	973	transform.cancel_creation(parent1)
	974	# If the transform incorrectly believes that child2 is still in
	975	# parent1's limbo directory, it will try to rename it and fail
	976	# because was already moved by the first cancel_creation.
	977	except OSError:
	978	self.fail('Transform still thinks child2 is a child of parent1')
	979	parent2 = transform.new_directory('parent2', root)
	980	transform.adjust_path('child1', parent2, child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	981	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	982	self.failIfExists(self.wt.abspath('parent1'))
	983	self.failUnlessExists(self.wt.abspath('parent2/child1'))
	984	# rename limbo/new-3 => parent2, rename limbo/new-2 => child1
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	985	self.failUnlessEqual(2, transform.rename_count)
	986
	987	def test_adjust_and_cancel(self):
2502.1.8 by Aaron Bentley Updates from review comments	988	"""Make sure adjust_path keeps track of limbo children properly"""
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	989	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	990	parent1 = transform.new_directory('parent1', root)
	991	child1 = transform.new_file('child1', parent1, 'contents')
	992	parent2 = transform.new_directory('parent2', root)
	993	transform.adjust_path('child1', parent2, child1)
	994	transform.cancel_creation(child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	995	try:
2502.1.8 by Aaron Bentley Updates from review comments	996	transform.cancel_creation(parent1)
	997	# if the transform thinks child1 is still in parent1's limbo
	998	# directory, it will attempt to move it and fail.
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	999	except OSError:
2502.1.8 by Aaron Bentley Updates from review comments	1000	self.fail('Transform still thinks child1 is a child of parent1')
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1001	transform.finalize()
	1002
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1003	def test_noname_contents(self):
2502.1.8 by Aaron Bentley Updates from review comments	1004	"""TreeTransform should permit deferring naming files."""
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1005	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1006	parent = transform.trans_id_file_id('parent-id')
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1007	try:
2502.1.8 by Aaron Bentley Updates from review comments	1008	transform.create_directory(parent)
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1009	except KeyError:
	1010	self.fail("Can't handle contents with no name")
	1011	transform.finalize()
	1012
2502.1.9 by Aaron Bentley Add additional test for no-name contents	1013	def test_noname_contents_nested(self):
	1014	"""TreeTransform should permit deferring naming files."""
	1015	transform, root = self.get_transform()
	1016	parent = transform.trans_id_file_id('parent-id')
	1017	try:
	1018	transform.create_directory(parent)
	1019	except KeyError:
	1020	self.fail("Can't handle contents with no name")
	1021	child = transform.new_directory('child', parent)
	1022	transform.adjust_path('parent', root, parent)
	1023	transform.apply()
	1024	self.failUnlessExists(self.wt.abspath('parent/child'))
	1025	self.assertEqual(1, transform.rename_count)
	1026
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1027	def test_reuse_name(self):
	1028	"""Avoid reusing the same limbo name for different files"""
	1029	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1030	parent = transform.new_directory('parent', root)
2502.1.8 by Aaron Bentley Updates from review comments	1031	child1 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1032	try:
2502.1.8 by Aaron Bentley Updates from review comments	1033	child2 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1034	except OSError:
	1035	self.fail('Tranform tried to use the same limbo name twice')
2502.1.8 by Aaron Bentley Updates from review comments	1036	transform.adjust_path('child2', parent, child2)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1037	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1038	# limbo/new-1 => parent, limbo/new-3 => parent/child2
	1039	# child2 is put into top-level limbo because child1 has already
	1040	# claimed the direct limbo path when child2 is created. There is no
	1041	# advantage in renaming files once they're in top-level limbo, except
	1042	# as part of apply.
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1043	self.assertEqual(2, transform.rename_count)
	1044
	1045	def test_reuse_when_first_moved(self):
	1046	"""Don't avoid direct paths when it is safe to use them"""
	1047	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1048	parent = transform.new_directory('parent', root)
	1049	child1 = transform.new_directory('child', parent)
	1050	transform.adjust_path('child1', parent, child1)
	1051	child2 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1052	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1053	# limbo/new-1 => parent
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1054	self.assertEqual(1, transform.rename_count)
	1055
	1056	def test_reuse_after_cancel(self):
	1057	"""Don't avoid direct paths when it is safe to use them"""
	1058	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1059	parent2 = transform.new_directory('parent2', root)
	1060	child1 = transform.new_directory('child1', parent2)
	1061	transform.cancel_creation(parent2)
	1062	transform.create_directory(parent2)
	1063	child2 = transform.new_directory('child1', parent2)
	1064	transform.adjust_path('child2', parent2, child1)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1065	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1066	# limbo/new-1 => parent2, limbo/new-2 => parent2/child1
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1067	self.assertEqual(2, transform.rename_count)
	1068
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1069	def test_finalize_order(self):
2502.1.8 by Aaron Bentley Updates from review comments	1070	"""Finalize must be done in child-to-parent order"""
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1071	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1072	parent = transform.new_directory('parent', root)
2502.1.8 by Aaron Bentley Updates from review comments	1073	child = transform.new_directory('child', parent)
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1074	try:
	1075	transform.finalize()
	1076	except OSError:
2502.1.8 by Aaron Bentley Updates from review comments	1077	self.fail('Tried to remove parent before child1')
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1078
2502.1.13 by Aaron Bentley Updates from review	1079	def test_cancel_with_cancelled_child_should_succeed(self):
2502.1.12 by Aaron Bentley Avoid renaming children with no content	1080	transform, root = self.get_transform()
	1081	parent = transform.new_directory('parent', root)
	1082	child = transform.new_directory('child', parent)
	1083	transform.cancel_creation(child)
2502.1.13 by Aaron Bentley Updates from review	1084	transform.cancel_creation(parent)
2502.1.12 by Aaron Bentley Avoid renaming children with no content	1085	transform.finalize()
	1086
2625.4.3 by Ian Clatworthy Add a test to ensure the deprecation worked.	1087	def test_change_entry(self):
2687.2.2 by Martin Pool Fix up other references to 0.19	1088	txt = 'bzrlib.transform.change_entry was deprecated in version 0.90.'
2625.4.3 by Ian Clatworthy Add a test to ensure the deprecation worked.	1089	self.callDeprecated([txt], change_entry, None, None, None, None, None,
	1090	None, None, None)
	1091
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1092	def test_case_insensitive_clash(self):
	1093	self.requireFeature(CaseInsensitiveFilesystemFeature)
	1094	def tt_helper():
	1095	wt = self.make_branch_and_tree('.')
	1096	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1097	try:
	1098	tt.new_file('foo', tt.root, 'bar')
	1099	tt.new_file('Foo', tt.root, 'spam')
3063.1.3 by Aaron Bentley Update for Linux	1100	# Lie to tt that we've already resolved all conflicts.
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1101	tt.apply(no_conflicts=True)
3063.1.3 by Aaron Bentley Update for Linux	1102	except:
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1103	wt.unlock()
3063.1.3 by Aaron Bentley Update for Linux	1104	raise
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1105	err = self.assertRaises(errors.FileExists, tt_helper)
	1106	self.assertContainsRe(str(err),
	1107	"^File exists: .+/foo")
	1108
3063.1.2 by Alexander Belchenko test for two directories clash	1109	def test_two_directories_clash(self):
	1110	def tt_helper():
	1111	wt = self.make_branch_and_tree('.')
	1112	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1113	try:
3063.1.3 by Aaron Bentley Update for Linux	1114	foo_1 = tt.new_directory('foo', tt.root)
	1115	tt.new_directory('bar', foo_1)
	1116	foo_2 = tt.new_directory('foo', tt.root)
	1117	tt.new_directory('baz', foo_2)
	1118	# Lie to tt that we've already resolved all conflicts.
3063.1.2 by Alexander Belchenko test for two directories clash	1119	tt.apply(no_conflicts=True)
3063.1.3 by Aaron Bentley Update for Linux	1120	except:
3063.1.2 by Alexander Belchenko test for two directories clash	1121	wt.unlock()
3063.1.3 by Aaron Bentley Update for Linux	1122	raise
3063.1.2 by Alexander Belchenko test for two directories clash	1123	err = self.assertRaises(errors.FileExists, tt_helper)
	1124	self.assertContainsRe(str(err),
	1125	"^File exists: .+/foo")
	1126
3100.1.1 by Aaron Bentley Fix ImmortalLimbo errors when transforms fail	1127	def test_two_directories_clash_finalize(self):
	1128	def tt_helper():
	1129	wt = self.make_branch_and_tree('.')
	1130	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1131	try:
	1132	foo_1 = tt.new_directory('foo', tt.root)
	1133	tt.new_directory('bar', foo_1)
	1134	foo_2 = tt.new_directory('foo', tt.root)
	1135	tt.new_directory('baz', foo_2)
	1136	# Lie to tt that we've already resolved all conflicts.
	1137	tt.apply(no_conflicts=True)
	1138	except:
	1139	tt.finalize()
	1140	raise
	1141	err = self.assertRaises(errors.FileExists, tt_helper)
	1142	self.assertContainsRe(str(err),
	1143	"^File exists: .+/foo")
	1144
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1145
1534.7.93 by Aaron Bentley Added text merge test	1146	class TransformGroup(object):
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1147
1731.1.33 by Aaron Bentley Revert no-special-root changes	1148	def __init__(self, dirname, root_id):
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1149	self.name = dirname
1534.7.93 by Aaron Bentley Added text merge test	1150	os.mkdir(dirname)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	1151	self.wt = BzrDir.create_standalone_workingtree(dirname)
1731.1.33 by Aaron Bentley Revert no-special-root changes	1152	self.wt.set_root_id(root_id)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	1153	self.b = self.wt.branch
1534.7.93 by Aaron Bentley Added text merge test	1154	self.tt = TreeTransform(self.wt)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	1155	self.root = self.tt.trans_id_tree_file_id(self.wt.get_root_id())
1534.7.93 by Aaron Bentley Added text merge test	1156
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	1157
1534.7.95 by Aaron Bentley Added more text merge tests	1158	def conflict_text(tree, merge):
	1159	template = '%s TREE\n%s%s\n%s%s MERGE-SOURCE\n'
	1160	return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
	1161
1534.7.93 by Aaron Bentley Added text merge test	1162
	1163	class TestTransformMerge(TestCaseInTempDir):
	1164	def test_text_merge(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1165	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1166	base = TransformGroup("base", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1167	base.tt.new_file('a', base.root, 'a\nb\nc\nd\be\n', 'a')
1534.7.95 by Aaron Bentley Added more text merge tests	1168	base.tt.new_file('b', base.root, 'b1', 'b')
	1169	base.tt.new_file('c', base.root, 'c', 'c')
	1170	base.tt.new_file('d', base.root, 'd', 'd')
	1171	base.tt.new_file('e', base.root, 'e', 'e')
	1172	base.tt.new_file('f', base.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1173	base.tt.new_directory('g', base.root, 'g')
1534.7.97 by Aaron Bentley Ensured foo.BASE is a directory if there's a conflict	1174	base.tt.new_directory('h', base.root, 'h')
1534.7.93 by Aaron Bentley Added text merge test	1175	base.tt.apply()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1176	other = TransformGroup("other", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1177	other.tt.new_file('a', other.root, 'y\nb\nc\nd\be\n', 'a')
1534.7.95 by Aaron Bentley Added more text merge tests	1178	other.tt.new_file('b', other.root, 'b2', 'b')
	1179	other.tt.new_file('c', other.root, 'c2', 'c')
	1180	other.tt.new_file('d', other.root, 'd', 'd')
	1181	other.tt.new_file('e', other.root, 'e2', 'e')
	1182	other.tt.new_file('f', other.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1183	other.tt.new_file('g', other.root, 'g', 'g')
1534.7.97 by Aaron Bentley Ensured foo.BASE is a directory if there's a conflict	1184	other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1185	other.tt.new_file('i', other.root, 'h\ni\nj\nk\n', 'i')
1534.7.93 by Aaron Bentley Added text merge test	1186	other.tt.apply()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1187	this = TransformGroup("this", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1188	this.tt.new_file('a', this.root, 'a\nb\nc\nd\bz\n', 'a')
1534.7.95 by Aaron Bentley Added more text merge tests	1189	this.tt.new_file('b', this.root, 'b', 'b')
	1190	this.tt.new_file('c', this.root, 'c', 'c')
	1191	this.tt.new_file('d', this.root, 'd2', 'd')
	1192	this.tt.new_file('e', this.root, 'e2', 'e')
	1193	this.tt.new_file('f', this.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1194	this.tt.new_file('g', this.root, 'g', 'g')
1534.7.97 by Aaron Bentley Ensured foo.BASE is a directory if there's a conflict	1195	this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1196	this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
1534.7.93 by Aaron Bentley Added text merge test	1197	this.tt.apply()
1534.7.93 by Aaron Bentley Added text merge test	1198	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.95 by Aaron Bentley Added more text merge tests	1199	# textual merge
1534.7.93 by Aaron Bentley Added text merge test	1200	self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1534.7.95 by Aaron Bentley Added more text merge tests	1201	# three-way text conflict
	1202	self.assertEqual(this.wt.get_file('b').read(),
	1203	conflict_text('b', 'b2'))
	1204	# OTHER wins
	1205	self.assertEqual(this.wt.get_file('c').read(), 'c2')
	1206	# THIS wins
	1207	self.assertEqual(this.wt.get_file('d').read(), 'd2')
	1208	# Ambigious clean merge
	1209	self.assertEqual(this.wt.get_file('e').read(), 'e2')
	1210	# No change
	1211	self.assertEqual(this.wt.get_file('f').read(), 'f')
1534.7.97 by Aaron Bentley Ensured foo.BASE is a directory if there's a conflict	1212	# Correct correct results when THIS == OTHER
1534.7.96 by Aaron Bentley Tested with BASE as directory	1213	self.assertEqual(this.wt.get_file('g').read(), 'g')
1534.7.97 by Aaron Bentley Ensured foo.BASE is a directory if there's a conflict	1214	# Text conflict when THIS & OTHER are text and BASE is dir
	1215	self.assertEqual(this.wt.get_file('h').read(),
	1216	conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
	1217	self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
	1218	'1\n2\n3\n4\n')
	1219	self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
	1220	'h\ni\nj\nk\n')
	1221	self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1222	self.assertEqual(this.wt.get_file('i').read(),
	1223	conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
	1224	self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
	1225	'1\n2\n3\n4\n')
	1226	self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
	1227	'h\ni\nj\nk\n')
	1228	self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1534.7.192 by Aaron Bentley Record hashes produced by merges	1229	modified = ['a', 'b', 'c', 'h', 'i']
	1230	merge_modified = this.wt.merge_modified()
	1231	self.assertSubset(merge_modified, modified)
	1232	self.assertEqual(len(merge_modified), len(modified))
	1233	file(this.wt.id2abspath('a'), 'wb').write('booga')
	1234	modified.pop(0)
	1235	merge_modified = this.wt.merge_modified()
	1236	self.assertSubset(merge_modified, modified)
	1237	self.assertEqual(len(merge_modified), len(modified))
1558.12.10 by Aaron Bentley Be robust when merge_hash file_id not in inventory	1238	this.wt.remove('b')
2796.1.4 by Aaron Bentley Fix up various test cases	1239	this.wt.revert()
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1240
	1241	def test_file_merge(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1242	self.requireFeature(SymlinkFeature)
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1243	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1244	base = TransformGroup("BASE", root_id)
	1245	this = TransformGroup("THIS", root_id)
	1246	other = TransformGroup("OTHER", root_id)
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1247	for tg in this, base, other:
	1248	tg.tt.new_directory('a', tg.root, 'a')
	1249	tg.tt.new_symlink('b', tg.root, 'b', 'b')
	1250	tg.tt.new_file('c', tg.root, 'c', 'c')
	1251	tg.tt.new_symlink('d', tg.root, tg.name, 'd')
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1252	targets = ((base, 'base-e', 'base-f', None, None),
	1253	(this, 'other-e', 'this-f', 'other-g', 'this-h'),
	1254	(other, 'other-e', None, 'other-g', 'other-h'))
	1255	for tg, e_target, f_target, g_target, h_target in targets:
	1256	for link, target in (('e', e_target), ('f', f_target),
	1257	('g', g_target), ('h', h_target)):
	1258	if target is not None:
	1259	tg.tt.new_symlink(link, tg.root, target, link)
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1260
	1261	for tg in this, base, other:
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1262	tg.tt.apply()
	1263	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
	1264	self.assertIs(os.path.isdir(this.wt.abspath('a')), True)
	1265	self.assertIs(os.path.islink(this.wt.abspath('b')), True)
	1266	self.assertIs(os.path.isfile(this.wt.abspath('c')), True)
	1267	for suffix in ('THIS', 'BASE', 'OTHER'):
	1268	self.assertEqual(os.readlink(this.wt.abspath('d.'+suffix)), suffix)
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1269	self.assertIs(os.path.lexists(this.wt.abspath('d')), False)
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1270	self.assertEqual(this.wt.id2path('d'), 'd.OTHER')
	1271	self.assertEqual(this.wt.id2path('f'), 'f.THIS')
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1272	self.assertEqual(os.readlink(this.wt.abspath('e')), 'other-e')
	1273	self.assertIs(os.path.lexists(this.wt.abspath('e.THIS')), False)
	1274	self.assertIs(os.path.lexists(this.wt.abspath('e.OTHER')), False)
	1275	self.assertIs(os.path.lexists(this.wt.abspath('e.BASE')), False)
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1276	self.assertIs(os.path.lexists(this.wt.abspath('g')), True)
	1277	self.assertIs(os.path.lexists(this.wt.abspath('g.BASE')), False)
	1278	self.assertIs(os.path.lexists(this.wt.abspath('h')), False)
	1279	self.assertIs(os.path.lexists(this.wt.abspath('h.BASE')), False)
	1280	self.assertIs(os.path.lexists(this.wt.abspath('h.THIS')), True)
	1281	self.assertIs(os.path.lexists(this.wt.abspath('h.OTHER')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1282
1534.7.105 by Aaron Bentley Got merge with rename working	1283	def test_filename_merge(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1284	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1285	base = TransformGroup("BASE", root_id)
	1286	this = TransformGroup("THIS", root_id)
	1287	other = TransformGroup("OTHER", root_id)
1534.7.105 by Aaron Bentley Got merge with rename working	1288	base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
	1289	for t in [base, this, other]]
	1290	base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
	1291	for t in [base, this, other]]
	1292	base.tt.new_directory('c', base_a, 'c')
	1293	this.tt.new_directory('c1', this_a, 'c')
	1294	other.tt.new_directory('c', other_b, 'c')
	1295
	1296	base.tt.new_directory('d', base_a, 'd')
	1297	this.tt.new_directory('d1', this_b, 'd')
	1298	other.tt.new_directory('d', other_a, 'd')
	1299
	1300	base.tt.new_directory('e', base_a, 'e')
	1301	this.tt.new_directory('e', this_a, 'e')
	1302	other.tt.new_directory('e1', other_b, 'e')
	1303
	1304	base.tt.new_directory('f', base_a, 'f')
	1305	this.tt.new_directory('f1', this_b, 'f')
	1306	other.tt.new_directory('f1', other_b, 'f')
	1307
	1308	for tg in [this, base, other]:
	1309	tg.tt.apply()
	1310	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.176 by abentley Fixed up tests for Windows	1311	self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
	1312	self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
	1313	self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
	1314	self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
1534.7.105 by Aaron Bentley Got merge with rename working	1315
1534.7.105 by Aaron Bentley Got merge with rename working	1316	def test_filename_merge_conflicts(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1317	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1318	base = TransformGroup("BASE", root_id)
	1319	this = TransformGroup("THIS", root_id)
	1320	other = TransformGroup("OTHER", root_id)
1534.7.105 by Aaron Bentley Got merge with rename working	1321	base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
	1322	for t in [base, this, other]]
	1323	base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
	1324	for t in [base, this, other]]
	1325
	1326	base.tt.new_file('g', base_a, 'g', 'g')
	1327	other.tt.new_file('g1', other_b, 'g1', 'g')
	1328
	1329	base.tt.new_file('h', base_a, 'h', 'h')
	1330	this.tt.new_file('h1', this_b, 'h1', 'h')
	1331
	1332	base.tt.new_file('i', base.root, 'i', 'i')
1534.7.153 by Aaron Bentley Handled test cases involving symlinks	1333	other.tt.new_directory('i1', this_b, 'i')
1534.7.105 by Aaron Bentley Got merge with rename working	1334
	1335	for tg in [this, base, other]:
	1336	tg.tt.apply()
	1337	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
	1338
1534.7.176 by abentley Fixed up tests for Windows	1339	self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1534.7.105 by Aaron Bentley Got merge with rename working	1340	self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1341	self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1534.7.176 by abentley Fixed up tests for Windows	1342	self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1534.7.105 by Aaron Bentley Got merge with rename working	1343	self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1344	self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1534.7.176 by abentley Fixed up tests for Windows	1345	self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1346
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	1347
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1348	class TestBuildTree(tests.TestCaseWithTransport):
	1349
3006.2.2 by Alexander Belchenko tests added.	1350	def test_build_tree_with_symlinks(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1351	self.requireFeature(SymlinkFeature)
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1352	os.mkdir('a')
	1353	a = BzrDir.create_standalone_workingtree('a')
	1354	os.mkdir('a/foo')
	1355	file('a/foo/bar', 'wb').write('contents')
	1356	os.symlink('a/foo/bar', 'a/foo/baz')
	1357	a.add(['foo', 'foo/bar', 'foo/baz'])
	1358	a.commit('initial commit')
	1359	b = BzrDir.create_standalone_workingtree('b')
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	1360	basis = a.basis_tree()
	1361	basis.lock_read()
	1362	self.addCleanup(basis.unlock)
	1363	build_tree(basis, b)
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1364	self.assertIs(os.path.isdir('b/foo'), True)
	1365	self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
	1366	self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1367
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	1368	def test_build_with_references(self):
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	1369	tree = self.make_branch_and_tree('source',
	1370	format='dirstate-with-subtree')
	1371	subtree = self.make_branch_and_tree('source/subtree',
	1372	format='dirstate-with-subtree')
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	1373	tree.add_reference(subtree)
	1374	tree.commit('a revision')
	1375	tree.branch.create_checkout('target')
	1376	self.failUnlessExists('target')
	1377	self.failUnlessExists('target/subtree')
	1378
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1379	def test_file_conflict_handling(self):
	1380	"""Ensure that when building trees, conflict handling is done"""
	1381	source = self.make_branch_and_tree('source')
	1382	target = self.make_branch_and_tree('target')
	1383	self.build_tree(['source/file', 'target/file'])
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1384	source.add('file', 'new-file')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1385	source.commit('added file')
	1386	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1387	self.assertEqual([DuplicateEntry('Moved existing file to',
	1388	'file.moved', 'file', None, 'new-file')],
	1389	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1390	target2 = self.make_branch_and_tree('target2')
	1391	target_file = file('target2/file', 'wb')
	1392	try:
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1393	source_file = file('source/file', 'rb')
	1394	try:
	1395	target_file.write(source_file.read())
	1396	finally:
	1397	source_file.close()
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1398	finally:
	1399	target_file.close()
	1400	build_tree(source.basis_tree(), target2)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1401	self.assertEqual([], target2.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1402
	1403	def test_symlink_conflict_handling(self):
	1404	"""Ensure that when building trees, conflict handling is done"""
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1405	self.requireFeature(SymlinkFeature)
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1406	source = self.make_branch_and_tree('source')
	1407	os.symlink('foo', 'source/symlink')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1408	source.add('symlink', 'new-symlink')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1409	source.commit('added file')
	1410	target = self.make_branch_and_tree('target')
	1411	os.symlink('bar', 'target/symlink')
	1412	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1413	self.assertEqual([DuplicateEntry('Moved existing file to',
	1414	'symlink.moved', 'symlink', None, 'new-symlink')],
	1415	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1416	target = self.make_branch_and_tree('target2')
	1417	os.symlink('foo', 'target2/symlink')
	1418	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1419	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1420
	1421	def test_directory_conflict_handling(self):
	1422	"""Ensure that when building trees, conflict handling is done"""
	1423	source = self.make_branch_and_tree('source')
	1424	target = self.make_branch_and_tree('target')
	1425	self.build_tree(['source/dir1/', 'source/dir1/file', 'target/dir1/'])
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1426	source.add(['dir1', 'dir1/file'], ['new-dir1', 'new-file'])
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1427	source.commit('added file')
	1428	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1429	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1430	self.failUnlessExists('target/dir1/file')
	1431
	1432	# Ensure contents are merged
	1433	target = self.make_branch_and_tree('target2')
	1434	self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
	1435	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1436	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1437	self.failUnlessExists('target2/dir1/file2')
	1438	self.failUnlessExists('target2/dir1/file')
	1439
	1440	# Ensure new contents are suppressed for existing branches
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1441	target = self.make_branch_and_tree('target3')
	1442	self.make_branch('target3/dir1')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1443	self.build_tree(['target3/dir1/file2'])
	1444	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1445	self.failIfExists('target3/dir1/file')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1446	self.failUnlessExists('target3/dir1/file2')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1447	self.failUnlessExists('target3/dir1.diverted/file')
	1448	self.assertEqual([DuplicateEntry('Diverted to',
	1449	'dir1.diverted', 'dir1', 'new-dir1', None)],
	1450	target.conflicts())
	1451
	1452	target = self.make_branch_and_tree('target4')
	1453	self.build_tree(['target4/dir1/'])
	1454	self.make_branch('target4/dir1/file')
	1455	build_tree(source.basis_tree(), target)
	1456	self.failUnlessExists('target4/dir1/file')
	1457	self.assertEqual('directory', file_kind('target4/dir1/file'))
	1458	self.failUnlessExists('target4/dir1/file.diverted')
	1459	self.assertEqual([DuplicateEntry('Diverted to',
	1460	'dir1/file.diverted', 'dir1/file', 'new-file', None)],
	1461	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1462
	1463	def test_mixed_conflict_handling(self):
	1464	"""Ensure that when building trees, conflict handling is done"""
	1465	source = self.make_branch_and_tree('source')
	1466	target = self.make_branch_and_tree('target')
	1467	self.build_tree(['source/name', 'target/name/'])
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1468	source.add('name', 'new-name')
	1469	source.commit('added file')
	1470	build_tree(source.basis_tree(), target)
	1471	self.assertEqual([DuplicateEntry('Moved existing file to',
	1472	'name.moved', 'name', None, 'new-name')], target.conflicts())
	1473
	1474	def test_raises_in_populated(self):
	1475	source = self.make_branch_and_tree('source')
	1476	self.build_tree(['source/name'])
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1477	source.add('name')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1478	source.commit('added name')
	1479	target = self.make_branch_and_tree('target')
	1480	self.build_tree(['target/name'])
	1481	target.add('name')
2090.2.1 by Martin Pool Fix some code which relies on assertions and breaks under python -O	1482	self.assertRaises(errors.WorkingTreeAlreadyPopulated,
	1483	build_tree, source.basis_tree(), target)
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1484
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1485	def test_build_tree_rename_count(self):
	1486	source = self.make_branch_and_tree('source')
	1487	self.build_tree(['source/file1', 'source/dir1/'])
	1488	source.add(['file1', 'dir1'])
	1489	source.commit('add1')
	1490	target1 = self.make_branch_and_tree('target1')
2502.1.6 by Aaron Bentley Update from review comments	1491	transform_result = build_tree(source.basis_tree(), target1)
2502.1.6 by Aaron Bentley Update from review comments	1492	self.assertEqual(2, transform_result.rename_count)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1493
	1494	self.build_tree(['source/dir1/file2'])
	1495	source.add(['dir1/file2'])
	1496	source.commit('add3')
	1497	target2 = self.make_branch_and_tree('target2')
2502.1.6 by Aaron Bentley Update from review comments	1498	transform_result = build_tree(source.basis_tree(), target2)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1499	# children of non-root directories should not be renamed
2502.1.6 by Aaron Bentley Update from review comments	1500	self.assertEqual(2, transform_result.rename_count)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1501
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1502
1534.10.28 by Aaron Bentley Use numbered backup files	1503	class MockTransform(object):
	1504
	1505	def has_named_child(self, by_parent, parent_id, name):
	1506	for child_id in by_parent[parent_id]:
	1507	if child_id == '0':
	1508	if name == "name~":
	1509	return True
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1510	elif name == "name.~%s~" % child_id:
1534.10.28 by Aaron Bentley Use numbered backup files	1511	return True
	1512	return False
	1513
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1514
1534.10.28 by Aaron Bentley Use numbered backup files	1515	class MockEntry(object):
	1516	def __init__(self):
	1517	object.__init__(self)
	1518	self.name = "name"
	1519
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1520
1534.10.28 by Aaron Bentley Use numbered backup files	1521	class TestGetBackupName(TestCase):
	1522	def test_get_backup_name(self):
	1523	tt = MockTransform()
	1524	name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1525	self.assertEqual(name, 'name.~1~')
	1526	name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
	1527	self.assertEqual(name, 'name.~2~')
1534.10.28 by Aaron Bentley Use numbered backup files	1528	name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1529	self.assertEqual(name, 'name.~1~')
1534.10.28 by Aaron Bentley Use numbered backup files	1530	name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1531	self.assertEqual(name, 'name.~1~')
	1532	name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
	1533	self.assertEqual(name, 'name.~4~')
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1534
	1535
	1536	class TestFileMover(tests.TestCaseWithTransport):
	1537
	1538	def test_file_mover(self):
	1539	self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
	1540	mover = _FileMover()
	1541	mover.rename('a', 'q')
	1542	self.failUnlessExists('q')
	1543	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	1544	self.failUnlessExists('q/b')
	1545	self.failUnlessExists('c')
	1546	self.failUnlessExists('c/d')
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1547
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1548	def test_pre_delete_rollback(self):
	1549	self.build_tree(['a/'])
	1550	mover = _FileMover()
	1551	mover.pre_delete('a', 'q')
	1552	self.failUnlessExists('q')
	1553	self.failIfExists('a')
	1554	mover.rollback()
	1555	self.failIfExists('q')
	1556	self.failUnlessExists('a')
	1557
	1558	def test_apply_deletions(self):
2733.2.12 by Aaron Bentley Updates from review	1559	self.build_tree(['a/', 'b/'])
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1560	mover = _FileMover()
	1561	mover.pre_delete('a', 'q')
2733.2.12 by Aaron Bentley Updates from review	1562	mover.pre_delete('b', 'r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1563	self.failUnlessExists('q')
2733.2.12 by Aaron Bentley Updates from review	1564	self.failUnlessExists('r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1565	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	1566	self.failIfExists('b')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1567	mover.apply_deletions()
	1568	self.failIfExists('q')
2733.2.12 by Aaron Bentley Updates from review	1569	self.failIfExists('r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1570	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	1571	self.failIfExists('b')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1572
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1573	def test_file_mover_rollback(self):
	1574	self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
	1575	mover = _FileMover()
	1576	mover.rename('c/d', 'c/f')
	1577	mover.rename('c/e', 'c/d')
	1578	try:
	1579	mover.rename('a', 'c')
3063.1.3 by Aaron Bentley Update for Linux	1580	except errors.FileExists, e:
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1581	mover.rollback()
	1582	self.failUnlessExists('a')
	1583	self.failUnlessExists('c/d')
2733.2.3 by Aaron Bentley Test tranform rollback	1584
	1585
	1586	class Bogus(Exception):
	1587	pass
	1588
	1589
	1590	class TestTransformRollback(tests.TestCaseWithTransport):
	1591
	1592	class ExceptionFileMover(_FileMover):
	1593
2733.2.4 by Aaron Bentley Test transform rollback when renaming into place	1594	def __init__(self, bad_source=None, bad_target=None):
	1595	_FileMover.__init__(self)
	1596	self.bad_source = bad_source
	1597	self.bad_target = bad_target
	1598
2733.2.3 by Aaron Bentley Test tranform rollback	1599	def rename(self, source, target):
2733.2.4 by Aaron Bentley Test transform rollback when renaming into place	1600	if (self.bad_source is not None and
	1601	source.endswith(self.bad_source)):
	1602	raise Bogus
	1603	elif (self.bad_target is not None and
	1604	target.endswith(self.bad_target)):
2733.2.3 by Aaron Bentley Test tranform rollback	1605	raise Bogus
	1606	else:
	1607	_FileMover.rename(self, source, target)
	1608
	1609	def test_rollback_rename(self):
	1610	tree = self.make_branch_and_tree('.')
	1611	self.build_tree(['a/', 'a/b'])
	1612	tt = TreeTransform(tree)
	1613	self.addCleanup(tt.finalize)
	1614	a_id = tt.trans_id_tree_path('a')
	1615	tt.adjust_path('c', tt.root, a_id)
	1616	tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2733.2.4 by Aaron Bentley Test transform rollback when renaming into place	1617	self.assertRaises(Bogus, tt.apply,
	1618	_mover=self.ExceptionFileMover(bad_source='a'))
	1619	self.failUnlessExists('a')
	1620	self.failUnlessExists('a/b')
	1621	tt.apply()
	1622	self.failUnlessExists('c')
	1623	self.failUnlessExists('c/d')
	1624
	1625	def test_rollback_rename_into_place(self):
	1626	tree = self.make_branch_and_tree('.')
	1627	self.build_tree(['a/', 'a/b'])
	1628	tt = TreeTransform(tree)
	1629	self.addCleanup(tt.finalize)
	1630	a_id = tt.trans_id_tree_path('a')
	1631	tt.adjust_path('c', tt.root, a_id)
	1632	tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
	1633	self.assertRaises(Bogus, tt.apply,
	1634	_mover=self.ExceptionFileMover(bad_target='c/d'))
	1635	self.failUnlessExists('a')
	1636	self.failUnlessExists('a/b')
	1637	tt.apply()
	1638	self.failUnlessExists('c')
	1639	self.failUnlessExists('c/d')
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	1640
	1641	def test_rollback_deletion(self):
	1642	tree = self.make_branch_and_tree('.')
	1643	self.build_tree(['a/', 'a/b'])
	1644	tt = TreeTransform(tree)
	1645	self.addCleanup(tt.finalize)
	1646	a_id = tt.trans_id_tree_path('a')
	1647	tt.delete_contents(a_id)
	1648	tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
	1649	self.assertRaises(Bogus, tt.apply,
	1650	_mover=self.ExceptionFileMover(bad_target='d'))
	1651	self.failUnlessExists('a')
	1652	self.failUnlessExists('a/b')
1551.19.6 by Aaron Bentley Revert doesn't crash restoring a file from a deleted directory	1653
	1654	def test_resolve_no_parent(self):
	1655	wt = self.make_branch_and_tree('.')
	1656	tt = TreeTransform(wt)
	1657	self.addCleanup(tt.finalize)
	1658	parent = tt.trans_id_file_id('parent-id')
	1659	tt.new_file('file', parent, 'Contents')
	1660	resolve_conflicts(tt)