/brz/remove-bazaar : contents of bzrlib/tests/test_transform.py at revision 3815.2.7

: (revision 3815.2.7)

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

3566.1.2 by Aaron Bentley Fix copyright dates	1	# Copyright (C) 2006, 2007, 2008 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
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	19	from StringIO import StringIO
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	20	import sys
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	21
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	22	from bzrlib import (
2090.2.1 by Martin Pool Fix some code which relies on assertions and breaks under python -O	23	errors,
2116.4.1 by John Arbash Meinel Update file and revision id generators.	24	generate_ids,
3199.1.4 by Vincent Ladeuil Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview	25	osutils,
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	26	progress,
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	27	revision as _mod_revision,
2255.7.48 by Robert Collins Deprecated and make work with DirState trees 'transform.find_interesting'.	28	symbol_versioning,
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	29	tests,
	30	urlutils,
	31	)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	32	from bzrlib.bzrdir import BzrDir
1534.10.24 by Aaron Bentley Eliminated conflicts_to_strings, made remove_files a ConflictList member	33	from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
3144.4.2 by Aaron Bentley Handle non-directory parent conflicts (abentley, #177390)	34	UnversionedParent, ParentLoop, DeletingParent,
	35	NonDirectoryParent)
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	36	from bzrlib.diff import show_diff_trees
1534.7.32 by Aaron Bentley Got conflict handling working when conflicts involve existing files	37	from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
1551.7.17 by Aaron Bentley Switch to PathsNotVersioned, accept extra_trees	38	ReusingTransform, CantMoveRoot,
	39	PathsNotVersionedError, ExistingLimbo,
2733.2.11 by Aaron Bentley Detect irregularities with the pending-deletion directory	40	ExistingPendingDeletion, ImmortalLimbo,
	41	ImmortalPendingDeletion, LockError)
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	42	from bzrlib.osutils import file_kind, pathjoin
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	43	from bzrlib.merge import Merge3Merger, Merger
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	44	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).	45	CaseInsensitiveFilesystemFeature,
3136.1.1 by Aaron Bentley Add support for hardlinks to TreeTransform	46	HardlinkFeature,
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	47	SymlinkFeature,
	48	TestCase,
	49	TestCaseInTempDir,
	50	TestSkipped,
	51	)
1534.7.106 by Aaron Bentley Cleaned up imports, added copyright statements	52	from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	53	resolve_conflicts, cook_conflicts,
3400.3.6 by Martin Pool Remove code deprecated prior to 1.1 and its tests	54	build_tree, get_backup_name,
	55	_FileMover, resolve_checkout,
3363.17.24 by Aaron Bentley Implement create_by_tree	56	TransformPreview, create_from_tree)
1534.7.1 by Aaron Bentley Got creation of a versioned file working	57
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	58	class TestTreeTransform(tests.TestCaseWithTransport):
1740.2.4 by Aaron Bentley Update transform tests and docs	59
1534.7.59 by Aaron Bentley Simplified tests	60	def setUp(self):
1534.7.59 by Aaron Bentley Simplified tests	61	super(TestTreeTransform, self).setUp()
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	62	self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
1534.7.161 by Aaron Bentley Used appropriate control_files	63	os.chdir('..')
1534.7.59 by Aaron Bentley Simplified tests	64
	65	def get_transform(self):
	66	transform = TreeTransform(self.wt)
3453.2.7 by Aaron Bentley Remove test kipple	67	self.addCleanup(transform.finalize)
1731.1.33 by Aaron Bentley Revert no-special-root changes	68	return transform, transform.root
1534.7.59 by Aaron Bentley Simplified tests	69
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	70	def test_existing_limbo(self):
	71	transform, root = self.get_transform()
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	72	limbo_name = transform._limbodir
	73	deletion_path = transform._deletiondir
1534.7.176 by abentley Fixed up tests for Windows	74	os.mkdir(pathjoin(limbo_name, 'hehe'))
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	75	self.assertRaises(ImmortalLimbo, transform.apply)
	76	self.assertRaises(LockError, self.wt.unlock)
	77	self.assertRaises(ExistingLimbo, self.get_transform)
	78	self.assertRaises(LockError, self.wt.unlock)
1534.7.176 by abentley Fixed up tests for Windows	79	os.rmdir(pathjoin(limbo_name, 'hehe'))
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	80	os.rmdir(limbo_name)
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	81	os.rmdir(deletion_path)
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	82	transform, root = self.get_transform()
	83	transform.apply()
1534.7.59 by Aaron Bentley Simplified tests	84
2733.2.11 by Aaron Bentley Detect irregularities with the pending-deletion directory	85	def test_existing_pending_deletion(self):
	86	transform, root = self.get_transform()
	87	deletion_path = self._limbodir = urlutils.local_path_from_url(
3407.2.8 by Martin Pool Deprecate LockableFiles.controlfilename	88	transform._tree._transport.abspath('pending-deletion'))
2733.2.11 by Aaron Bentley Detect irregularities with the pending-deletion directory	89	os.mkdir(pathjoin(deletion_path, 'blocking-directory'))
	90	self.assertRaises(ImmortalPendingDeletion, transform.apply)
	91	self.assertRaises(LockError, self.wt.unlock)
	92	self.assertRaises(ExistingPendingDeletion, self.get_transform)
	93
1534.7.1 by Aaron Bentley Got creation of a versioned file working	94	def test_build(self):
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	95	transform, root = self.get_transform()
	96	self.wt.lock_tree_write()
	97	self.addCleanup(self.wt.unlock)
1534.7.59 by Aaron Bentley Simplified tests	98	self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	99	imaginary_id = transform.trans_id_tree_path('imaginary')
1534.10.32 by Aaron Bentley Test and fix case where name has trailing slash	100	imaginary_id2 = transform.trans_id_tree_path('imaginary/')
	101	self.assertEqual(imaginary_id, imaginary_id2)
1534.7.59 by Aaron Bentley Simplified tests	102	self.assertEqual(transform.get_tree_parent(imaginary_id), root)
	103	self.assertEqual(transform.final_kind(root), 'directory')
	104	self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
	105	trans_id = transform.create_path('name', root)
	106	self.assertIs(transform.final_file_id(trans_id), None)
	107	self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
	108	transform.create_file('contents', trans_id)
	109	transform.set_executability(True, trans_id)
	110	transform.version_file('my_pretties', trans_id)
	111	self.assertRaises(DuplicateKey, transform.version_file,
	112	'my_pretties', trans_id)
	113	self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
	114	self.assertEqual(transform.final_parent(trans_id), root)
	115	self.assertIs(transform.final_parent(root), ROOT_PARENT)
	116	self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
	117	oz_id = transform.create_path('oz', root)
	118	transform.create_directory(oz_id)
	119	transform.version_file('ozzie', oz_id)
	120	trans_id2 = transform.create_path('name2', root)
	121	transform.create_file('contents', trans_id2)
	122	transform.set_executability(False, trans_id2)
	123	transform.version_file('my_pretties2', trans_id2)
1534.7.191 by Aaron Bentley Got transform.apply to list modified paths	124	modified_paths = transform.apply().modified_paths
1534.7.100 by Aaron Bentley Fixed path-relative test cases	125	self.assertEqual('contents', self.wt.get_file_byname('name').read())
1534.7.59 by Aaron Bentley Simplified tests	126	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	127	self.assertIs(self.wt.is_executable('my_pretties'), True)
	128	self.assertIs(self.wt.is_executable('my_pretties2'), False)
1534.7.100 by Aaron Bentley Fixed path-relative test cases	129	self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
1534.7.191 by Aaron Bentley Got transform.apply to list modified paths	130	self.assertEqual(len(modified_paths), 3)
	131	tree_mod_paths = [self.wt.id2abspath(f) for f in
	132	('ozzie', 'my_pretties', 'my_pretties2')]
	133	self.assertSubset(tree_mod_paths, modified_paths)
1534.7.1 by Aaron Bentley Got creation of a versioned file working	134	# is it safe to finalize repeatedly?
	135	transform.finalize()
1534.7.59 by Aaron Bentley Simplified tests	136	transform.finalize()
1534.7.2 by Aaron Bentley Added convenience function	137
3136.1.1 by Aaron Bentley Add support for hardlinks to TreeTransform	138	def test_hardlink(self):
	139	self.requireFeature(HardlinkFeature)
	140	transform, root = self.get_transform()
	141	transform.new_file('file1', root, 'contents')
	142	transform.apply()
	143	target = self.make_branch_and_tree('target')
	144	target_transform = TreeTransform(target)
	145	trans_id = target_transform.create_path('file1', target_transform.root)
	146	target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
	147	target_transform.apply()
	148	self.failUnlessExists('target/file1')
	149	source_stat = os.stat(self.wt.abspath('file1'))
	150	target_stat = os.stat('target/file1')
	151	self.assertEqual(source_stat, target_stat)
	152
1534.7.2 by Aaron Bentley Added convenience function	153	def test_convenience(self):
1534.7.59 by Aaron Bentley Simplified tests	154	transform, root = self.get_transform()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	155	self.wt.lock_tree_write()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	156	self.addCleanup(self.wt.unlock)
1534.7.59 by Aaron Bentley Simplified tests	157	trans_id = transform.new_file('name', root, 'contents',
	158	'my_pretties', True)
	159	oz = transform.new_directory('oz', root, 'oz-id')
	160	dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
	161	toto = transform.new_file('toto', dorothy, 'toto-contents',
	162	'toto-id', False)
	163
	164	self.assertEqual(len(transform.find_conflicts()), 0)
	165	transform.apply()
	166	self.assertRaises(ReusingTransform, transform.find_conflicts)
1534.7.100 by Aaron Bentley Fixed path-relative test cases	167	self.assertEqual('contents', file(self.wt.abspath('name')).read())
1534.7.59 by Aaron Bentley Simplified tests	168	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	169	self.assertIs(self.wt.is_executable('my_pretties'), True)
	170	self.assertEqual(self.wt.path2id('oz'), 'oz-id')
	171	self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
	172	self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
	173
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	174	self.assertEqual('toto-contents',
1534.7.100 by Aaron Bentley Fixed path-relative test cases	175	self.wt.get_file_byname('oz/dorothy/toto').read())
1534.7.59 by Aaron Bentley Simplified tests	176	self.assertIs(self.wt.is_executable('toto-id'), False)
1534.7.6 by Aaron Bentley Added conflict handling	177
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	178	def test_tree_reference(self):
	179	transform, root = self.get_transform()
	180	tree = transform._tree
	181	trans_id = transform.new_directory('reference', root, 'subtree-id')
	182	transform.set_tree_reference('subtree-revision', trans_id)
	183	transform.apply()
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	184	tree.lock_read()
	185	self.addCleanup(tree.unlock)
	186	self.assertEqual('subtree-revision',
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	187	tree.inventory['subtree-id'].reference_revision)
	188
1534.7.6 by Aaron Bentley Added conflict handling	189	def test_conflicts(self):
1534.7.59 by Aaron Bentley Simplified tests	190	transform, root = self.get_transform()
	191	trans_id = transform.new_file('name', root, 'contents',
	192	'my_pretties')
	193	self.assertEqual(len(transform.find_conflicts()), 0)
	194	trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
	195	self.assertEqual(transform.find_conflicts(),
	196	[('duplicate', trans_id, trans_id2, 'name')])
	197	self.assertRaises(MalformedTransform, transform.apply)
	198	transform.adjust_path('name', trans_id, trans_id2)
	199	self.assertEqual(transform.find_conflicts(),
	200	[('non-directory parent', trans_id)])
1534.7.181 by Aaron Bentley Renamed a bunch of functions	201	tinman_id = transform.trans_id_tree_path('tinman')
1534.7.59 by Aaron Bentley Simplified tests	202	transform.adjust_path('name', tinman_id, trans_id2)
	203	self.assertEqual(transform.find_conflicts(),
	204	[('unversioned parent', tinman_id),
	205	('missing parent', tinman_id)])
	206	lion_id = transform.create_path('lion', root)
	207	self.assertEqual(transform.find_conflicts(),
	208	[('unversioned parent', tinman_id),
	209	('missing parent', tinman_id)])
	210	transform.adjust_path('name', lion_id, trans_id2)
	211	self.assertEqual(transform.find_conflicts(),
	212	[('unversioned parent', lion_id),
	213	('missing parent', lion_id)])
	214	transform.version_file("Courage", lion_id)
	215	self.assertEqual(transform.find_conflicts(),
	216	[('missing parent', lion_id),
	217	('versioning no contents', lion_id)])
	218	transform.adjust_path('name2', root, trans_id2)
	219	self.assertEqual(transform.find_conflicts(),
	220	[('versioning no contents', lion_id)])
	221	transform.create_file('Contents, okay?', lion_id)
	222	transform.adjust_path('name2', trans_id2, trans_id2)
	223	self.assertEqual(transform.find_conflicts(),
	224	[('parent loop', trans_id2),
	225	('non-directory parent', trans_id2)])
	226	transform.adjust_path('name2', root, trans_id2)
	227	oz_id = transform.new_directory('oz', root)
	228	transform.set_executability(True, oz_id)
	229	self.assertEqual(transform.find_conflicts(),
	230	[('unversioned executability', oz_id)])
	231	transform.version_file('oz-id', oz_id)
	232	self.assertEqual(transform.find_conflicts(),
	233	[('non-file executability', oz_id)])
	234	transform.set_executability(None, oz_id)
1534.7.71 by abentley All tests pass under Windows	235	tip_id = transform.new_file('tip', oz_id, 'ozma', 'tip-id')
1534.7.59 by Aaron Bentley Simplified tests	236	transform.apply()
	237	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	238	self.assertEqual('contents', file(self.wt.abspath('name')).read())
	239	transform2, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	240	oz_id = transform2.trans_id_tree_file_id('oz-id')
1534.7.59 by Aaron Bentley Simplified tests	241	newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
1534.7.59 by Aaron Bentley Simplified tests	242	result = transform2.find_conflicts()
1534.7.135 by Aaron Bentley Fixed deletion handling	243	fp = FinalPaths(transform2)
1534.7.59 by Aaron Bentley Simplified tests	244	self.assert_('oz/tip' in transform2._tree_path_ids)
1534.7.176 by abentley Fixed up tests for Windows	245	self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
1534.7.59 by Aaron Bentley Simplified tests	246	self.assertEqual(len(result), 2)
	247	self.assertEqual((result[0][0], result[0][1]),
	248	('duplicate', newtip))
	249	self.assertEqual((result[1][0], result[1][2]),
	250	('duplicate id', newtip))
1534.7.73 by Aaron Bentley Changed model again. Now iterator is used immediately.	251	transform2.finalize()
1534.7.59 by Aaron Bentley Simplified tests	252	transform3 = TreeTransform(self.wt)
1534.7.59 by Aaron Bentley Simplified tests	253	self.addCleanup(transform3.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	254	oz_id = transform3.trans_id_tree_file_id('oz-id')
1534.7.59 by Aaron Bentley Simplified tests	255	transform3.delete_contents(oz_id)
	256	self.assertEqual(transform3.find_conflicts(),
	257	[('missing parent', oz_id)])
1731.1.33 by Aaron Bentley Revert no-special-root changes	258	root_id = transform3.root
1534.7.181 by Aaron Bentley Renamed a bunch of functions	259	tip_id = transform3.trans_id_tree_file_id('tip-id')
1534.7.59 by Aaron Bentley Simplified tests	260	transform3.adjust_path('tip', root_id, tip_id)
1534.7.59 by Aaron Bentley Simplified tests	261	transform3.apply()
1534.7.36 by Aaron Bentley Added rename tests	262
3034.4.1 by Aaron Bentley Start handling case-insensitivity	263	def test_conflict_on_case_insensitive(self):
	264	tree = self.make_branch_and_tree('tree')
	265	# Don't try this at home, kids!
	266	# Force the tree to report that it is case sensitive, for conflict
	267	# resolution tests
	268	tree.case_sensitive = True
	269	transform = TreeTransform(tree)
	270	self.addCleanup(transform.finalize)
	271	transform.new_file('file', transform.root, 'content')
	272	transform.new_file('FiLe', transform.root, 'content')
	273	result = transform.find_conflicts()
	274	self.assertEqual([], result)
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	275	transform.finalize()
3034.4.1 by Aaron Bentley Start handling case-insensitivity	276	# Force the tree to report that it is case insensitive, for conflict
	277	# generation tests
	278	tree.case_sensitive = False
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	279	transform = TreeTransform(tree)
	280	self.addCleanup(transform.finalize)
	281	transform.new_file('file', transform.root, 'content')
	282	transform.new_file('FiLe', transform.root, 'content')
3034.4.1 by Aaron Bentley Start handling case-insensitivity	283	result = transform.find_conflicts()
	284	self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
	285
3034.4.7 by Aaron Bentley Add test for filename conflicts with existing files	286	def test_conflict_on_case_insensitive_existing(self):
	287	tree = self.make_branch_and_tree('tree')
	288	self.build_tree(['tree/FiLe'])
	289	# Don't try this at home, kids!
	290	# Force the tree to report that it is case sensitive, for conflict
	291	# resolution tests
	292	tree.case_sensitive = True
	293	transform = TreeTransform(tree)
	294	self.addCleanup(transform.finalize)
	295	transform.new_file('file', transform.root, 'content')
	296	result = transform.find_conflicts()
	297	self.assertEqual([], result)
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	298	transform.finalize()
3034.4.7 by Aaron Bentley Add test for filename conflicts with existing files	299	# Force the tree to report that it is case insensitive, for conflict
	300	# generation tests
	301	tree.case_sensitive = False
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	302	transform = TreeTransform(tree)
	303	self.addCleanup(transform.finalize)
	304	transform.new_file('file', transform.root, 'content')
3034.4.7 by Aaron Bentley Add test for filename conflicts with existing files	305	result = transform.find_conflicts()
	306	self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
	307
3034.4.1 by Aaron Bentley Start handling case-insensitivity	308	def test_resolve_case_insensitive_conflict(self):
	309	tree = self.make_branch_and_tree('tree')
	310	# Don't try this at home, kids!
	311	# Force the tree to report that it is case insensitive, for conflict
	312	# resolution tests
	313	tree.case_sensitive = False
	314	transform = TreeTransform(tree)
	315	self.addCleanup(transform.finalize)
	316	transform.new_file('file', transform.root, 'content')
	317	transform.new_file('FiLe', transform.root, 'content')
	318	resolve_conflicts(transform)
	319	transform.apply()
	320	self.failUnlessExists('tree/file')
	321	self.failUnlessExists('tree/FiLe.moved')
	322
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	323	def test_resolve_checkout_case_conflict(self):
3034.4.1 by Aaron Bentley Start handling case-insensitivity	324	tree = self.make_branch_and_tree('tree')
	325	# Don't try this at home, kids!
	326	# Force the tree to report that it is case insensitive, for conflict
	327	# resolution tests
	328	tree.case_sensitive = False
	329	transform = TreeTransform(tree)
	330	self.addCleanup(transform.finalize)
	331	transform.new_file('file', transform.root, 'content')
	332	transform.new_file('FiLe', transform.root, 'content')
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	333	resolve_conflicts(transform,
	334	pass_func=lambda t, c: resolve_checkout(t, c, []))
3034.4.1 by Aaron Bentley Start handling case-insensitivity	335	transform.apply()
	336	self.failUnlessExists('tree/file')
	337	self.failUnlessExists('tree/FiLe.moved')
	338
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	339	def test_apply_case_conflict(self):
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	340	"""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	341	tree = self.make_branch_and_tree('tree')
	342	transform = TreeTransform(tree)
	343	self.addCleanup(transform.finalize)
	344	transform.new_file('file', transform.root, 'content')
	345	transform.new_file('FiLe', transform.root, 'content')
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	346	dir = transform.new_directory('dir', transform.root)
	347	transform.new_file('dirfile', dir, 'content')
	348	transform.new_file('dirFiLe', dir, 'content')
	349	resolve_conflicts(transform)
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	350	transform.apply()
3034.4.3 by Aaron Bentley Add case-sensitivity handling to WorkingTree	351	self.failUnlessExists('tree/file')
	352	if not os.path.exists('tree/FiLe.moved'):
	353	self.failUnlessExists('tree/FiLe')
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	354	self.failUnlessExists('tree/dir/dirfile')
	355	if not os.path.exists('tree/dir/dirFiLe.moved'):
	356	self.failUnlessExists('tree/dir/dirFiLe')
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	357
3034.4.1 by Aaron Bentley Start handling case-insensitivity	358	def test_case_insensitive_limbo(self):
	359	tree = self.make_branch_and_tree('tree')
	360	# Don't try this at home, kids!
	361	# Force the tree to report that it is case insensitive
	362	tree.case_sensitive = False
	363	transform = TreeTransform(tree)
	364	self.addCleanup(transform.finalize)
	365	dir = transform.new_directory('dir', transform.root)
	366	first = transform.new_file('file', dir, 'content')
	367	second = transform.new_file('FiLe', dir, 'content')
	368	self.assertContainsRe(transform._limbo_name(first), 'new-1/file')
	369	self.assertNotContainsRe(transform._limbo_name(second), 'new-1/FiLe')
	370
1558.7.11 by Aaron Bentley Avoid spurious conflict on add/delete	371	def test_add_del(self):
	372	start, root = self.get_transform()
	373	start.new_directory('a', root, 'a')
	374	start.apply()
	375	transform, root = self.get_transform()
	376	transform.delete_versioned(transform.trans_id_tree_file_id('a'))
	377	transform.new_directory('a', root, 'a')
	378	transform.apply()
	379
1534.7.46 by Aaron Bentley Ensured a conflict when parents of versioned files are unversioned	380	def test_unversioning(self):
1534.7.59 by Aaron Bentley Simplified tests	381	create_tree, root = self.get_transform()
	382	parent_id = create_tree.new_directory('parent', root, 'parent-id')
	383	create_tree.new_file('child', parent_id, 'child', 'child-id')
	384	create_tree.apply()
	385	unversion = TreeTransform(self.wt)
	386	self.addCleanup(unversion.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	387	parent = unversion.trans_id_tree_path('parent')
1534.7.59 by Aaron Bentley Simplified tests	388	unversion.unversion_file(parent)
	389	self.assertEqual(unversion.find_conflicts(),
	390	[('unversioned parent', parent_id)])
1534.7.181 by Aaron Bentley Renamed a bunch of functions	391	file_id = unversion.trans_id_tree_file_id('child-id')
1534.7.59 by Aaron Bentley Simplified tests	392	unversion.unversion_file(file_id)
1534.7.59 by Aaron Bentley Simplified tests	393	unversion.apply()
1534.7.46 by Aaron Bentley Ensured a conflict when parents of versioned files are unversioned	394
1534.7.36 by Aaron Bentley Added rename tests	395	def test_name_invariants(self):
1534.7.59 by Aaron Bentley Simplified tests	396	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	397	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	398	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	399	create_tree.new_file('name1', root, 'hello1', 'name1')
	400	create_tree.new_file('name2', root, 'hello2', 'name2')
	401	ddir = create_tree.new_directory('dying_directory', root, 'ddir')
	402	create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
	403	create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
	404	create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
	405	create_tree.apply()
	406
	407	mangle_tree,root = self.get_transform()
1731.1.33 by Aaron Bentley Revert no-special-root changes	408	root = mangle_tree.root
1534.7.59 by Aaron Bentley Simplified tests	409	#swap names
1534.7.181 by Aaron Bentley Renamed a bunch of functions	410	name1 = mangle_tree.trans_id_tree_file_id('name1')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	411	name2 = mangle_tree.trans_id_tree_file_id('name2')
1534.7.59 by Aaron Bentley Simplified tests	412	mangle_tree.adjust_path('name2', root, name1)
	413	mangle_tree.adjust_path('name1', root, name2)
	414
	415	#tests for deleting parent directories
1534.7.181 by Aaron Bentley Renamed a bunch of functions	416	ddir = mangle_tree.trans_id_tree_file_id('ddir')
1534.7.59 by Aaron Bentley Simplified tests	417	mangle_tree.delete_contents(ddir)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	418	dfile = mangle_tree.trans_id_tree_file_id('dfile')
1534.7.59 by Aaron Bentley Simplified tests	419	mangle_tree.delete_versioned(dfile)
1534.7.59 by Aaron Bentley Simplified tests	420	mangle_tree.unversion_file(dfile)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	421	mfile = mangle_tree.trans_id_tree_file_id('mfile')
1534.7.59 by Aaron Bentley Simplified tests	422	mangle_tree.adjust_path('mfile', root, mfile)
	423
	424	#tests for adding parent directories
	425	newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	426	mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
1534.7.59 by Aaron Bentley Simplified tests	427	mangle_tree.adjust_path('mfile2', newdir, mfile2)
	428	mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
	429	self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
	430	self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
	431	self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
	432	mangle_tree.apply()
	433	self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
	434	self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
1534.7.176 by abentley Fixed up tests for Windows	435	mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
1534.7.41 by Aaron Bentley Got inventory ID movement working	436	self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
1534.7.38 by Aaron Bentley Tested adding paths	437	self.assertEqual(file(mfile2_path).read(), 'later2')
1534.7.59 by Aaron Bentley Simplified tests	438	self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
1534.7.59 by Aaron Bentley Simplified tests	439	self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
1534.7.176 by abentley Fixed up tests for Windows	440	newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
1534.7.38 by Aaron Bentley Tested adding paths	441	self.assertEqual(file(newfile_path).read(), 'hello3')
1534.7.59 by Aaron Bentley Simplified tests	442	self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
1534.7.59 by Aaron Bentley Simplified tests	443	self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
1534.7.176 by abentley Fixed up tests for Windows	444	mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
1534.7.43 by abentley Fixed some Windows bugs, introduced a conflicts bug	445
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	446	def test_both_rename(self):
	447	create_tree,root = self.get_transform()
	448	newdir = create_tree.new_directory('selftest', root, 'selftest-id')
	449	create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
	450	create_tree.apply()
	451	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	452	selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	453	blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	454	mangle_tree.adjust_path('test', root, selftest)
	455	mangle_tree.adjust_path('test_too_much', root, selftest)
	456	mangle_tree.set_executability(True, blackbox)
	457	mangle_tree.apply()
	458
	459	def test_both_rename2(self):
	460	create_tree,root = self.get_transform()
	461	bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
	462	tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
	463	blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
	464	create_tree.new_file('test_too_much.py', blackbox, 'hello1',
	465	'test_too_much-id')
	466	create_tree.apply()
	467	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	468	bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
	469	tests = mangle_tree.trans_id_tree_file_id('tests-id')
	470	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	471	mangle_tree.adjust_path('selftest', bzrlib, tests)
	472	mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
	473	mangle_tree.set_executability(True, test_too_much)
	474	mangle_tree.apply()
	475
	476	def test_both_rename3(self):
	477	create_tree,root = self.get_transform()
	478	tests = create_tree.new_directory('tests', root, 'tests-id')
	479	create_tree.new_file('test_too_much.py', tests, 'hello1',
	480	'test_too_much-id')
	481	create_tree.apply()
	482	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	483	tests = mangle_tree.trans_id_tree_file_id('tests-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	484	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	485	mangle_tree.adjust_path('selftest', root, tests)
	486	mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
	487	mangle_tree.set_executability(True, test_too_much)
	488	mangle_tree.apply()
	489
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	490	def test_move_dangling_ie(self):
1534.7.59 by Aaron Bentley Simplified tests	491	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	492	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	493	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	494	create_tree.new_file('name1', root, 'hello1', 'name1')
	495	create_tree.apply()
	496	delete_contents, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	497	file = delete_contents.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	498	delete_contents.delete_contents(file)
	499	delete_contents.apply()
	500	move_id, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	501	name1 = move_id.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	502	newdir = move_id.new_directory('dir', root, 'newdir')
	503	move_id.adjust_path('name2', newdir, name1)
	504	move_id.apply()
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	505
1534.7.50 by Aaron Bentley Detect duplicate inventory ids	506	def test_replace_dangling_ie(self):
1534.7.59 by Aaron Bentley Simplified tests	507	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	508	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	509	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	510	create_tree.new_file('name1', root, 'hello1', 'name1')
	511	create_tree.apply()
	512	delete_contents = TreeTransform(self.wt)
	513	self.addCleanup(delete_contents.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	514	file = delete_contents.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	515	delete_contents.delete_contents(file)
	516	delete_contents.apply()
	517	delete_contents.finalize()
	518	replace = TreeTransform(self.wt)
	519	self.addCleanup(replace.finalize)
	520	name2 = replace.new_file('name2', root, 'hello2', 'name1')
	521	conflicts = replace.find_conflicts()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	522	name1 = replace.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	523	self.assertEqual(conflicts, [('duplicate id', name1, name2)])
	524	resolve_conflicts(replace)
	525	replace.apply()
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	526
1534.7.43 by abentley Fixed some Windows bugs, introduced a conflicts bug	527	def test_symlinks(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	528	self.requireFeature(SymlinkFeature)
1534.7.59 by Aaron Bentley Simplified tests	529	transform,root = self.get_transform()
	530	oz_id = transform.new_directory('oz', root, 'oz-id')
	531	wizard = transform.new_symlink('wizard', oz_id, 'wizard-target',
	532	'wizard-id')
	533	wiz_id = transform.create_path('wizard2', oz_id)
	534	transform.create_symlink('behind_curtain', wiz_id)
	535	transform.version_file('wiz-id2', wiz_id)
1534.7.71 by abentley All tests pass under Windows	536	transform.set_executability(True, wiz_id)
	537	self.assertEqual(transform.find_conflicts(),
	538	[('non-file executability', wiz_id)])
	539	transform.set_executability(None, wiz_id)
1534.7.59 by Aaron Bentley Simplified tests	540	transform.apply()
1534.7.59 by Aaron Bentley Simplified tests	541	self.assertEqual(self.wt.path2id('oz/wizard'), 'wizard-id')
1534.7.100 by Aaron Bentley Fixed path-relative test cases	542	self.assertEqual(file_kind(self.wt.abspath('oz/wizard')), 'symlink')
	543	self.assertEqual(os.readlink(self.wt.abspath('oz/wizard2')),
	544	'behind_curtain')
	545	self.assertEqual(os.readlink(self.wt.abspath('oz/wizard')),
	546	'wizard-target')
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	547
3006.2.2 by Alexander Belchenko tests added.	548	def test_unable_create_symlink(self):
	549	def tt_helper():
	550	wt = self.make_branch_and_tree('.')
	551	tt = TreeTransform(wt) # TreeTransform obtains write lock
	552	try:
	553	tt.new_symlink('foo', tt.root, 'bar')
	554	tt.apply()
	555	finally:
	556	wt.unlock()
	557	os_symlink = getattr(os, 'symlink', None)
	558	os.symlink = None
	559	try:
	560	err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
	561	self.assertEquals(
	562	"Unable to create symlink 'foo' on this platform",
	563	str(err))
	564	finally:
	565	if os_symlink:
	566	os.symlink = os_symlink
	567
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	568	def get_conflicted(self):
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	569	create,root = self.get_transform()
	570	create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
1534.7.61 by Aaron Bentley Handled parent loops, missing parents, unversioned parents	571	oz = create.new_directory('oz', root, 'oz-id')
	572	create.new_directory('emeraldcity', oz, 'emerald-id')
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	573	create.apply()
	574	conflicts,root = self.get_transform()
1534.7.65 by Aaron Bentley Text cleaup/docs	575	# set up duplicate entry, duplicate id
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	576	new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
	577	'dorothy-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	578	old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	579	oz = conflicts.trans_id_tree_file_id('oz-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	580	# set up DeletedParent parent conflict
1534.7.65 by Aaron Bentley Text cleaup/docs	581	conflicts.delete_versioned(oz)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	582	emerald = conflicts.trans_id_tree_file_id('emerald-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	583	# set up MissingParent conflict
	584	munchkincity = conflicts.trans_id_file_id('munchkincity-id')
	585	conflicts.adjust_path('munchkincity', root, munchkincity)
	586	conflicts.new_directory('auntem', munchkincity, 'auntem-id')
1534.7.65 by Aaron Bentley Text cleaup/docs	587	# set up parent loop
1534.7.61 by Aaron Bentley Handled parent loops, missing parents, unversioned parents	588	conflicts.adjust_path('emeraldcity', emerald, emerald)
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	589	return conflicts, emerald, oz, old_dorothy, new_dorothy
	590
	591	def test_conflict_resolution(self):
	592	conflicts, emerald, oz, old_dorothy, new_dorothy =\
	593	self.get_conflicted()
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	594	resolve_conflicts(conflicts)
	595	self.assertEqual(conflicts.final_name(old_dorothy), 'dorothy.moved')
	596	self.assertIs(conflicts.final_file_id(old_dorothy), None)
	597	self.assertEqual(conflicts.final_name(new_dorothy), 'dorothy')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	598	self.assertEqual(conflicts.final_file_id(new_dorothy), 'dorothy-id')
1534.7.64 by Aaron Bentley Extra testing	599	self.assertEqual(conflicts.final_parent(emerald), oz)
1534.7.63 by Aaron Bentley Ensure transform can be applied after resolution	600	conflicts.apply()
1534.7.62 by Aaron Bentley Fixed moving versioned directories	601
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	602	def test_cook_conflicts(self):
	603	tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
	604	raw_conflicts = resolve_conflicts(tt)
	605	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
1534.10.20 by Aaron Bentley Got all tests passing	606	duplicate = DuplicateEntry('Moved existing file to', 'dorothy.moved',
1534.10.20 by Aaron Bentley Got all tests passing	607	'dorothy', None, 'dorothy-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	608	self.assertEqual(cooked_conflicts[0], duplicate)
1534.10.20 by Aaron Bentley Got all tests passing	609	duplicate_id = DuplicateID('Unversioned existing file',
	610	'dorothy.moved', 'dorothy', None,
	611	'dorothy-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	612	self.assertEqual(cooked_conflicts[1], duplicate_id)
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	613	missing_parent = MissingParent('Created directory', 'munchkincity',
	614	'munchkincity-id')
	615	deleted_parent = DeletingParent('Not deleting', 'oz', 'oz-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	616	self.assertEqual(cooked_conflicts[2], missing_parent)
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	617	unversioned_parent = UnversionedParent('Versioned directory',
	618	'munchkincity',
	619	'munchkincity-id')
	620	unversioned_parent2 = UnversionedParent('Versioned directory', 'oz',
1534.10.20 by Aaron Bentley Got all tests passing	621	'oz-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	622	self.assertEqual(cooked_conflicts[3], unversioned_parent)
1534.10.20 by Aaron Bentley Got all tests passing	623	parent_loop = ParentLoop('Cancelled move', 'oz/emeraldcity',
1534.10.20 by Aaron Bentley Got all tests passing	624	'oz/emeraldcity', 'emerald-id', 'emerald-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	625	self.assertEqual(cooked_conflicts[4], deleted_parent)
	626	self.assertEqual(cooked_conflicts[5], unversioned_parent2)
	627	self.assertEqual(cooked_conflicts[6], parent_loop)
	628	self.assertEqual(len(cooked_conflicts), 7)
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	629	tt.finalize()
	630
	631	def test_string_conflicts(self):
	632	tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
	633	raw_conflicts = resolve_conflicts(tt)
	634	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
	635	tt.finalize()
1534.10.24 by Aaron Bentley Eliminated conflicts_to_strings, made remove_files a ConflictList member	636	conflicts_s = [str(c) for c in cooked_conflicts]
1534.7.171 by Aaron Bentley Implemented stringifying filesystem conflicts	637	self.assertEqual(len(cooked_conflicts), len(conflicts_s))
	638	self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy. '
	639	'Moved existing file to '
	640	'dorothy.moved.')
	641	self.assertEqual(conflicts_s[1], 'Conflict adding id to dorothy. '
	642	'Unversioned existing file '
	643	'dorothy.moved.')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	644	self.assertEqual(conflicts_s[2], 'Conflict adding files to'
	645	' munchkincity. Created directory.')
	646	self.assertEqual(conflicts_s[3], 'Conflict because munchkincity is not'
	647	' versioned, but has versioned'
	648	' children. Versioned directory.')
1551.8.23 by Aaron Bentley Tweaked conflict message to be more understandable	649	self.assertEqualDiff(conflicts_s[4], "Conflict: can't delete oz because it"
	650	" is not empty. Not deleting.")
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	651	self.assertEqual(conflicts_s[5], 'Conflict because oz is not'
	652	' versioned, but has versioned'
	653	' children. Versioned directory.')
	654	self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
1534.7.171 by Aaron Bentley Implemented stringifying filesystem conflicts	655	' oz/emeraldcity. Cancelled move.')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	656
3144.4.2 by Aaron Bentley Handle non-directory parent conflicts (abentley, #177390)	657	def prepare_wrong_parent_kind(self):
	658	tt, root = self.get_transform()
	659	tt.new_file('parent', root, 'contents', 'parent-id')
	660	tt.apply()
	661	tt, root = self.get_transform()
	662	parent_id = tt.trans_id_file_id('parent-id')
	663	tt.new_file('child,', parent_id, 'contents2', 'file-id')
	664	return tt
	665
3144.4.1 by Aaron Bentley Handle trying to list parents of a non-directory	666	def test_find_conflicts_wrong_parent_kind(self):
3144.4.2 by Aaron Bentley Handle non-directory parent conflicts (abentley, #177390)	667	tt = self.prepare_wrong_parent_kind()
3144.4.1 by Aaron Bentley Handle trying to list parents of a non-directory	668	tt.find_conflicts()
	669
3144.4.2 by Aaron Bentley Handle non-directory parent conflicts (abentley, #177390)	670	def test_resolve_conflicts_wrong_existing_parent_kind(self):
	671	tt = self.prepare_wrong_parent_kind()
	672	raw_conflicts = resolve_conflicts(tt)
	673	self.assertEqual(set([('non-directory parent', 'Created directory',
	674	'new-3')]), raw_conflicts)
	675	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
	676	self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
	677	'parent-id')], cooked_conflicts)
	678	tt.apply()
	679	self.assertEqual(None, self.wt.path2id('parent'))
	680	self.assertEqual('parent-id', self.wt.path2id('parent.new'))
	681
	682	def test_resolve_conflicts_wrong_new_parent_kind(self):
	683	tt, root = self.get_transform()
	684	parent_id = tt.new_directory('parent', root, 'parent-id')
	685	tt.new_file('child,', parent_id, 'contents2', 'file-id')
	686	tt.apply()
	687	tt, root = self.get_transform()
	688	parent_id = tt.trans_id_file_id('parent-id')
	689	tt.delete_contents(parent_id)
	690	tt.create_file('contents', parent_id)
	691	raw_conflicts = resolve_conflicts(tt)
	692	self.assertEqual(set([('non-directory parent', 'Created directory',
	693	'new-3')]), raw_conflicts)
	694	tt.apply()
	695	self.assertEqual(None, self.wt.path2id('parent'))
	696	self.assertEqual('parent-id', self.wt.path2id('parent.new'))
	697
	698	def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
	699	tt, root = self.get_transform()
	700	parent_id = tt.new_directory('parent', root)
	701	tt.new_file('child,', parent_id, 'contents2')
	702	tt.apply()
	703	tt, root = self.get_transform()
	704	parent_id = tt.trans_id_tree_path('parent')
	705	tt.delete_contents(parent_id)
	706	tt.create_file('contents', parent_id)
	707	resolve_conflicts(tt)
	708	tt.apply()
	709	self.assertIs(None, self.wt.path2id('parent'))
	710	self.assertIs(None, self.wt.path2id('parent.new'))
	711
1534.7.62 by Aaron Bentley Fixed moving versioned directories	712	def test_moving_versioned_directories(self):
	713	create, root = self.get_transform()
	714	kansas = create.new_directory('kansas', root, 'kansas-id')
	715	create.new_directory('house', kansas, 'house-id')
	716	create.new_directory('oz', root, 'oz-id')
	717	create.apply()
	718	cyclone, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	719	oz = cyclone.trans_id_tree_file_id('oz-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	720	house = cyclone.trans_id_tree_file_id('house-id')
1534.7.62 by Aaron Bentley Fixed moving versioned directories	721	cyclone.adjust_path('house', oz, house)
	722	cyclone.apply()
1534.7.66 by Aaron Bentley Ensured we don't accidentally move the root directory	723
	724	def test_moving_root(self):
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	725	create, root = self.get_transform()
	726	fun = create.new_directory('fun', root, 'fun-id')
	727	create.new_directory('sun', root, 'sun-id')
	728	create.new_directory('moon', root, 'moon')
	729	create.apply()
1534.7.66 by Aaron Bentley Ensured we don't accidentally move the root directory	730	transform, root = self.get_transform()
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	731	transform.adjust_root_path('oldroot', fun)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	732	new_root=transform.trans_id_tree_path('')
1534.7.69 by Aaron Bentley Got real root moves working	733	transform.version_file('new-root', new_root)
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	734	transform.apply()
1534.7.93 by Aaron Bentley Added text merge test	735
1534.7.114 by Aaron Bentley Added file renaming test case	736	def test_renames(self):
	737	create, root = self.get_transform()
	738	old = create.new_directory('old-parent', root, 'old-id')
	739	intermediate = create.new_directory('intermediate', old, 'im-id')
	740	myfile = create.new_file('myfile', intermediate, 'myfile-text',
	741	'myfile-id')
	742	create.apply()
	743	rename, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	744	old = rename.trans_id_file_id('old-id')
1534.7.114 by Aaron Bentley Added file renaming test case	745	rename.adjust_path('new', root, old)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	746	myfile = rename.trans_id_file_id('myfile-id')
1534.7.114 by Aaron Bentley Added file renaming test case	747	rename.set_executability(True, myfile)
	748	rename.apply()
	749
1740.2.4 by Aaron Bentley Update transform tests and docs	750	def test_set_executability_order(self):
	751	"""Ensure that executability behaves the same, no matter what order.
	752
	753	- create file and set executability simultaneously
	754	- create file and set executability afterward
	755	- unsetting the executability of a file whose executability has not been
	756	declared should throw an exception (this may happen when a
	757	merge attempts to create a file with a duplicate ID)
	758	"""
	759	transform, root = self.get_transform()
	760	wt = transform._tree
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	761	wt.lock_read()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	762	self.addCleanup(wt.unlock)
1740.2.4 by Aaron Bentley Update transform tests and docs	763	transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
1740.2.4 by Aaron Bentley Update transform tests and docs	764	True)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	765	sac = transform.new_file('set_after_creation', root,
	766	'Set after creation', 'sac')
1740.2.4 by Aaron Bentley Update transform tests and docs	767	transform.set_executability(True, sac)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	768	uws = transform.new_file('unset_without_set', root, 'Unset badly',
	769	'uws')
1740.2.4 by Aaron Bentley Update transform tests and docs	770	self.assertRaises(KeyError, transform.set_executability, None, uws)
	771	transform.apply()
	772	self.assertTrue(wt.is_executable('soc'))
	773	self.assertTrue(wt.is_executable('sac'))
	774
1534.12.2 by Aaron Bentley Added test for preserving file mode	775	def test_preserve_mode(self):
	776	"""File mode is preserved when replacing content"""
	777	if sys.platform == 'win32':
	778	raise TestSkipped('chmod has no effect on win32')
	779	transform, root = self.get_transform()
	780	transform.new_file('file1', root, 'contents', 'file1-id', True)
	781	transform.apply()
3146.4.12 by Aaron Bentley Add needed write lock to test	782	self.wt.lock_write()
3146.4.12 by Aaron Bentley Add needed write lock to test	783	self.addCleanup(self.wt.unlock)
1534.12.2 by Aaron Bentley Added test for preserving file mode	784	self.assertTrue(self.wt.is_executable('file1-id'))
	785	transform, root = self.get_transform()
	786	file1_id = transform.trans_id_tree_file_id('file1-id')
	787	transform.delete_contents(file1_id)
	788	transform.create_file('contents2', file1_id)
	789	transform.apply()
	790	self.assertTrue(self.wt.is_executable('file1-id'))
	791
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	792	def test__set_mode_stats_correctly(self):
	793	"""_set_mode stats to determine file mode."""
	794	if sys.platform == 'win32':
	795	raise TestSkipped('chmod has no effect on win32')
	796
	797	stat_paths = []
	798	real_stat = os.stat
	799	def instrumented_stat(path):
	800	stat_paths.append(path)
	801	return real_stat(path)
	802
	803	transform, root = self.get_transform()
	804
	805	bar1_id = transform.new_file('bar', root, 'bar contents 1\n',
	806	file_id='bar-id-1', executable=False)
	807	transform.apply()
	808
	809	transform, root = self.get_transform()
	810	bar1_id = transform.trans_id_tree_path('bar')
	811	bar2_id = transform.trans_id_tree_path('bar2')
	812	try:
	813	os.stat = instrumented_stat
	814	transform.create_file('bar2 contents\n', bar2_id, mode_id=bar1_id)
	815	finally:
	816	os.stat = real_stat
	817	transform.finalize()
	818
	819	bar1_abspath = self.wt.abspath('bar')
	820	self.assertEqual([bar1_abspath], stat_paths)
	821
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	822	def test_iter_changes(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	823	self.wt.set_root_id('eert_toor')
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	824	transform, root = self.get_transform()
	825	transform.new_file('old', root, 'blah', 'id-1', True)
	826	transform.apply()
	827	transform, root = self.get_transform()
	828	try:
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	829	self.assertEqual([], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	830	old = transform.trans_id_tree_file_id('id-1')
	831	transform.unversion_file(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	832	self.assertEqual([('id-1', ('old', None), False, (True, False),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	833	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	834	(True, True))], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	835	transform.new_directory('new', root, 'id-1')
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	836	self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	837	('eert_toor', 'eert_toor'), ('old', 'new'),
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	838	('file', 'directory'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	839	(True, False))], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	840	finally:
	841	transform.finalize()
	842
	843	def test_iter_changes_new(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	844	self.wt.set_root_id('eert_toor')
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	845	transform, root = self.get_transform()
	846	transform.new_file('old', root, 'blah')
	847	transform.apply()
	848	transform, root = self.get_transform()
	849	try:
	850	old = transform.trans_id_tree_path('old')
	851	transform.version_file('id-1', old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	852	self.assertEqual([('id-1', (None, 'old'), False, (False, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	853	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	854	(False, False))], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	855	finally:
	856	transform.finalize()
	857
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	858	def test_iter_changes_modifications(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	859	self.wt.set_root_id('eert_toor')
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	860	transform, root = self.get_transform()
	861	transform.new_file('old', root, 'blah', 'id-1')
	862	transform.new_file('new', root, 'blah')
	863	transform.new_directory('subdir', root, 'subdir-id')
	864	transform.apply()
	865	transform, root = self.get_transform()
	866	try:
	867	old = transform.trans_id_tree_path('old')
	868	subdir = transform.trans_id_tree_file_id('subdir-id')
	869	new = transform.trans_id_tree_path('new')
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	870	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	871
	872	#content deletion
	873	transform.delete_contents(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	874	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	875	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	876	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	877
	878	#content change
	879	transform.create_file('blah', old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	880	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	881	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	882	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	883	transform.cancel_deletion(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	884	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	885	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	886	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	887	transform.cancel_creation(old)
	888
	889	# move file_id to a different file
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	890	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	891	transform.unversion_file(old)
	892	transform.version_file('id-1', new)
	893	transform.adjust_path('old', root, new)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	894	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	895	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	896	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	897	transform.cancel_versioning(new)
	898	transform._removed_id = set()
	899
	900	#execute bit
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	901	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	902	transform.set_executability(True, old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	903	self.assertEqual([('id-1', ('old', 'old'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	904	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	905	(False, True))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	906	transform.set_executability(None, old)
	907
	908	# filename
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	909	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	910	transform.adjust_path('new', root, old)
	911	transform._new_parent = {}
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	912	self.assertEqual([('id-1', ('old', 'new'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	913	('eert_toor', 'eert_toor'), ('old', 'new'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	914	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	915	transform._new_name = {}
	916
	917	# parent directory
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	918	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	919	transform.adjust_path('new', subdir, old)
	920	transform._new_name = {}
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	921	self.assertEqual([('id-1', ('old', 'subdir/old'), False,
2255.2.180 by Martin Pool merge dirstate	922	(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.	923	('file', 'file'), (False, False))],
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	924	list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	925	transform._new_path = {}
	926
	927	finally:
	928	transform.finalize()
	929
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	930	def test_iter_changes_modified_bleed(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	931	self.wt.set_root_id('eert_toor')
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	932	"""Modified flag should not bleed from one change to another"""
	933	# unfortunately, we have no guarantee that file1 (which is modified)
	934	# will be applied before file2. And if it's applied after file2, it
	935	# obviously can't bleed into file2's change output. But for now, it
	936	# works.
	937	transform, root = self.get_transform()
	938	transform.new_file('file1', root, 'blah', 'id-1')
	939	transform.new_file('file2', root, 'blah', 'id-2')
	940	transform.apply()
	941	transform, root = self.get_transform()
	942	try:
	943	transform.delete_contents(transform.trans_id_file_id('id-1'))
	944	transform.set_executability(True,
	945	transform.trans_id_file_id('id-2'))
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	946	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	947	('eert_toor', 'eert_toor'), ('file1', u'file1'),
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	948	('file', None), (False, False)),
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	949	('id-2', (u'file2', u'file2'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	950	('eert_toor', 'eert_toor'), ('file2', u'file2'),
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	951	('file', 'file'), (False, True))],
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	952	list(transform.iter_changes()))
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	953	finally:
	954	transform.finalize()
	955
1551.10.37 by Aaron Bentley recommit of TreeTransform._iter_changes fix with missing files	956	def test_iter_changes_move_missing(self):
	957	"""Test moving ids with no files around"""
	958	self.wt.set_root_id('toor_eert')
	959	# Need two steps because versioning a non-existant file is a conflict.
	960	transform, root = self.get_transform()
	961	transform.new_directory('floater', root, 'floater-id')
	962	transform.apply()
	963	transform, root = self.get_transform()
	964	transform.delete_contents(transform.trans_id_tree_path('floater'))
	965	transform.apply()
	966	transform, root = self.get_transform()
	967	floater = transform.trans_id_tree_path('floater')
	968	try:
	969	transform.adjust_path('flitter', root, floater)
	970	self.assertEqual([('floater-id', ('floater', 'flitter'), False,
	971	(True, True), ('toor_eert', 'toor_eert'), ('floater', 'flitter'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	972	(None, None), (False, False))], list(transform.iter_changes()))
1551.10.37 by Aaron Bentley recommit of TreeTransform._iter_changes fix with missing files	973	finally:
	974	transform.finalize()
	975
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	976	def test_iter_changes_pointless(self):
	977	"""Ensure that no-ops are not treated as modifications"""
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	978	self.wt.set_root_id('eert_toor')
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	979	transform, root = self.get_transform()
	980	transform.new_file('old', root, 'blah', 'id-1')
	981	transform.new_directory('subdir', root, 'subdir-id')
	982	transform.apply()
	983	transform, root = self.get_transform()
	984	try:
	985	old = transform.trans_id_tree_path('old')
	986	subdir = transform.trans_id_tree_file_id('subdir-id')
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	987	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	988	transform.delete_contents(subdir)
	989	transform.create_directory(subdir)
	990	transform.set_executability(False, old)
	991	transform.unversion_file(old)
	992	transform.version_file('id-1', old)
	993	transform.adjust_path('old', root, old)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	994	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	995	finally:
	996	transform.finalize()
1534.7.93 by Aaron Bentley Added text merge test	997
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	998	def test_rename_count(self):
	999	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1000	transform.new_file('name1', root, 'contents')
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1001	self.assertEqual(transform.rename_count, 0)
	1002	transform.apply()
	1003	self.assertEqual(transform.rename_count, 1)
	1004	transform2, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1005	transform2.adjust_path('name2', root,
2502.1.8 by Aaron Bentley Updates from review comments	1006	transform2.trans_id_tree_path('name1'))
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1007	self.assertEqual(transform2.rename_count, 0)
	1008	transform2.apply()
	1009	self.assertEqual(transform2.rename_count, 2)
	1010
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1011	def test_change_parent(self):
2502.1.8 by Aaron Bentley Updates from review comments	1012	"""Ensure that after we change a parent, the results are still right.
	1013
	1014	Renames and parent changes on pending transforms can happen as part
	1015	of conflict resolution, and are explicitly permitted by the
	1016	TreeTransform API.
	1017
	1018	This test ensures they work correctly with the rename-avoidance
	1019	optimization.
	1020	"""
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1021	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1022	parent1 = transform.new_directory('parent1', root)
	1023	child1 = transform.new_file('child1', parent1, 'contents')
	1024	parent2 = transform.new_directory('parent2', root)
	1025	transform.adjust_path('child1', parent2, child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1026	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1027	self.failIfExists(self.wt.abspath('parent1/child1'))
	1028	self.failUnlessExists(self.wt.abspath('parent2/child1'))
	1029	# rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
	1030	# 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	1031	self.failUnlessEqual(2, transform.rename_count)
	1032
	1033	def test_cancel_parent(self):
	1034	"""Cancelling a parent doesn't cause deletion of a non-empty directory
	1035
	1036	This is like the test_change_parent, except that we cancel the parent
	1037	before adjusting the path. The transform must detect that the
	1038	directory is non-empty, and move children to safe locations.
	1039	"""
	1040	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1041	parent1 = transform.new_directory('parent1', root)
	1042	child1 = transform.new_file('child1', parent1, 'contents')
	1043	child2 = transform.new_file('child2', parent1, 'contents')
	1044	try:
	1045	transform.cancel_creation(parent1)
	1046	except OSError:
	1047	self.fail('Failed to move child1 before deleting parent1')
	1048	transform.cancel_creation(child2)
	1049	transform.create_directory(parent1)
	1050	try:
	1051	transform.cancel_creation(parent1)
	1052	# If the transform incorrectly believes that child2 is still in
	1053	# parent1's limbo directory, it will try to rename it and fail
	1054	# because was already moved by the first cancel_creation.
	1055	except OSError:
	1056	self.fail('Transform still thinks child2 is a child of parent1')
	1057	parent2 = transform.new_directory('parent2', root)
	1058	transform.adjust_path('child1', parent2, child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1059	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1060	self.failIfExists(self.wt.abspath('parent1'))
	1061	self.failUnlessExists(self.wt.abspath('parent2/child1'))
	1062	# 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	1063	self.failUnlessEqual(2, transform.rename_count)
	1064
	1065	def test_adjust_and_cancel(self):
2502.1.8 by Aaron Bentley Updates from review comments	1066	"""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	1067	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1068	parent1 = transform.new_directory('parent1', root)
	1069	child1 = transform.new_file('child1', parent1, 'contents')
	1070	parent2 = transform.new_directory('parent2', root)
	1071	transform.adjust_path('child1', parent2, child1)
	1072	transform.cancel_creation(child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1073	try:
2502.1.8 by Aaron Bentley Updates from review comments	1074	transform.cancel_creation(parent1)
	1075	# if the transform thinks child1 is still in parent1's limbo
	1076	# 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	1077	except OSError:
2502.1.8 by Aaron Bentley Updates from review comments	1078	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	1079	transform.finalize()
	1080
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1081	def test_noname_contents(self):
2502.1.8 by Aaron Bentley Updates from review comments	1082	"""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	1083	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1084	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	1085	try:
2502.1.8 by Aaron Bentley Updates from review comments	1086	transform.create_directory(parent)
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1087	except KeyError:
	1088	self.fail("Can't handle contents with no name")
	1089	transform.finalize()
	1090
2502.1.9 by Aaron Bentley Add additional test for no-name contents	1091	def test_noname_contents_nested(self):
	1092	"""TreeTransform should permit deferring naming files."""
	1093	transform, root = self.get_transform()
	1094	parent = transform.trans_id_file_id('parent-id')
	1095	try:
	1096	transform.create_directory(parent)
	1097	except KeyError:
	1098	self.fail("Can't handle contents with no name")
	1099	child = transform.new_directory('child', parent)
	1100	transform.adjust_path('parent', root, parent)
	1101	transform.apply()
	1102	self.failUnlessExists(self.wt.abspath('parent/child'))
	1103	self.assertEqual(1, transform.rename_count)
	1104
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1105	def test_reuse_name(self):
	1106	"""Avoid reusing the same limbo name for different files"""
	1107	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1108	parent = transform.new_directory('parent', root)
2502.1.8 by Aaron Bentley Updates from review comments	1109	child1 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1110	try:
2502.1.8 by Aaron Bentley Updates from review comments	1111	child2 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1112	except OSError:
	1113	self.fail('Tranform tried to use the same limbo name twice')
2502.1.8 by Aaron Bentley Updates from review comments	1114	transform.adjust_path('child2', parent, child2)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1115	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1116	# limbo/new-1 => parent, limbo/new-3 => parent/child2
	1117	# child2 is put into top-level limbo because child1 has already
	1118	# claimed the direct limbo path when child2 is created. There is no
	1119	# advantage in renaming files once they're in top-level limbo, except
	1120	# as part of apply.
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1121	self.assertEqual(2, transform.rename_count)
	1122
	1123	def test_reuse_when_first_moved(self):
	1124	"""Don't avoid direct paths when it is safe to use them"""
	1125	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1126	parent = transform.new_directory('parent', root)
	1127	child1 = transform.new_directory('child', parent)
	1128	transform.adjust_path('child1', parent, child1)
	1129	child2 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1130	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1131	# limbo/new-1 => parent
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1132	self.assertEqual(1, transform.rename_count)
	1133
	1134	def test_reuse_after_cancel(self):
	1135	"""Don't avoid direct paths when it is safe to use them"""
	1136	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1137	parent2 = transform.new_directory('parent2', root)
	1138	child1 = transform.new_directory('child1', parent2)
	1139	transform.cancel_creation(parent2)
	1140	transform.create_directory(parent2)
	1141	child2 = transform.new_directory('child1', parent2)
	1142	transform.adjust_path('child2', parent2, child1)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1143	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1144	# limbo/new-1 => parent2, limbo/new-2 => parent2/child1
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1145	self.assertEqual(2, transform.rename_count)
	1146
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1147	def test_finalize_order(self):
2502.1.8 by Aaron Bentley Updates from review comments	1148	"""Finalize must be done in child-to-parent order"""
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1149	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1150	parent = transform.new_directory('parent', root)
2502.1.8 by Aaron Bentley Updates from review comments	1151	child = transform.new_directory('child', parent)
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1152	try:
	1153	transform.finalize()
	1154	except OSError:
2502.1.8 by Aaron Bentley Updates from review comments	1155	self.fail('Tried to remove parent before child1')
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1156
2502.1.13 by Aaron Bentley Updates from review	1157	def test_cancel_with_cancelled_child_should_succeed(self):
2502.1.12 by Aaron Bentley Avoid renaming children with no content	1158	transform, root = self.get_transform()
	1159	parent = transform.new_directory('parent', root)
	1160	child = transform.new_directory('child', parent)
	1161	transform.cancel_creation(child)
2502.1.13 by Aaron Bentley Updates from review	1162	transform.cancel_creation(parent)
2502.1.12 by Aaron Bentley Avoid renaming children with no content	1163	transform.finalize()
	1164
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1165	def test_rollback_on_directory_clash(self):
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1166	def tt_helper():
3638.3.17 by Vincent Ladeuil Fixed as per Aaron's review.	1167	wt = self.make_branch_and_tree('.')
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1168	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1169	try:
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1170	foo = tt.new_directory('foo', tt.root)
	1171	tt.new_file('bar', foo, 'foobar')
	1172	baz = tt.new_directory('baz', tt.root)
	1173	tt.new_file('qux', baz, 'quux')
	1174	# Ask for a rename 'foo' -> 'baz'
	1175	tt.adjust_path('baz', tt.root, foo)
3063.1.3 by Aaron Bentley Update for Linux	1176	# 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).	1177	tt.apply(no_conflicts=True)
3063.1.3 by Aaron Bentley Update for Linux	1178	except:
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1179	wt.unlock()
3063.1.3 by Aaron Bentley Update for Linux	1180	raise
3638.3.17 by Vincent Ladeuil Fixed as per Aaron's review.	1181	# The rename will fail because the target directory is not empty (but
3638.3.17 by Vincent Ladeuil Fixed as per Aaron's review.	1182	# raises FileExists anyway).
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1183	err = self.assertRaises(errors.FileExists, tt_helper)
	1184	self.assertContainsRe(str(err),
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1185	"^File exists: .+/baz")
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1186
3063.1.2 by Alexander Belchenko test for two directories clash	1187	def test_two_directories_clash(self):
	1188	def tt_helper():
	1189	wt = self.make_branch_and_tree('.')
	1190	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1191	try:
3063.1.3 by Aaron Bentley Update for Linux	1192	foo_1 = tt.new_directory('foo', tt.root)
3063.1.3 by Aaron Bentley Update for Linux	1193	tt.new_directory('bar', foo_1)
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1194	# Adding the same directory with a different content
3063.1.3 by Aaron Bentley Update for Linux	1195	foo_2 = tt.new_directory('foo', tt.root)
	1196	tt.new_directory('baz', foo_2)
	1197	# Lie to tt that we've already resolved all conflicts.
3063.1.2 by Alexander Belchenko test for two directories clash	1198	tt.apply(no_conflicts=True)
3063.1.3 by Aaron Bentley Update for Linux	1199	except:
3063.1.2 by Alexander Belchenko test for two directories clash	1200	wt.unlock()
3063.1.3 by Aaron Bentley Update for Linux	1201	raise
3063.1.2 by Alexander Belchenko test for two directories clash	1202	err = self.assertRaises(errors.FileExists, tt_helper)
	1203	self.assertContainsRe(str(err),
	1204	"^File exists: .+/foo")
	1205
3100.1.1 by Aaron Bentley Fix ImmortalLimbo errors when transforms fail	1206	def test_two_directories_clash_finalize(self):
	1207	def tt_helper():
	1208	wt = self.make_branch_and_tree('.')
	1209	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1210	try:
	1211	foo_1 = tt.new_directory('foo', tt.root)
	1212	tt.new_directory('bar', foo_1)
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1213	# Adding the same directory with a different content
3100.1.1 by Aaron Bentley Fix ImmortalLimbo errors when transforms fail	1214	foo_2 = tt.new_directory('foo', tt.root)
	1215	tt.new_directory('baz', foo_2)
	1216	# Lie to tt that we've already resolved all conflicts.
	1217	tt.apply(no_conflicts=True)
	1218	except:
	1219	tt.finalize()
	1220	raise
	1221	err = self.assertRaises(errors.FileExists, tt_helper)
	1222	self.assertContainsRe(str(err),
	1223	"^File exists: .+/foo")
	1224
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1225	def test_file_to_directory(self):
	1226	wt = self.make_branch_and_tree('.')
3535.6.2 by James Westby Fixes from review. Thanks Aaron and John.	1227	self.build_tree(['foo'])
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1228	wt.add(['foo'])
3590.3.1 by James Westby Make TreeTransform update the inventory with new kind information.	1229	wt.commit("one")
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1230	tt = TreeTransform(wt)
3535.6.2 by James Westby Fixes from review. Thanks Aaron and John.	1231	self.addCleanup(tt.finalize)
3535.6.3 by James Westby Fix the test to not create transform conflicts.	1232	foo_trans_id = tt.trans_id_tree_path("foo")
	1233	tt.delete_contents(foo_trans_id)
	1234	tt.create_directory(foo_trans_id)
	1235	bar_trans_id = tt.trans_id_tree_path("foo/bar")
	1236	tt.create_file(["aa\n"], bar_trans_id)
	1237	tt.version_file("bar-1", bar_trans_id)
3535.6.2 by James Westby Fixes from review. Thanks Aaron and John.	1238	tt.apply()
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1239	self.failUnlessExists("foo/bar")
3590.3.2 by James Westby Handle ->symlink changes as well.	1240	wt.lock_read()
	1241	try:
	1242	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1243	"directory")
	1244	finally:
	1245	wt.unlock()
3590.3.1 by James Westby Make TreeTransform update the inventory with new kind information.	1246	wt.commit("two")
	1247	changes = wt.changes_from(wt.basis_tree())
	1248	self.assertFalse(changes.has_changed(), changes)
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1249
3590.3.2 by James Westby Handle ->symlink changes as well.	1250	def test_file_to_symlink(self):
3590.3.3 by James Westby Make ->file changes work as well.	1251	self.requireFeature(SymlinkFeature)
3590.3.2 by James Westby Handle ->symlink changes as well.	1252	wt = self.make_branch_and_tree('.')
	1253	self.build_tree(['foo'])
	1254	wt.add(['foo'])
	1255	wt.commit("one")
	1256	tt = TreeTransform(wt)
	1257	self.addCleanup(tt.finalize)
	1258	foo_trans_id = tt.trans_id_tree_path("foo")
	1259	tt.delete_contents(foo_trans_id)
	1260	tt.create_symlink("bar", foo_trans_id)
	1261	tt.apply()
	1262	self.failUnlessExists("foo")
	1263	wt.lock_read()
	1264	self.addCleanup(wt.unlock)
	1265	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1266	"symlink")
	1267
3590.3.3 by James Westby Make ->file changes work as well.	1268	def test_dir_to_file(self):
	1269	wt = self.make_branch_and_tree('.')
	1270	self.build_tree(['foo/', 'foo/bar'])
	1271	wt.add(['foo', 'foo/bar'])
	1272	wt.commit("one")
	1273	tt = TreeTransform(wt)
	1274	self.addCleanup(tt.finalize)
	1275	foo_trans_id = tt.trans_id_tree_path("foo")
	1276	bar_trans_id = tt.trans_id_tree_path("foo/bar")
	1277	tt.delete_contents(foo_trans_id)
	1278	tt.delete_versioned(bar_trans_id)
	1279	tt.create_file(["aa\n"], foo_trans_id)
	1280	tt.apply()
	1281	self.failUnlessExists("foo")
	1282	wt.lock_read()
	1283	self.addCleanup(wt.unlock)
	1284	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1285	"file")
	1286
3590.3.4 by James Westby Add a test for creating hardlinks as well.	1287	def test_dir_to_hardlink(self):
3590.3.5 by James Westby Use HardlinkFeature for the hardlink test.	1288	self.requireFeature(HardlinkFeature)
3590.3.4 by James Westby Add a test for creating hardlinks as well.	1289	wt = self.make_branch_and_tree('.')
	1290	self.build_tree(['foo/', 'foo/bar'])
	1291	wt.add(['foo', 'foo/bar'])
	1292	wt.commit("one")
	1293	tt = TreeTransform(wt)
	1294	self.addCleanup(tt.finalize)
	1295	foo_trans_id = tt.trans_id_tree_path("foo")
	1296	bar_trans_id = tt.trans_id_tree_path("foo/bar")
	1297	tt.delete_contents(foo_trans_id)
	1298	tt.delete_versioned(bar_trans_id)
	1299	self.build_tree(['baz'])
	1300	tt.create_hardlink("baz", foo_trans_id)
	1301	tt.apply()
	1302	self.failUnlessExists("foo")
	1303	self.failUnlessExists("baz")
	1304	wt.lock_read()
	1305	self.addCleanup(wt.unlock)
	1306	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1307	"file")
	1308
3619.2.10 by Aaron Bentley Compensate for stale entries in TT._needs_rename	1309	def test_no_final_path(self):
	1310	transform, root = self.get_transform()
	1311	trans_id = transform.trans_id_file_id('foo')
	1312	transform.create_file('bar', trans_id)
	1313	transform.cancel_creation(trans_id)
	1314	transform.apply()
	1315
3363.17.24 by Aaron Bentley Implement create_by_tree	1316	def test_create_from_tree(self):
	1317	tree1 = self.make_branch_and_tree('tree1')
	1318	self.build_tree_contents([('tree1/foo/',), ('tree1/bar', 'baz')])
	1319	tree1.add(['foo', 'bar'], ['foo-id', 'bar-id'])
	1320	tree2 = self.make_branch_and_tree('tree2')
	1321	tt = TreeTransform(tree2)
	1322	foo_trans_id = tt.create_path('foo', tt.root)
	1323	create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
	1324	bar_trans_id = tt.create_path('bar', tt.root)
	1325	create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
	1326	tt.apply()
	1327	self.assertEqual('directory', osutils.file_kind('tree2/foo'))
	1328	self.assertFileEqual('baz', 'tree2/bar')
	1329
3363.17.25 by Aaron Bentley remove get_inventory_entry, replace with create_from_tree	1330	def test_create_from_tree_bytes(self):
	1331	"""Provided lines are used instead of tree content."""
	1332	tree1 = self.make_branch_and_tree('tree1')
	1333	self.build_tree_contents([('tree1/foo', 'bar'),])
	1334	tree1.add('foo', 'foo-id')
	1335	tree2 = self.make_branch_and_tree('tree2')
	1336	tt = TreeTransform(tree2)
	1337	foo_trans_id = tt.create_path('foo', tt.root)
	1338	create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
	1339	tt.apply()
	1340	self.assertFileEqual('qux', 'tree2/foo')
	1341
	1342	def test_create_from_tree_symlink(self):
3363.17.24 by Aaron Bentley Implement create_by_tree	1343	self.requireFeature(SymlinkFeature)
	1344	tree1 = self.make_branch_and_tree('tree1')
	1345	os.symlink('bar', 'tree1/foo')
	1346	tree1.add('foo', 'foo-id')
	1347	tt = TreeTransform(self.make_branch_and_tree('tree2'))
	1348	foo_trans_id = tt.create_path('foo', tt.root)
	1349	create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
	1350	tt.apply()
	1351	self.assertEqual('bar', os.readlink('tree2/foo'))
	1352
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1353
1534.7.93 by Aaron Bentley Added text merge test	1354	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).	1355
1731.1.33 by Aaron Bentley Revert no-special-root changes	1356	def __init__(self, dirname, root_id):
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1357	self.name = dirname
1534.7.93 by Aaron Bentley Added text merge test	1358	os.mkdir(dirname)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	1359	self.wt = BzrDir.create_standalone_workingtree(dirname)
1731.1.33 by Aaron Bentley Revert no-special-root changes	1360	self.wt.set_root_id(root_id)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	1361	self.b = self.wt.branch
1534.7.93 by Aaron Bentley Added text merge test	1362	self.tt = TreeTransform(self.wt)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	1363	self.root = self.tt.trans_id_tree_file_id(self.wt.get_root_id())
1534.7.93 by Aaron Bentley Added text merge test	1364
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	1365
1534.7.95 by Aaron Bentley Added more text merge tests	1366	def conflict_text(tree, merge):
	1367	template = '%s TREE\n%s%s\n%s%s MERGE-SOURCE\n'
	1368	return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
	1369
1534.7.93 by Aaron Bentley Added text merge test	1370
1534.7.93 by Aaron Bentley Added text merge test	1371	class TestTransformMerge(TestCaseInTempDir):
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	1372
1534.7.93 by Aaron Bentley Added text merge test	1373	def test_text_merge(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1374	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1375	base = TransformGroup("base", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1376	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	1377	base.tt.new_file('b', base.root, 'b1', 'b')
	1378	base.tt.new_file('c', base.root, 'c', 'c')
	1379	base.tt.new_file('d', base.root, 'd', 'd')
	1380	base.tt.new_file('e', base.root, 'e', 'e')
	1381	base.tt.new_file('f', base.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1382	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	1383	base.tt.new_directory('h', base.root, 'h')
1534.7.93 by Aaron Bentley Added text merge test	1384	base.tt.apply()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1385	other = TransformGroup("other", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1386	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	1387	other.tt.new_file('b', other.root, 'b2', 'b')
	1388	other.tt.new_file('c', other.root, 'c2', 'c')
	1389	other.tt.new_file('d', other.root, 'd', 'd')
	1390	other.tt.new_file('e', other.root, 'e2', 'e')
	1391	other.tt.new_file('f', other.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1392	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	1393	other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1394	other.tt.new_file('i', other.root, 'h\ni\nj\nk\n', 'i')
1534.7.93 by Aaron Bentley Added text merge test	1395	other.tt.apply()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1396	this = TransformGroup("this", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1397	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	1398	this.tt.new_file('b', this.root, 'b', 'b')
	1399	this.tt.new_file('c', this.root, 'c', 'c')
	1400	this.tt.new_file('d', this.root, 'd2', 'd')
	1401	this.tt.new_file('e', this.root, 'e2', 'e')
	1402	this.tt.new_file('f', this.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1403	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	1404	this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1405	this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
1534.7.93 by Aaron Bentley Added text merge test	1406	this.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1407	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
3008.1.6 by Michael Hudson chop up Merge3Merger.__init__ into pieces	1408
1534.7.95 by Aaron Bentley Added more text merge tests	1409	# textual merge
1534.7.93 by Aaron Bentley Added text merge test	1410	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	1411	# three-way text conflict
	1412	self.assertEqual(this.wt.get_file('b').read(),
	1413	conflict_text('b', 'b2'))
	1414	# OTHER wins
	1415	self.assertEqual(this.wt.get_file('c').read(), 'c2')
	1416	# THIS wins
	1417	self.assertEqual(this.wt.get_file('d').read(), 'd2')
	1418	# Ambigious clean merge
	1419	self.assertEqual(this.wt.get_file('e').read(), 'e2')
	1420	# No change
	1421	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	1422	# Correct correct results when THIS == OTHER
1534.7.96 by Aaron Bentley Tested with BASE as directory	1423	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	1424	# Text conflict when THIS & OTHER are text and BASE is dir
	1425	self.assertEqual(this.wt.get_file('h').read(),
	1426	conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
	1427	self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
	1428	'1\n2\n3\n4\n')
	1429	self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
	1430	'h\ni\nj\nk\n')
	1431	self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1432	self.assertEqual(this.wt.get_file('i').read(),
	1433	conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
	1434	self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
	1435	'1\n2\n3\n4\n')
	1436	self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
	1437	'h\ni\nj\nk\n')
	1438	self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1534.7.192 by Aaron Bentley Record hashes produced by merges	1439	modified = ['a', 'b', 'c', 'h', 'i']
	1440	merge_modified = this.wt.merge_modified()
	1441	self.assertSubset(merge_modified, modified)
	1442	self.assertEqual(len(merge_modified), len(modified))
	1443	file(this.wt.id2abspath('a'), 'wb').write('booga')
	1444	modified.pop(0)
	1445	merge_modified = this.wt.merge_modified()
	1446	self.assertSubset(merge_modified, modified)
	1447	self.assertEqual(len(merge_modified), len(modified))
1558.12.10 by Aaron Bentley Be robust when merge_hash file_id not in inventory	1448	this.wt.remove('b')
2796.1.4 by Aaron Bentley Fix up various test cases	1449	this.wt.revert()
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1450
	1451	def test_file_merge(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1452	self.requireFeature(SymlinkFeature)
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1453	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1454	base = TransformGroup("BASE", root_id)
	1455	this = TransformGroup("THIS", root_id)
	1456	other = TransformGroup("OTHER", root_id)
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1457	for tg in this, base, other:
	1458	tg.tt.new_directory('a', tg.root, 'a')
	1459	tg.tt.new_symlink('b', tg.root, 'b', 'b')
	1460	tg.tt.new_file('c', tg.root, 'c', 'c')
	1461	tg.tt.new_symlink('d', tg.root, tg.name, 'd')
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1462	targets = ((base, 'base-e', 'base-f', None, None),
	1463	(this, 'other-e', 'this-f', 'other-g', 'this-h'),
	1464	(other, 'other-e', None, 'other-g', 'other-h'))
	1465	for tg, e_target, f_target, g_target, h_target in targets:
	1466	for link, target in (('e', e_target), ('f', f_target),
	1467	('g', g_target), ('h', h_target)):
	1468	if target is not None:
	1469	tg.tt.new_symlink(link, tg.root, target, link)
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1470
	1471	for tg in this, base, other:
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1472	tg.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1473	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1474	self.assertIs(os.path.isdir(this.wt.abspath('a')), True)
	1475	self.assertIs(os.path.islink(this.wt.abspath('b')), True)
	1476	self.assertIs(os.path.isfile(this.wt.abspath('c')), True)
	1477	for suffix in ('THIS', 'BASE', 'OTHER'):
	1478	self.assertEqual(os.readlink(this.wt.abspath('d.'+suffix)), suffix)
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1479	self.assertIs(os.path.lexists(this.wt.abspath('d')), False)
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1480	self.assertEqual(this.wt.id2path('d'), 'd.OTHER')
	1481	self.assertEqual(this.wt.id2path('f'), 'f.THIS')
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1482	self.assertEqual(os.readlink(this.wt.abspath('e')), 'other-e')
	1483	self.assertIs(os.path.lexists(this.wt.abspath('e.THIS')), False)
	1484	self.assertIs(os.path.lexists(this.wt.abspath('e.OTHER')), False)
	1485	self.assertIs(os.path.lexists(this.wt.abspath('e.BASE')), False)
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1486	self.assertIs(os.path.lexists(this.wt.abspath('g')), True)
	1487	self.assertIs(os.path.lexists(this.wt.abspath('g.BASE')), False)
	1488	self.assertIs(os.path.lexists(this.wt.abspath('h')), False)
	1489	self.assertIs(os.path.lexists(this.wt.abspath('h.BASE')), False)
	1490	self.assertIs(os.path.lexists(this.wt.abspath('h.THIS')), True)
	1491	self.assertIs(os.path.lexists(this.wt.abspath('h.OTHER')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1492
1534.7.105 by Aaron Bentley Got merge with rename working	1493	def test_filename_merge(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1494	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1495	base = TransformGroup("BASE", root_id)
	1496	this = TransformGroup("THIS", root_id)
	1497	other = TransformGroup("OTHER", root_id)
1534.7.105 by Aaron Bentley Got merge with rename working	1498	base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
	1499	for t in [base, this, other]]
	1500	base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
	1501	for t in [base, this, other]]
	1502	base.tt.new_directory('c', base_a, 'c')
	1503	this.tt.new_directory('c1', this_a, 'c')
	1504	other.tt.new_directory('c', other_b, 'c')
	1505
	1506	base.tt.new_directory('d', base_a, 'd')
	1507	this.tt.new_directory('d1', this_b, 'd')
	1508	other.tt.new_directory('d', other_a, 'd')
	1509
	1510	base.tt.new_directory('e', base_a, 'e')
	1511	this.tt.new_directory('e', this_a, 'e')
	1512	other.tt.new_directory('e1', other_b, 'e')
	1513
	1514	base.tt.new_directory('f', base_a, 'f')
	1515	this.tt.new_directory('f1', this_b, 'f')
	1516	other.tt.new_directory('f1', other_b, 'f')
	1517
	1518	for tg in [this, base, other]:
	1519	tg.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1520	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.176 by abentley Fixed up tests for Windows	1521	self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
	1522	self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
	1523	self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
	1524	self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
1534.7.105 by Aaron Bentley Got merge with rename working	1525
1534.7.105 by Aaron Bentley Got merge with rename working	1526	def test_filename_merge_conflicts(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1527	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1528	base = TransformGroup("BASE", root_id)
	1529	this = TransformGroup("THIS", root_id)
	1530	other = TransformGroup("OTHER", root_id)
1534.7.105 by Aaron Bentley Got merge with rename working	1531	base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
	1532	for t in [base, this, other]]
	1533	base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
	1534	for t in [base, this, other]]
	1535
	1536	base.tt.new_file('g', base_a, 'g', 'g')
	1537	other.tt.new_file('g1', other_b, 'g1', 'g')
	1538
	1539	base.tt.new_file('h', base_a, 'h', 'h')
	1540	this.tt.new_file('h1', this_b, 'h1', 'h')
	1541
	1542	base.tt.new_file('i', base.root, 'i', 'i')
1534.7.153 by Aaron Bentley Handled test cases involving symlinks	1543	other.tt.new_directory('i1', this_b, 'i')
1534.7.105 by Aaron Bentley Got merge with rename working	1544
	1545	for tg in [this, base, other]:
	1546	tg.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1547	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.105 by Aaron Bentley Got merge with rename working	1548
1534.7.176 by abentley Fixed up tests for Windows	1549	self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1534.7.105 by Aaron Bentley Got merge with rename working	1550	self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1551	self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1534.7.176 by abentley Fixed up tests for Windows	1552	self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1534.7.105 by Aaron Bentley Got merge with rename working	1553	self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1554	self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1534.7.176 by abentley Fixed up tests for Windows	1555	self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1556
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	1557
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1558	class TestBuildTree(tests.TestCaseWithTransport):
	1559
3006.2.2 by Alexander Belchenko tests added.	1560	def test_build_tree_with_symlinks(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1561	self.requireFeature(SymlinkFeature)
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1562	os.mkdir('a')
	1563	a = BzrDir.create_standalone_workingtree('a')
	1564	os.mkdir('a/foo')
	1565	file('a/foo/bar', 'wb').write('contents')
	1566	os.symlink('a/foo/bar', 'a/foo/baz')
	1567	a.add(['foo', 'foo/bar', 'foo/baz'])
	1568	a.commit('initial commit')
	1569	b = BzrDir.create_standalone_workingtree('b')
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	1570	basis = a.basis_tree()
	1571	basis.lock_read()
	1572	self.addCleanup(basis.unlock)
	1573	build_tree(basis, b)
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1574	self.assertIs(os.path.isdir('b/foo'), True)
	1575	self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
	1576	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	1577
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	1578	def test_build_with_references(self):
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	1579	tree = self.make_branch_and_tree('source',
	1580	format='dirstate-with-subtree')
	1581	subtree = self.make_branch_and_tree('source/subtree',
	1582	format='dirstate-with-subtree')
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	1583	tree.add_reference(subtree)
	1584	tree.commit('a revision')
	1585	tree.branch.create_checkout('target')
	1586	self.failUnlessExists('target')
	1587	self.failUnlessExists('target/subtree')
	1588
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1589	def test_file_conflict_handling(self):
	1590	"""Ensure that when building trees, conflict handling is done"""
	1591	source = self.make_branch_and_tree('source')
	1592	target = self.make_branch_and_tree('target')
	1593	self.build_tree(['source/file', 'target/file'])
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1594	source.add('file', 'new-file')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1595	source.commit('added file')
	1596	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1597	self.assertEqual([DuplicateEntry('Moved existing file to',
	1598	'file.moved', 'file', None, 'new-file')],
	1599	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1600	target2 = self.make_branch_and_tree('target2')
	1601	target_file = file('target2/file', 'wb')
	1602	try:
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1603	source_file = file('source/file', 'rb')
	1604	try:
	1605	target_file.write(source_file.read())
	1606	finally:
	1607	source_file.close()
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1608	finally:
	1609	target_file.close()
	1610	build_tree(source.basis_tree(), target2)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1611	self.assertEqual([], target2.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1612
	1613	def test_symlink_conflict_handling(self):
	1614	"""Ensure that when building trees, conflict handling is done"""
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1615	self.requireFeature(SymlinkFeature)
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1616	source = self.make_branch_and_tree('source')
	1617	os.symlink('foo', 'source/symlink')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1618	source.add('symlink', 'new-symlink')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1619	source.commit('added file')
	1620	target = self.make_branch_and_tree('target')
	1621	os.symlink('bar', 'target/symlink')
	1622	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1623	self.assertEqual([DuplicateEntry('Moved existing file to',
	1624	'symlink.moved', 'symlink', None, 'new-symlink')],
	1625	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1626	target = self.make_branch_and_tree('target2')
	1627	os.symlink('foo', 'target2/symlink')
	1628	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1629	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1630
	1631	def test_directory_conflict_handling(self):
	1632	"""Ensure that when building trees, conflict handling is done"""
	1633	source = self.make_branch_and_tree('source')
	1634	target = self.make_branch_and_tree('target')
	1635	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	1636	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	1637	source.commit('added file')
	1638	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1639	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1640	self.failUnlessExists('target/dir1/file')
	1641
	1642	# Ensure contents are merged
	1643	target = self.make_branch_and_tree('target2')
	1644	self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
	1645	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1646	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1647	self.failUnlessExists('target2/dir1/file2')
	1648	self.failUnlessExists('target2/dir1/file')
	1649
	1650	# 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	1651	target = self.make_branch_and_tree('target3')
	1652	self.make_branch('target3/dir1')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1653	self.build_tree(['target3/dir1/file2'])
	1654	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1655	self.failIfExists('target3/dir1/file')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1656	self.failUnlessExists('target3/dir1/file2')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1657	self.failUnlessExists('target3/dir1.diverted/file')
	1658	self.assertEqual([DuplicateEntry('Diverted to',
	1659	'dir1.diverted', 'dir1', 'new-dir1', None)],
	1660	target.conflicts())
	1661
	1662	target = self.make_branch_and_tree('target4')
	1663	self.build_tree(['target4/dir1/'])
	1664	self.make_branch('target4/dir1/file')
	1665	build_tree(source.basis_tree(), target)
	1666	self.failUnlessExists('target4/dir1/file')
	1667	self.assertEqual('directory', file_kind('target4/dir1/file'))
	1668	self.failUnlessExists('target4/dir1/file.diverted')
	1669	self.assertEqual([DuplicateEntry('Diverted to',
	1670	'dir1/file.diverted', 'dir1/file', 'new-file', None)],
	1671	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1672
	1673	def test_mixed_conflict_handling(self):
	1674	"""Ensure that when building trees, conflict handling is done"""
	1675	source = self.make_branch_and_tree('source')
	1676	target = self.make_branch_and_tree('target')
	1677	self.build_tree(['source/name', 'target/name/'])
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1678	source.add('name', 'new-name')
	1679	source.commit('added file')
	1680	build_tree(source.basis_tree(), target)
	1681	self.assertEqual([DuplicateEntry('Moved existing file to',
	1682	'name.moved', 'name', None, 'new-name')], target.conflicts())
	1683
	1684	def test_raises_in_populated(self):
	1685	source = self.make_branch_and_tree('source')
	1686	self.build_tree(['source/name'])
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1687	source.add('name')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1688	source.commit('added name')
	1689	target = self.make_branch_and_tree('target')
	1690	self.build_tree(['target/name'])
	1691	target.add('name')
2090.2.1 by Martin Pool Fix some code which relies on assertions and breaks under python -O	1692	self.assertRaises(errors.WorkingTreeAlreadyPopulated,
	1693	build_tree, source.basis_tree(), target)
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1694
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1695	def test_build_tree_rename_count(self):
	1696	source = self.make_branch_and_tree('source')
	1697	self.build_tree(['source/file1', 'source/dir1/'])
	1698	source.add(['file1', 'dir1'])
	1699	source.commit('add1')
	1700	target1 = self.make_branch_and_tree('target1')
2502.1.6 by Aaron Bentley Update from review comments	1701	transform_result = build_tree(source.basis_tree(), target1)
2502.1.6 by Aaron Bentley Update from review comments	1702	self.assertEqual(2, transform_result.rename_count)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1703
	1704	self.build_tree(['source/dir1/file2'])
	1705	source.add(['dir1/file2'])
	1706	source.commit('add3')
	1707	target2 = self.make_branch_and_tree('target2')
2502.1.6 by Aaron Bentley Update from review comments	1708	transform_result = build_tree(source.basis_tree(), target2)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1709	# children of non-root directories should not be renamed
2502.1.6 by Aaron Bentley Update from review comments	1710	self.assertEqual(2, transform_result.rename_count)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1711
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1712	def create_ab_tree(self):
	1713	"""Create a committed test tree with two files"""
	1714	source = self.make_branch_and_tree('source')
	1715	self.build_tree_contents([('source/file1', 'A')])
	1716	self.build_tree_contents([('source/file2', 'B')])
	1717	source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
	1718	source.commit('commit files')
	1719	source.lock_write()
	1720	self.addCleanup(source.unlock)
	1721	return source
	1722
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1723	def test_build_tree_accelerator_tree(self):
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1724	source = self.create_ab_tree()
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1725	self.build_tree_contents([('source/file2', 'C')])
	1726	calls = []
	1727	real_source_get_file = source.get_file
	1728	def get_file(file_id, path=None):
	1729	calls.append(file_id)
	1730	return real_source_get_file(file_id, path)
	1731	source.get_file = get_file
	1732	target = self.make_branch_and_tree('target')
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1733	revision_tree = source.basis_tree()
	1734	revision_tree.lock_read()
	1735	self.addCleanup(revision_tree.unlock)
	1736	build_tree(revision_tree, target, source)
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1737	self.assertEqual(['file1-id'], calls)
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1738	target.lock_read()
	1739	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1740	self.assertEqual([], list(target.iter_changes(revision_tree)))
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1741
3123.5.4 by Aaron Bentley Use an accelerator tree when branching, handle no-such-id correctly	1742	def test_build_tree_accelerator_tree_missing_file(self):
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1743	source = self.create_ab_tree()
3123.5.4 by Aaron Bentley Use an accelerator tree when branching, handle no-such-id correctly	1744	os.unlink('source/file1')
	1745	source.remove(['file2'])
	1746	target = self.make_branch_and_tree('target')
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1747	revision_tree = source.basis_tree()
	1748	revision_tree.lock_read()
	1749	self.addCleanup(revision_tree.unlock)
	1750	build_tree(revision_tree, target, source)
	1751	target.lock_read()
	1752	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1753	self.assertEqual([], list(target.iter_changes(revision_tree)))
3123.5.4 by Aaron Bentley Use an accelerator tree when branching, handle no-such-id correctly	1754
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1755	def test_build_tree_accelerator_wrong_kind(self):
3146.4.8 by Aaron Bentley Add missing symlink requirement	1756	self.requireFeature(SymlinkFeature)
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1757	source = self.make_branch_and_tree('source')
	1758	self.build_tree_contents([('source/file1', '')])
	1759	self.build_tree_contents([('source/file2', '')])
	1760	source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
	1761	source.commit('commit files')
	1762	os.unlink('source/file2')
	1763	self.build_tree_contents([('source/file2/', 'C')])
	1764	os.unlink('source/file1')
	1765	os.symlink('file2', 'source/file1')
	1766	calls = []
	1767	real_source_get_file = source.get_file
	1768	def get_file(file_id, path=None):
	1769	calls.append(file_id)
	1770	return real_source_get_file(file_id, path)
	1771	source.get_file = get_file
	1772	target = self.make_branch_and_tree('target')
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1773	revision_tree = source.basis_tree()
	1774	revision_tree.lock_read()
	1775	self.addCleanup(revision_tree.unlock)
	1776	build_tree(revision_tree, target, source)
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1777	self.assertEqual([], calls)
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1778	target.lock_read()
	1779	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1780	self.assertEqual([], list(target.iter_changes(revision_tree)))
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1781
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1782	def test_build_tree_hardlink(self):
	1783	self.requireFeature(HardlinkFeature)
	1784	source = self.create_ab_tree()
	1785	target = self.make_branch_and_tree('target')
	1786	revision_tree = source.basis_tree()
	1787	revision_tree.lock_read()
	1788	self.addCleanup(revision_tree.unlock)
	1789	build_tree(revision_tree, target, source, hardlink=True)
	1790	target.lock_read()
	1791	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1792	self.assertEqual([], list(target.iter_changes(revision_tree)))
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1793	source_stat = os.stat('source/file1')
	1794	target_stat = os.stat('target/file1')
	1795	self.assertEqual(source_stat, target_stat)
	1796
	1797	# Explicitly disallowing hardlinks should prevent them.
	1798	target2 = self.make_branch_and_tree('target2')
	1799	build_tree(revision_tree, target2, source, hardlink=False)
	1800	target2.lock_read()
	1801	self.addCleanup(target2.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1802	self.assertEqual([], list(target2.iter_changes(revision_tree)))
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1803	source_stat = os.stat('source/file1')
	1804	target2_stat = os.stat('target2/file1')
	1805	self.assertNotEqual(source_stat, target2_stat)
	1806
3137.1.1 by Aaron Bentley Fix build_tree acceleration when file is moved in accelerator_tree	1807	def test_build_tree_accelerator_tree_moved(self):
	1808	source = self.make_branch_and_tree('source')
	1809	self.build_tree_contents([('source/file1', 'A')])
	1810	source.add(['file1'], ['file1-id'])
	1811	source.commit('commit files')
	1812	source.rename_one('file1', 'file2')
	1813	source.lock_read()
	1814	self.addCleanup(source.unlock)
	1815	target = self.make_branch_and_tree('target')
	1816	revision_tree = source.basis_tree()
	1817	revision_tree.lock_read()
	1818	self.addCleanup(revision_tree.unlock)
	1819	build_tree(revision_tree, target, source)
	1820	target.lock_read()
	1821	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1822	self.assertEqual([], list(target.iter_changes(revision_tree)))
3137.1.1 by Aaron Bentley Fix build_tree acceleration when file is moved in accelerator_tree	1823
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1824	def test_build_tree_hardlinks_preserve_execute(self):
	1825	self.requireFeature(HardlinkFeature)
	1826	source = self.create_ab_tree()
	1827	tt = TreeTransform(source)
	1828	trans_id = tt.trans_id_tree_file_id('file1-id')
	1829	tt.set_executability(True, trans_id)
	1830	tt.apply()
	1831	self.assertTrue(source.is_executable('file1-id'))
	1832	target = self.make_branch_and_tree('target')
	1833	revision_tree = source.basis_tree()
	1834	revision_tree.lock_read()
	1835	self.addCleanup(revision_tree.unlock)
	1836	build_tree(revision_tree, target, source, hardlink=True)
	1837	target.lock_read()
	1838	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1839	self.assertEqual([], list(target.iter_changes(revision_tree)))
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1840	self.assertTrue(source.is_executable('file1-id'))
	1841
3453.2.4 by Aaron Bentley Disable fast-path when conflicts are encountered	1842	def test_case_insensitive_build_tree_inventory(self):
	1843	source = self.make_branch_and_tree('source')
	1844	self.build_tree(['source/file', 'source/FILE'])
	1845	source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
	1846	source.commit('added files')
	1847	# Don't try this at home, kids!
	1848	# Force the tree to report that it is case insensitive
	1849	target = self.make_branch_and_tree('target')
	1850	target.case_sensitive = False
3453.2.6 by Aaron Bentley Rename mutate_tree to delta_from_tree, add comment	1851	build_tree(source.basis_tree(), target, source, delta_from_tree=True)
3453.2.4 by Aaron Bentley Disable fast-path when conflicts are encountered	1852	self.assertEqual('file.moved', target.id2path('lower-id'))
	1853	self.assertEqual('FILE', target.id2path('upper-id'))
	1854
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1855
1534.10.28 by Aaron Bentley Use numbered backup files	1856	class MockTransform(object):
	1857
	1858	def has_named_child(self, by_parent, parent_id, name):
	1859	for child_id in by_parent[parent_id]:
	1860	if child_id == '0':
	1861	if name == "name~":
	1862	return True
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1863	elif name == "name.~%s~" % child_id:
1534.10.28 by Aaron Bentley Use numbered backup files	1864	return True
	1865	return False
	1866
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1867
1534.10.28 by Aaron Bentley Use numbered backup files	1868	class MockEntry(object):
	1869	def __init__(self):
	1870	object.__init__(self)
	1871	self.name = "name"
	1872
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1873
1534.10.28 by Aaron Bentley Use numbered backup files	1874	class TestGetBackupName(TestCase):
	1875	def test_get_backup_name(self):
	1876	tt = MockTransform()
	1877	name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1878	self.assertEqual(name, 'name.~1~')
	1879	name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
	1880	self.assertEqual(name, 'name.~2~')
1534.10.28 by Aaron Bentley Use numbered backup files	1881	name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1882	self.assertEqual(name, 'name.~1~')
1534.10.28 by Aaron Bentley Use numbered backup files	1883	name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	1884	self.assertEqual(name, 'name.~1~')
	1885	name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
	1886	self.assertEqual(name, 'name.~4~')
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1887
	1888
	1889	class TestFileMover(tests.TestCaseWithTransport):
	1890
	1891	def test_file_mover(self):
	1892	self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
	1893	mover = _FileMover()
	1894	mover.rename('a', 'q')
	1895	self.failUnlessExists('q')
	1896	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	1897	self.failUnlessExists('q/b')
	1898	self.failUnlessExists('c')
	1899	self.failUnlessExists('c/d')
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1900
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1901	def test_pre_delete_rollback(self):
	1902	self.build_tree(['a/'])
	1903	mover = _FileMover()
	1904	mover.pre_delete('a', 'q')
	1905	self.failUnlessExists('q')
	1906	self.failIfExists('a')
	1907	mover.rollback()
	1908	self.failIfExists('q')
	1909	self.failUnlessExists('a')
	1910
	1911	def test_apply_deletions(self):
2733.2.12 by Aaron Bentley Updates from review	1912	self.build_tree(['a/', 'b/'])
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1913	mover = _FileMover()
	1914	mover.pre_delete('a', 'q')
2733.2.12 by Aaron Bentley Updates from review	1915	mover.pre_delete('b', 'r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1916	self.failUnlessExists('q')
2733.2.12 by Aaron Bentley Updates from review	1917	self.failUnlessExists('r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1918	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	1919	self.failIfExists('b')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1920	mover.apply_deletions()
	1921	self.failIfExists('q')
2733.2.12 by Aaron Bentley Updates from review	1922	self.failIfExists('r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1923	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	1924	self.failIfExists('b')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	1925
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1926	def test_file_mover_rollback(self):
	1927	self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
	1928	mover = _FileMover()
	1929	mover.rename('c/d', 'c/f')
	1930	mover.rename('c/e', 'c/d')
	1931	try:
	1932	mover.rename('a', 'c')
3063.1.3 by Aaron Bentley Update for Linux	1933	except errors.FileExists, e:
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	1934	mover.rollback()
	1935	self.failUnlessExists('a')
	1936	self.failUnlessExists('c/d')
2733.2.3 by Aaron Bentley Test tranform rollback	1937
	1938
	1939	class Bogus(Exception):
	1940	pass
	1941
	1942
	1943	class TestTransformRollback(tests.TestCaseWithTransport):
	1944
	1945	class ExceptionFileMover(_FileMover):
	1946
2733.2.4 by Aaron Bentley Test transform rollback when renaming into place	1947	def __init__(self, bad_source=None, bad_target=None):
	1948	_FileMover.__init__(self)
	1949	self.bad_source = bad_source
	1950	self.bad_target = bad_target
	1951
2733.2.3 by Aaron Bentley Test tranform rollback	1952	def rename(self, source, target):
2733.2.4 by Aaron Bentley Test transform rollback when renaming into place	1953	if (self.bad_source is not None and
	1954	source.endswith(self.bad_source)):
	1955	raise Bogus
	1956	elif (self.bad_target is not None and
	1957	target.endswith(self.bad_target)):
2733.2.3 by Aaron Bentley Test tranform rollback	1958	raise Bogus
	1959	else:
	1960	_FileMover.rename(self, source, target)
	1961
	1962	def test_rollback_rename(self):
	1963	tree = self.make_branch_and_tree('.')
	1964	self.build_tree(['a/', 'a/b'])
	1965	tt = TreeTransform(tree)
	1966	self.addCleanup(tt.finalize)
	1967	a_id = tt.trans_id_tree_path('a')
	1968	tt.adjust_path('c', tt.root, a_id)
	1969	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	1970	self.assertRaises(Bogus, tt.apply,
	1971	_mover=self.ExceptionFileMover(bad_source='a'))
	1972	self.failUnlessExists('a')
	1973	self.failUnlessExists('a/b')
	1974	tt.apply()
	1975	self.failUnlessExists('c')
	1976	self.failUnlessExists('c/d')
	1977
	1978	def test_rollback_rename_into_place(self):
	1979	tree = self.make_branch_and_tree('.')
	1980	self.build_tree(['a/', 'a/b'])
	1981	tt = TreeTransform(tree)
	1982	self.addCleanup(tt.finalize)
	1983	a_id = tt.trans_id_tree_path('a')
	1984	tt.adjust_path('c', tt.root, a_id)
	1985	tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
	1986	self.assertRaises(Bogus, tt.apply,
	1987	_mover=self.ExceptionFileMover(bad_target='c/d'))
	1988	self.failUnlessExists('a')
	1989	self.failUnlessExists('a/b')
	1990	tt.apply()
	1991	self.failUnlessExists('c')
	1992	self.failUnlessExists('c/d')
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	1993
	1994	def test_rollback_deletion(self):
	1995	tree = self.make_branch_and_tree('.')
	1996	self.build_tree(['a/', 'a/b'])
	1997	tt = TreeTransform(tree)
	1998	self.addCleanup(tt.finalize)
	1999	a_id = tt.trans_id_tree_path('a')
	2000	tt.delete_contents(a_id)
	2001	tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
	2002	self.assertRaises(Bogus, tt.apply,
	2003	_mover=self.ExceptionFileMover(bad_target='d'))
	2004	self.failUnlessExists('a')
	2005	self.failUnlessExists('a/b')
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2006
1551.19.6 by Aaron Bentley Revert doesn't crash restoring a file from a deleted directory	2007	def test_resolve_no_parent(self):
	2008	wt = self.make_branch_and_tree('.')
	2009	tt = TreeTransform(wt)
	2010	self.addCleanup(tt.finalize)
	2011	parent = tt.trans_id_file_id('parent-id')
	2012	tt.new_file('file', parent, 'Contents')
	2013	resolve_conflicts(tt)
3008.1.13 by Michael Hudson merge bzr.dev	2014
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2015
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2016	A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
	2017	('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
	2018	(False, False))
	2019	ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
	2020	('', ''), ('directory', 'directory'), (False, None))
	2021
	2022
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2023	class TestTransformPreview(tests.TestCaseWithTransport):
	2024
	2025	def create_tree(self):
	2026	tree = self.make_branch_and_tree('.')
	2027	self.build_tree_contents([('a', 'content 1')])
3008.2.1 by Aaron Bentley Ensure conflict resolution works	2028	tree.add('a', 'a-id')
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2029	tree.commit('rev1', rev_id='rev1')
	2030	return tree.branch.repository.revision_tree('rev1')
	2031
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	2032	def get_empty_preview(self):
	2033	repository = self.make_repository('repo')
	2034	tree = repository.revision_tree(_mod_revision.NULL_REVISION)
3199.1.4 by Vincent Ladeuil Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview	2035	preview = TransformPreview(tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2036	self.addCleanup(preview.finalize)
3199.1.4 by Vincent Ladeuil Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview	2037	return preview
	2038
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2039	def test_transform_preview(self):
	2040	revision_tree = self.create_tree()
	2041	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2042	self.addCleanup(preview.finalize)
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2043
	2044	def test_transform_preview_tree(self):
	2045	revision_tree = self.create_tree()
	2046	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2047	self.addCleanup(preview.finalize)
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2048	preview.get_preview_tree()
	2049
3008.1.5 by Michael Hudson a more precise test	2050	def test_transform_new_file(self):
	2051	revision_tree = self.create_tree()
	2052	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2053	self.addCleanup(preview.finalize)
3008.1.5 by Michael Hudson a more precise test	2054	preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
	2055	preview_tree = preview.get_preview_tree()
	2056	self.assertEqual(preview_tree.kind('file2-id'), 'file')
	2057	self.assertEqual(
	2058	preview_tree.get_file('file2-id').read(), 'content B\n')
	2059
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2060	def test_diff_preview_tree(self):
	2061	revision_tree = self.create_tree()
	2062	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2063	self.addCleanup(preview.finalize)
3008.1.4 by Michael Hudson Merge test enhancements	2064	preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2065	preview_tree = preview.get_preview_tree()
	2066	out = StringIO()
	2067	show_diff_trees(revision_tree, preview_tree, out)
3008.1.4 by Michael Hudson Merge test enhancements	2068	lines = out.getvalue().splitlines()
	2069	self.assertEqual(lines[0], "=== added file 'file2'")
	2070	# 3 lines of diff administrivia
	2071	self.assertEqual(lines[4], "+content B")
3008.2.1 by Aaron Bentley Ensure conflict resolution works	2072
	2073	def test_transform_conflicts(self):
	2074	revision_tree = self.create_tree()
	2075	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2076	self.addCleanup(preview.finalize)
3008.2.1 by Aaron Bentley Ensure conflict resolution works	2077	preview.new_file('a', preview.root, 'content 2')
	2078	resolve_conflicts(preview)
	2079	trans_id = preview.trans_id_file_id('a-id')
	2080	self.assertEqual('a.moved', preview.final_name(trans_id))
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2081
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2082	def get_tree_and_preview_tree(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2083	revision_tree = self.create_tree()
	2084	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2085	self.addCleanup(preview.finalize)
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2086	a_trans_id = preview.trans_id_file_id('a-id')
	2087	preview.delete_contents(a_trans_id)
	2088	preview.create_file('b content', a_trans_id)
	2089	preview_tree = preview.get_preview_tree()
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2090	return revision_tree, preview_tree
	2091
	2092	def test_iter_changes(self):
	2093	revision_tree, preview_tree = self.get_tree_and_preview_tree()
	2094	root = revision_tree.inventory.root.file_id
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2095	self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
	2096	(root, root), ('a', 'a'), ('file', 'file'),
	2097	(False, False))],
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	2098	list(preview_tree.iter_changes(revision_tree)))
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2099
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2100	def test_include_unchanged_succeeds(self):
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2101	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2102	changes = preview_tree.iter_changes(revision_tree,
	2103	include_unchanged=True)
	2104	root = revision_tree.inventory.root.file_id
	2105
	2106	self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2107
	2108	def test_specific_files(self):
	2109	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2110	changes = preview_tree.iter_changes(revision_tree,
	2111	specific_files=[''])
	2112	self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2113
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2114	def test_want_unversioned(self):
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2115	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2116	changes = preview_tree.iter_changes(revision_tree,
	2117	want_unversioned=True)
	2118	self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2119
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2120	def test_ignore_extra_trees_no_specific_files(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2121	# extra_trees is harmless without specific_files, so we'll silently
	2122	# accept it, even though we won't use it.
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2123	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	2124	preview_tree.iter_changes(revision_tree, extra_trees=[preview_tree])
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2125
	2126	def test_ignore_require_versioned_no_specific_files(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2127	# require_versioned is meaningless without specific_files.
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2128	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	2129	preview_tree.iter_changes(revision_tree, require_versioned=False)
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2130
	2131	def test_ignore_pb(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2132	# pb could be supported, but TT.iter_changes doesn't support it.
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2133	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	2134	preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	2135
	2136	def test_kind(self):
	2137	revision_tree = self.create_tree()
	2138	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2139	self.addCleanup(preview.finalize)
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	2140	preview.new_file('file', preview.root, 'contents', 'file-id')
	2141	preview.new_directory('directory', preview.root, 'dir-id')
	2142	preview_tree = preview.get_preview_tree()
	2143	self.assertEqual('file', preview_tree.kind('file-id'))
	2144	self.assertEqual('directory', preview_tree.kind('dir-id'))
	2145
	2146	def test_get_file_mtime(self):
	2147	preview = self.get_empty_preview()
	2148	file_trans_id = preview.new_file('file', preview.root, 'contents',
	2149	'file-id')
	2150	limbo_path = preview._limbo_name(file_trans_id)
	2151	preview_tree = preview.get_preview_tree()
	2152	self.assertEqual(os.stat(limbo_path).st_mtime,
	2153	preview_tree.get_file_mtime('file-id'))
	2154
	2155	def test_get_file(self):
	2156	preview = self.get_empty_preview()
	2157	preview.new_file('file', preview.root, 'contents', 'file-id')
	2158	preview_tree = preview.get_preview_tree()
	2159	tree_file = preview_tree.get_file('file-id')
	2160	try:
	2161	self.assertEqual('contents', tree_file.read())
	2162	finally:
	2163	tree_file.close()
3228.1.2 by James Henstridge Simplify test, and move it down to be next to the other _PreviewTree tests.	2164
	2165	def test_get_symlink_target(self):
	2166	self.requireFeature(SymlinkFeature)
	2167	preview = self.get_empty_preview()
	2168	preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
	2169	preview_tree = preview.get_preview_tree()
	2170	self.assertEqual('target',
	2171	preview_tree.get_symlink_target('symlink-id'))
3363.2.18 by Aaron Bentley Implement correct all_file_ids for PreviewTree	2172
	2173	def test_all_file_ids(self):
	2174	tree = self.make_branch_and_tree('tree')
	2175	self.build_tree(['tree/a', 'tree/b', 'tree/c'])
	2176	tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
	2177	preview = TransformPreview(tree)
	2178	self.addCleanup(preview.finalize)
	2179	preview.unversion_file(preview.trans_id_file_id('b-id'))
	2180	c_trans_id = preview.trans_id_file_id('c-id')
	2181	preview.unversion_file(c_trans_id)
	2182	preview.version_file('c-id', c_trans_id)
	2183	preview_tree = preview.get_preview_tree()
	2184	self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
	2185	preview_tree.all_file_ids())
3363.2.19 by Aaron Bentley Make PreviewTree.path2id correct	2186
	2187	def test_path2id_deleted_unchanged(self):
	2188	tree = self.make_branch_and_tree('tree')
	2189	self.build_tree(['tree/unchanged', 'tree/deleted'])
	2190	tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
	2191	preview = TransformPreview(tree)
	2192	self.addCleanup(preview.finalize)
	2193	preview.unversion_file(preview.trans_id_file_id('deleted-id'))
	2194	preview_tree = preview.get_preview_tree()
	2195	self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
	2196	self.assertIs(None, preview_tree.path2id('deleted'))
	2197
	2198	def test_path2id_created(self):
	2199	tree = self.make_branch_and_tree('tree')
	2200	self.build_tree(['tree/unchanged'])
	2201	tree.add(['unchanged'], ['unchanged-id'])
	2202	preview = TransformPreview(tree)
	2203	self.addCleanup(preview.finalize)
	2204	preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
	2205	'contents', 'new-id')
	2206	preview_tree = preview.get_preview_tree()
	2207	self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
	2208
	2209	def test_path2id_moved(self):
	2210	tree = self.make_branch_and_tree('tree')
	2211	self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
	2212	tree.add(['old_parent', 'old_parent/child'],
	2213	['old_parent-id', 'child-id'])
	2214	preview = TransformPreview(tree)
	2215	self.addCleanup(preview.finalize)
	2216	new_parent = preview.new_directory('new_parent', preview.root,
	2217	'new_parent-id')
	2218	preview.adjust_path('child', new_parent,
	2219	preview.trans_id_file_id('child-id'))
	2220	preview_tree = preview.get_preview_tree()
	2221	self.assertIs(None, preview_tree.path2id('old_parent/child'))
	2222	self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
	2223
	2224	def test_path2id_renamed_parent(self):
	2225	tree = self.make_branch_and_tree('tree')
	2226	self.build_tree(['tree/old_name/', 'tree/old_name/child'])
	2227	tree.add(['old_name', 'old_name/child'],
	2228	['parent-id', 'child-id'])
	2229	preview = TransformPreview(tree)
	2230	self.addCleanup(preview.finalize)
	2231	preview.adjust_path('new_name', preview.root,
	2232	preview.trans_id_file_id('parent-id'))
	2233	preview_tree = preview.get_preview_tree()
	2234	self.assertIs(None, preview_tree.path2id('old_name/child'))
	2235	self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
3363.2.21 by Aaron Bentley Implement iter_entries_by_dir	2236
	2237	def assertMatchingIterEntries(self, tt, specific_file_ids=None):
	2238	preview_tree = tt.get_preview_tree()
	2239	preview_result = list(preview_tree.iter_entries_by_dir(
	2240	specific_file_ids))
	2241	tree = tt._tree
	2242	tt.apply()
	2243	actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
	2244	self.assertEqual(actual_result, preview_result)
	2245
	2246	def test_iter_entries_by_dir_new(self):
	2247	tree = self.make_branch_and_tree('tree')
	2248	tt = TreeTransform(tree)
	2249	tt.new_file('new', tt.root, 'contents', 'new-id')
	2250	self.assertMatchingIterEntries(tt)
	2251
	2252	def test_iter_entries_by_dir_deleted(self):
	2253	tree = self.make_branch_and_tree('tree')
	2254	self.build_tree(['tree/deleted'])
	2255	tree.add('deleted', 'deleted-id')
	2256	tt = TreeTransform(tree)
	2257	tt.delete_contents(tt.trans_id_file_id('deleted-id'))
	2258	self.assertMatchingIterEntries(tt)
	2259
	2260	def test_iter_entries_by_dir_unversioned(self):
	2261	tree = self.make_branch_and_tree('tree')
	2262	self.build_tree(['tree/removed'])
	2263	tree.add('removed', 'removed-id')
	2264	tt = TreeTransform(tree)
	2265	tt.unversion_file(tt.trans_id_file_id('removed-id'))
	2266	self.assertMatchingIterEntries(tt)
	2267
	2268	def test_iter_entries_by_dir_moved(self):
	2269	tree = self.make_branch_and_tree('tree')
	2270	self.build_tree(['tree/moved', 'tree/new_parent/'])
	2271	tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
	2272	tt = TreeTransform(tree)
	2273	tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
	2274	tt.trans_id_file_id('moved-id'))
	2275	self.assertMatchingIterEntries(tt)
	2276
	2277	def test_iter_entries_by_dir_specific_file_ids(self):
	2278	tree = self.make_branch_and_tree('tree')
	2279	tree.set_root_id('tree-root-id')
	2280	self.build_tree(['tree/parent/', 'tree/parent/child'])
	2281	tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
	2282	tt = TreeTransform(tree)
	2283	self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
3363.2.26 by Aaron Bentley Get symlinks working	2284
	2285	def test_symlink_content_summary(self):
	2286	self.requireFeature(SymlinkFeature)
	2287	preview = self.get_empty_preview()
	2288	preview.new_symlink('path', preview.root, 'target', 'path-id')
	2289	summary = preview.get_preview_tree().path_content_summary('path')
	2290	self.assertEqual(('symlink', None, None, 'target'), summary)
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2291
	2292	def test_missing_content_summary(self):
	2293	preview = self.get_empty_preview()
	2294	summary = preview.get_preview_tree().path_content_summary('path')
	2295	self.assertEqual(('missing', None, None, None), summary)
	2296
	2297	def test_deleted_content_summary(self):
	2298	tree = self.make_branch_and_tree('tree')
	2299	self.build_tree(['tree/path/'])
	2300	tree.add('path')
	2301	preview = TransformPreview(tree)
	2302	self.addCleanup(preview.finalize)
	2303	preview.delete_contents(preview.trans_id_tree_path('path'))
	2304	summary = preview.get_preview_tree().path_content_summary('path')
	2305	self.assertEqual(('missing', None, None, None), summary)
	2306
3363.2.30 by Aaron Bentley Improve execute bit testing	2307	def test_file_content_summary_executable(self):
	2308	if not osutils.supports_executable():
	2309	raise TestNotApplicable()
	2310	preview = self.get_empty_preview()
	2311	path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
	2312	preview.set_executability(True, path_id)
	2313	summary = preview.get_preview_tree().path_content_summary('path')
	2314	self.assertEqual(4, len(summary))
	2315	self.assertEqual('file', summary[0])
	2316	# size must be known
	2317	self.assertEqual(len('contents'), summary[1])
	2318	# executable
	2319	self.assertEqual(True, summary[2])
3363.2.31 by Aaron Bentley Tweak tests	2320	# will not have hash (not cheap to determine)
3363.2.31 by Aaron Bentley Tweak tests	2321	self.assertIs(None, summary[3])
3363.2.30 by Aaron Bentley Improve execute bit testing	2322
	2323	def test_change_executability(self):
	2324	if not osutils.supports_executable():
	2325	raise TestNotApplicable()
	2326	tree = self.make_branch_and_tree('tree')
	2327	self.build_tree(['tree/path'])
	2328	tree.add('path')
	2329	preview = TransformPreview(tree)
	2330	self.addCleanup(preview.finalize)
	2331	path_id = preview.trans_id_tree_path('path')
	2332	preview.set_executability(True, path_id)
	2333	summary = preview.get_preview_tree().path_content_summary('path')
	2334	self.assertEqual(True, summary[2])
	2335
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2336	def test_file_content_summary_non_exec(self):
	2337	preview = self.get_empty_preview()
	2338	preview.new_file('path', preview.root, 'contents', 'path-id')
	2339	summary = preview.get_preview_tree().path_content_summary('path')
	2340	self.assertEqual(4, len(summary))
	2341	self.assertEqual('file', summary[0])
	2342	# size must be known
3363.2.30 by Aaron Bentley Improve execute bit testing	2343	self.assertEqual(len('contents'), summary[1])
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2344	# not executable
	2345	if osutils.supports_executable():
	2346	self.assertEqual(False, summary[2])
	2347	else:
	2348	self.assertEqual(None, summary[2])
3363.2.31 by Aaron Bentley Tweak tests	2349	# will not have hash (not cheap to determine)
3363.2.31 by Aaron Bentley Tweak tests	2350	self.assertIs(None, summary[3])
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2351
	2352	def test_dir_content_summary(self):
	2353	preview = self.get_empty_preview()
	2354	preview.new_directory('path', preview.root, 'path-id')
	2355	summary = preview.get_preview_tree().path_content_summary('path')
	2356	self.assertEqual(('directory', None, None, None), summary)
	2357
	2358	def test_tree_content_summary(self):
	2359	preview = self.get_empty_preview()
	2360	path = preview.new_directory('path', preview.root, 'path-id')
	2361	preview.set_tree_reference('rev-1', path)
	2362	summary = preview.get_preview_tree().path_content_summary('path')
	2363	self.assertEqual(4, len(summary))
	2364	self.assertEqual('tree-reference', summary[0])
3363.2.33 by Aaron Bentley Implement PreviewTree.annotate_iter	2365
	2366	def test_annotate(self):
	2367	tree = self.make_branch_and_tree('tree')
	2368	self.build_tree_contents([('tree/file', 'a\n')])
	2369	tree.add('file', 'file-id')
	2370	tree.commit('a', rev_id='one')
	2371	self.build_tree_contents([('tree/file', 'a\nb\n')])
	2372	preview = TransformPreview(tree)
	2373	self.addCleanup(preview.finalize)
	2374	file_trans_id = preview.trans_id_file_id('file-id')
	2375	preview.delete_contents(file_trans_id)
	2376	preview.create_file('a\nb\nc\n', file_trans_id)
	2377	preview_tree = preview.get_preview_tree()
	2378	expected = [
	2379	('one', 'a\n'),
	2380	('me:', 'b\n'),
	2381	('me:', 'c\n'),
	2382	]
	2383	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2384	self.assertEqual(expected, annotation)
	2385
	2386	def test_annotate_missing(self):
	2387	preview = self.get_empty_preview()
	2388	preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
	2389	preview_tree = preview.get_preview_tree()
	2390	expected = [
	2391	('me:', 'a\n'),
	2392	('me:', 'b\n'),
	2393	('me:', 'c\n'),
	2394	]
	2395	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2396	self.assertEqual(expected, annotation)
	2397
3363.7.3 by Aaron Bentley Add test that annotate correctly handles renames	2398	def test_annotate_rename(self):
	2399	tree = self.make_branch_and_tree('tree')
	2400	self.build_tree_contents([('tree/file', 'a\n')])
	2401	tree.add('file', 'file-id')
	2402	tree.commit('a', rev_id='one')
	2403	preview = TransformPreview(tree)
	2404	self.addCleanup(preview.finalize)
	2405	file_trans_id = preview.trans_id_file_id('file-id')
	2406	preview.adjust_path('newname', preview.root, file_trans_id)
	2407	preview_tree = preview.get_preview_tree()
	2408	expected = [
	2409	('one', 'a\n'),
	2410	]
	2411	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2412	self.assertEqual(expected, annotation)
	2413
3363.2.33 by Aaron Bentley Implement PreviewTree.annotate_iter	2414	def test_annotate_deleted(self):
	2415	tree = self.make_branch_and_tree('tree')
	2416	self.build_tree_contents([('tree/file', 'a\n')])
	2417	tree.add('file', 'file-id')
	2418	tree.commit('a', rev_id='one')
	2419	self.build_tree_contents([('tree/file', 'a\nb\n')])
	2420	preview = TransformPreview(tree)
	2421	self.addCleanup(preview.finalize)
	2422	file_trans_id = preview.trans_id_file_id('file-id')
	2423	preview.delete_contents(file_trans_id)
	2424	preview_tree = preview.get_preview_tree()
	2425	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2426	self.assertIs(None, annotation)
	2427
3363.2.36 by Aaron Bentley Fix PreviewTree.stored_kind	2428	def test_stored_kind(self):
	2429	preview = self.get_empty_preview()
	2430	preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
	2431	preview_tree = preview.get_preview_tree()
	2432	self.assertEqual('file', preview_tree.stored_kind('file-id'))
3363.2.37 by Aaron Bentley Fix is_executable	2433
	2434	def test_is_executable(self):
	2435	preview = self.get_empty_preview()
	2436	preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
	2437	preview.set_executability(True, preview.trans_id_file_id('file-id'))
	2438	preview_tree = preview.get_preview_tree()
	2439	self.assertEqual(True, preview_tree.is_executable('file-id'))
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2440
3571.1.1 by Aaron Bentley Allow set/get of parent_ids in PreviewTree	2441	def test_get_set_parent_ids(self):
	2442	revision_tree, preview_tree = self.get_tree_and_preview_tree()
	2443	self.assertEqual([], preview_tree.get_parent_ids())
	2444	preview_tree.set_parent_ids(['rev-1'])
	2445	self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
	2446
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2447	def test_plan_file_merge(self):
	2448	work_a = self.make_branch_and_tree('wta')
	2449	self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
	2450	work_a.add('file', 'file-id')
3363.9.7 by Aaron Bentley Fix up to use set_parent_ids	2451	base_id = work_a.commit('base version')
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2452	tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
	2453	preview = TransformPreview(work_a)
	2454	self.addCleanup(preview.finalize)
	2455	trans_id = preview.trans_id_file_id('file-id')
	2456	preview.delete_contents(trans_id)
	2457	preview.create_file('b\nc\nd\ne\n', trans_id)
	2458	self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
	2459	tree_a = preview.get_preview_tree()
3363.9.7 by Aaron Bentley Fix up to use set_parent_ids	2460	tree_a.set_parent_ids([base_id])
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2461	self.assertEqual([
3363.9.5 by Aaron Bentley Move killed-a from top to bottom	2462	('killed-a', 'a\n'),
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2463	('killed-b', 'b\n'),
	2464	('unchanged', 'c\n'),
	2465	('unchanged', 'd\n'),
	2466	('new-a', 'e\n'),
	2467	('new-b', 'f\n'),
	2468	], list(tree_a.plan_file_merge('file-id', tree_b)))
3363.9.8 by Aaron Bentley Ensure plan_file_merge works with a RevisionTree as the basis	2469
	2470	def test_plan_file_merge_revision_tree(self):
	2471	work_a = self.make_branch_and_tree('wta')
	2472	self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
	2473	work_a.add('file', 'file-id')
	2474	base_id = work_a.commit('base version')
	2475	tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
	2476	preview = TransformPreview(work_a.basis_tree())
	2477	self.addCleanup(preview.finalize)
	2478	trans_id = preview.trans_id_file_id('file-id')
	2479	preview.delete_contents(trans_id)
	2480	preview.create_file('b\nc\nd\ne\n', trans_id)
	2481	self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
	2482	tree_a = preview.get_preview_tree()
	2483	tree_a.set_parent_ids([base_id])
	2484	self.assertEqual([
	2485	('killed-a', 'a\n'),
	2486	('killed-b', 'b\n'),
	2487	('unchanged', 'c\n'),
	2488	('unchanged', 'd\n'),
	2489	('new-a', 'e\n'),
	2490	('new-b', 'f\n'),
	2491	], list(tree_a.plan_file_merge('file-id', tree_b)))
3363.9.9 by Aaron Bentley Implement walkdirs in terms of TreeTransform	2492
	2493	def test_walkdirs(self):
	2494	preview = self.get_empty_preview()
	2495	preview.version_file('tree-root', preview.root)
	2496	preview_tree = preview.get_preview_tree()
	2497	file_trans_id = preview.new_file('a', preview.root, 'contents',
	2498	'a-id')
	2499	expected = [(('', 'tree-root'),
	2500	[('a', 'a', 'file', None, 'a-id', 'file')])]
	2501	self.assertEqual(expected, list(preview_tree.walkdirs()))
3363.13.2 by Aaron Bentley Test specific cases for PreviewTree.extras	2502
	2503	def test_extras(self):
	2504	work_tree = self.make_branch_and_tree('tree')
	2505	self.build_tree(['tree/removed-file', 'tree/existing-file',
	2506	'tree/not-removed-file'])
	2507	work_tree.add(['removed-file', 'not-removed-file'])
	2508	preview = TransformPreview(work_tree)
3363.13.3 by Aaron Bentley Add cleanup	2509	self.addCleanup(preview.finalize)
3363.13.2 by Aaron Bentley Test specific cases for PreviewTree.extras	2510	preview.new_file('new-file', preview.root, 'contents')
	2511	preview.new_file('new-versioned-file', preview.root, 'contents',
	2512	'new-versioned-id')
	2513	tree = preview.get_preview_tree()
	2514	preview.unversion_file(preview.trans_id_tree_path('removed-file'))
	2515	self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
	2516	set(tree.extras()))
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2517
3363.17.2 by Aaron Bentley Add text checking	2518	def test_merge_into_preview(self):
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2519	work_tree = self.make_branch_and_tree('tree')
3363.17.2 by Aaron Bentley Add text checking	2520	self.build_tree_contents([('tree/file','b\n')])
3363.17.2 by Aaron Bentley Add text checking	2521	work_tree.add('file', 'file-id')
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2522	work_tree.commit('first commit')
	2523	child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
3363.17.2 by Aaron Bentley Add text checking	2524	self.build_tree_contents([('child/file','b\nc\n')])
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2525	child_tree.commit('child commit')
	2526	child_tree.lock_write()
	2527	self.addCleanup(child_tree.unlock)
	2528	work_tree.lock_write()
	2529	self.addCleanup(work_tree.unlock)
	2530	preview = TransformPreview(work_tree)
	2531	self.addCleanup(preview.finalize)
	2532	preview_tree = preview.get_preview_tree()
3363.17.6 by Aaron Bentley Improve test scenario	2533	file_trans_id = preview.trans_id_file_id('file-id')
	2534	preview.delete_contents(file_trans_id)
	2535	preview.create_file('a\nb\n', file_trans_id)
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2536	pb = progress.DummyProgress()
	2537	merger = Merger.from_revision_ids(pb, preview_tree,
	2538	child_tree.branch.last_revision(),
	2539	other_branch=child_tree.branch,
	2540	tree_branch=work_tree.branch)
	2541	merger.merge_type = Merge3Merger
	2542	tt = merger.make_merger().make_preview_transform()
3363.17.2 by Aaron Bentley Add text checking	2543	self.addCleanup(tt.finalize)
	2544	final_tree = tt.get_preview_tree()
	2545	self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3363.17.17 by Aaron Bentley Start testing merging PreviewTree as OTHER	2546
	2547	def test_merge_preview_into_workingtree(self):
	2548	tree = self.make_branch_and_tree('tree')
	2549	tt = TransformPreview(tree)
	2550	self.addCleanup(tt.finalize)
	2551	tt.new_file('name', tt.root, 'content', 'file-id')
	2552	tree2 = self.make_branch_and_tree('tree2')
	2553	pb = progress.DummyProgress()
	2554	merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
	2555	pb, tree.basis_tree())
	2556	merger.merge_type = Merge3Merger
	2557	merger.do_merge()
3363.17.18 by Aaron Bentley Fix is_executable for PreviewTree	2558
3363.17.21 by Aaron Bentley Conflicts are handled when merging from preview trees	2559	def test_merge_preview_into_workingtree_handles_conflicts(self):
	2560	tree = self.make_branch_and_tree('tree')
	2561	self.build_tree_contents([('tree/foo', 'bar')])
	2562	tree.add('foo', 'foo-id')
	2563	tree.commit('foo')
	2564	tt = TransformPreview(tree)
	2565	self.addCleanup(tt.finalize)
	2566	trans_id = tt.trans_id_file_id('foo-id')
	2567	tt.delete_contents(trans_id)
	2568	tt.create_file('baz', trans_id)
	2569	tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
	2570	self.build_tree_contents([('tree2/foo', 'qux')])
	2571	pb = progress.DummyProgress()
	2572	merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
	2573	pb, tree.basis_tree())
	2574	merger.merge_type = Merge3Merger
	2575	merger.do_merge()
	2576
3363.17.18 by Aaron Bentley Fix is_executable for PreviewTree	2577	def test_is_executable(self):
	2578	tree = self.make_branch_and_tree('tree')
	2579	preview = TransformPreview(tree)
	2580	self.addCleanup(preview.finalize)
	2581	preview.new_file('foo', preview.root, 'bar', 'baz-id')
	2582	preview_tree = preview.get_preview_tree()
	2583	self.assertEqual(False, preview_tree.is_executable('baz-id',
	2584	'tree/foo'))
	2585	self.assertEqual(False, preview_tree.is_executable('baz-id'))