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

: (revision 5200.3.7)

To get this branch, use:

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

4634.125.4 by John Arbash Meinel Merge bzr/2.0@4725, resolve NEWS	1	# Copyright (C) 2006-2010 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
4183.7.1 by Sabin Iacob update FSF mailing address	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.7.106 by Aaron Bentley Cleaned up imports, added copyright statements	16
	17	import os
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	18	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	19	import sys
4934.1.1 by John Arbash Meinel Basic implementation for windows and bug #488724.	20	import time
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 (
2694.5.4 by Jelmer Vernooij Move bzrlib.util.bencode to bzrlib._bencode_py.	23	bencode,
2090.2.1 by Martin Pool Fix some code which relies on assertions and breaks under python -O	24	errors,
4826.1.5 by Andrew Bennetts Add test that content filtered files are not hardlinked by build_tree.	25	filters,
2116.4.1 by John Arbash Meinel Update file and revision id generators.	26	generate_ids,
3199.1.4 by Vincent Ladeuil Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview	27	osutils,
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	28	revision as _mod_revision,
4826.1.5 by Andrew Bennetts Add test that content filtered files are not hardlinked by build_tree.	29	rules,
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	30	tests,
	31	urlutils,
	32	)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	33	from bzrlib.bzrdir import BzrDir
5162.4.1 by Aaron Bentley TreeTransform supports normal commit parameters and includes branch nick.	34	from bzrlib.conflicts import (
	35	DeletingParent,
	36	DuplicateEntry,
	37	DuplicateID,
	38	MissingParent,
	39	NonDirectoryParent,
	40	ParentLoop,
	41	UnversionedParent,
	42	)
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	43	from bzrlib.diff import show_diff_trees
5162.4.1 by Aaron Bentley TreeTransform supports normal commit parameters and includes branch nick.	44	from bzrlib.errors import (
	45	DuplicateKey,
	46	ExistingLimbo,
	47	ExistingPendingDeletion,
	48	ImmortalLimbo,
	49	ImmortalPendingDeletion,
	50	LockError,
	51	MalformedTransform,
	52	NoSuchFile,
	53	ReusingTransform,
	54	)
	55	from bzrlib.osutils import (
	56	file_kind,
	57	pathjoin,
	58	)
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	59	from bzrlib.merge import Merge3Merger, Merger
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	60	from bzrlib.tests import (
3136.1.1 by Aaron Bentley Add support for hardlinks to TreeTransform	61	HardlinkFeature,
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	62	SymlinkFeature,
	63	TestCase,
	64	TestCaseInTempDir,
	65	TestSkipped,
5162.4.1 by Aaron Bentley TreeTransform supports normal commit parameters and includes branch nick.	66	)
	67	from bzrlib.transform import (
	68	build_tree,
	69	create_from_tree,
	70	cook_conflicts,
	71	_FileMover,
	72	FinalPaths,
	73	get_backup_name,
	74	resolve_conflicts,
	75	resolve_checkout,
	76	ROOT_PARENT,
	77	TransformPreview,
	78	TreeTransform,
	79	)
0.13.13 by Aaron Bentley Add direct test of serialization records	80
1534.7.1 by Aaron Bentley Got creation of a versioned file working	81
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	82	class TestTreeTransform(tests.TestCaseWithTransport):
1740.2.4 by Aaron Bentley Update transform tests and docs	83
1534.7.59 by Aaron Bentley Simplified tests	84	def setUp(self):
1534.7.59 by Aaron Bentley Simplified tests	85	super(TestTreeTransform, self).setUp()
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	86	self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
1534.7.161 by Aaron Bentley Used appropriate control_files	87	os.chdir('..')
1534.7.59 by Aaron Bentley Simplified tests	88
	89	def get_transform(self):
	90	transform = TreeTransform(self.wt)
3453.2.7 by Aaron Bentley Remove test kipple	91	self.addCleanup(transform.finalize)
1731.1.33 by Aaron Bentley Revert no-special-root changes	92	return transform, transform.root
1534.7.59 by Aaron Bentley Simplified tests	93
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	94	def test_existing_limbo(self):
	95	transform, root = self.get_transform()
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	96	limbo_name = transform._limbodir
	97	deletion_path = transform._deletiondir
1534.7.176 by abentley Fixed up tests for Windows	98	os.mkdir(pathjoin(limbo_name, 'hehe'))
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	99	self.assertRaises(ImmortalLimbo, transform.apply)
	100	self.assertRaises(LockError, self.wt.unlock)
	101	self.assertRaises(ExistingLimbo, self.get_transform)
	102	self.assertRaises(LockError, self.wt.unlock)
1534.7.176 by abentley Fixed up tests for Windows	103	os.rmdir(pathjoin(limbo_name, 'hehe'))
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	104	os.rmdir(limbo_name)
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	105	os.rmdir(deletion_path)
1534.7.162 by Aaron Bentley Handle failures creating/deleting the Limbo directory	106	transform, root = self.get_transform()
	107	transform.apply()
1534.7.59 by Aaron Bentley Simplified tests	108
2733.2.11 by Aaron Bentley Detect irregularities with the pending-deletion directory	109	def test_existing_pending_deletion(self):
	110	transform, root = self.get_transform()
	111	deletion_path = self._limbodir = urlutils.local_path_from_url(
3407.2.8 by Martin Pool Deprecate LockableFiles.controlfilename	112	transform._tree._transport.abspath('pending-deletion'))
2733.2.11 by Aaron Bentley Detect irregularities with the pending-deletion directory	113	os.mkdir(pathjoin(deletion_path, 'blocking-directory'))
	114	self.assertRaises(ImmortalPendingDeletion, transform.apply)
	115	self.assertRaises(LockError, self.wt.unlock)
	116	self.assertRaises(ExistingPendingDeletion, self.get_transform)
	117
1534.7.1 by Aaron Bentley Got creation of a versioned file working	118	def test_build(self):
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	119	transform, root = self.get_transform()
	120	self.wt.lock_tree_write()
	121	self.addCleanup(self.wt.unlock)
1534.7.59 by Aaron Bentley Simplified tests	122	self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	123	imaginary_id = transform.trans_id_tree_path('imaginary')
1534.10.32 by Aaron Bentley Test and fix case where name has trailing slash	124	imaginary_id2 = transform.trans_id_tree_path('imaginary/')
	125	self.assertEqual(imaginary_id, imaginary_id2)
1534.7.59 by Aaron Bentley Simplified tests	126	self.assertEqual(transform.get_tree_parent(imaginary_id), root)
	127	self.assertEqual(transform.final_kind(root), 'directory')
	128	self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
	129	trans_id = transform.create_path('name', root)
	130	self.assertIs(transform.final_file_id(trans_id), None)
	131	self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
	132	transform.create_file('contents', trans_id)
	133	transform.set_executability(True, trans_id)
	134	transform.version_file('my_pretties', trans_id)
	135	self.assertRaises(DuplicateKey, transform.version_file,
	136	'my_pretties', trans_id)
	137	self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
	138	self.assertEqual(transform.final_parent(trans_id), root)
	139	self.assertIs(transform.final_parent(root), ROOT_PARENT)
	140	self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
	141	oz_id = transform.create_path('oz', root)
	142	transform.create_directory(oz_id)
	143	transform.version_file('ozzie', oz_id)
	144	trans_id2 = transform.create_path('name2', root)
	145	transform.create_file('contents', trans_id2)
	146	transform.set_executability(False, trans_id2)
	147	transform.version_file('my_pretties2', trans_id2)
1534.7.191 by Aaron Bentley Got transform.apply to list modified paths	148	modified_paths = transform.apply().modified_paths
1534.7.100 by Aaron Bentley Fixed path-relative test cases	149	self.assertEqual('contents', self.wt.get_file_byname('name').read())
1534.7.59 by Aaron Bentley Simplified tests	150	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	151	self.assertIs(self.wt.is_executable('my_pretties'), True)
	152	self.assertIs(self.wt.is_executable('my_pretties2'), False)
1534.7.100 by Aaron Bentley Fixed path-relative test cases	153	self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
1534.7.191 by Aaron Bentley Got transform.apply to list modified paths	154	self.assertEqual(len(modified_paths), 3)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	155	tree_mod_paths = [self.wt.id2abspath(f) for f in
1534.7.191 by Aaron Bentley Got transform.apply to list modified paths	156	('ozzie', 'my_pretties', 'my_pretties2')]
	157	self.assertSubset(tree_mod_paths, modified_paths)
1534.7.1 by Aaron Bentley Got creation of a versioned file working	158	# is it safe to finalize repeatedly?
	159	transform.finalize()
1534.7.59 by Aaron Bentley Simplified tests	160	transform.finalize()
1534.7.2 by Aaron Bentley Added convenience function	161
4934.1.1 by John Arbash Meinel Basic implementation for windows and bug #488724.	162	def test_create_files_same_timestamp(self):
	163	transform, root = self.get_transform()
	164	self.wt.lock_tree_write()
	165	self.addCleanup(self.wt.unlock)
	166	# Roll back the clock, so that we know everything is being set to the
	167	# exact time
4934.1.10 by John Arbash Meinel Rework the tests a bit.	168	transform._creation_mtime = creation_mtime = time.time() - 20.0
4934.1.1 by John Arbash Meinel Basic implementation for windows and bug #488724.	169	transform.create_file('content-one',
	170	transform.create_path('one', root))
	171	time.sleep(1) # ugly
	172	transform.create_file('content-two',
	173	transform.create_path('two', root))
	174	transform.apply()
	175	fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)
	176	fo.close()
	177	fo, st2 = self.wt.get_file_with_stat(None, path='two', filtered=False)
	178	fo.close()
4934.2.2 by Martin Rearrange osutils.fset_mtime tests a little and make them robust on FAT filesystems	179	# We only guarantee 2s resolution
4934.1.11 by John Arbash Meinel 2 => 2.0 because it looks better.	180	self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
4934.1.10 by John Arbash Meinel Rework the tests a bit.	181	"%s != %s within 2 seconds" % (creation_mtime, st1.st_mtime))
4934.1.6 by John Arbash Meinel It turns out that with os/python/C buffering, we need to flush	182	# But if we have more than that, all files should get the same result
4934.1.1 by John Arbash Meinel Basic implementation for windows and bug #488724.	183	self.assertEqual(st1.st_mtime, st2.st_mtime)
	184
4634.122.2 by Aaron Bentley, John Arbash Meinel Bring the fixup_new_roots code from the nested-trees code.	185	def test_change_root_id(self):
	186	transform, root = self.get_transform()
	187	self.assertNotEqual('new-root-id', self.wt.get_root_id())
	188	transform.new_directory('', ROOT_PARENT, 'new-root-id')
	189	transform.delete_contents(root)
	190	transform.unversion_file(root)
	191	transform.fixup_new_roots()
	192	transform.apply()
	193	self.assertEqual('new-root-id', self.wt.get_root_id())
	194
	195	def test_change_root_id_add_files(self):
	196	transform, root = self.get_transform()
	197	self.assertNotEqual('new-root-id', self.wt.get_root_id())
	198	new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
	199	transform.new_file('file', new_trans_id, ['new-contents\n'],
	200	'new-file-id')
	201	transform.delete_contents(root)
	202	transform.unversion_file(root)
	203	transform.fixup_new_roots()
	204	transform.apply()
	205	self.assertEqual('new-root-id', self.wt.get_root_id())
	206	self.assertEqual('new-file-id', self.wt.path2id('file'))
	207	self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
	208
	209	def test_add_two_roots(self):
	210	transform, root = self.get_transform()
	211	new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
	212	new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
	213	self.assertRaises(ValueError, transform.fixup_new_roots)
	214
3136.1.1 by Aaron Bentley Add support for hardlinks to TreeTransform	215	def test_hardlink(self):
	216	self.requireFeature(HardlinkFeature)
	217	transform, root = self.get_transform()
	218	transform.new_file('file1', root, 'contents')
	219	transform.apply()
	220	target = self.make_branch_and_tree('target')
	221	target_transform = TreeTransform(target)
	222	trans_id = target_transform.create_path('file1', target_transform.root)
	223	target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
	224	target_transform.apply()
	225	self.failUnlessExists('target/file1')
	226	source_stat = os.stat(self.wt.abspath('file1'))
	227	target_stat = os.stat('target/file1')
	228	self.assertEqual(source_stat, target_stat)
	229
1534.7.2 by Aaron Bentley Added convenience function	230	def test_convenience(self):
1534.7.59 by Aaron Bentley Simplified tests	231	transform, root = self.get_transform()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	232	self.wt.lock_tree_write()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	233	self.addCleanup(self.wt.unlock)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	234	trans_id = transform.new_file('name', root, 'contents',
1534.7.59 by Aaron Bentley Simplified tests	235	'my_pretties', True)
	236	oz = transform.new_directory('oz', root, 'oz-id')
	237	dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	238	toto = transform.new_file('toto', dorothy, 'toto-contents',
1534.7.59 by Aaron Bentley Simplified tests	239	'toto-id', False)
	240
	241	self.assertEqual(len(transform.find_conflicts()), 0)
	242	transform.apply()
	243	self.assertRaises(ReusingTransform, transform.find_conflicts)
1534.7.100 by Aaron Bentley Fixed path-relative test cases	244	self.assertEqual('contents', file(self.wt.abspath('name')).read())
1534.7.59 by Aaron Bentley Simplified tests	245	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	246	self.assertIs(self.wt.is_executable('my_pretties'), True)
	247	self.assertEqual(self.wt.path2id('oz'), 'oz-id')
	248	self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
	249	self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
	250
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	251	self.assertEqual('toto-contents',
1534.7.100 by Aaron Bentley Fixed path-relative test cases	252	self.wt.get_file_byname('oz/dorothy/toto').read())
1534.7.59 by Aaron Bentley Simplified tests	253	self.assertIs(self.wt.is_executable('toto-id'), False)
1534.7.6 by Aaron Bentley Added conflict handling	254
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	255	def test_tree_reference(self):
	256	transform, root = self.get_transform()
	257	tree = transform._tree
	258	trans_id = transform.new_directory('reference', root, 'subtree-id')
	259	transform.set_tree_reference('subtree-revision', trans_id)
	260	transform.apply()
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	261	tree.lock_read()
	262	self.addCleanup(tree.unlock)
	263	self.assertEqual('subtree-revision',
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	264	tree.inventory['subtree-id'].reference_revision)
	265
1534.7.6 by Aaron Bentley Added conflict handling	266	def test_conflicts(self):
1534.7.59 by Aaron Bentley Simplified tests	267	transform, root = self.get_transform()
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	268	trans_id = transform.new_file('name', root, 'contents',
1534.7.59 by Aaron Bentley Simplified tests	269	'my_pretties')
	270	self.assertEqual(len(transform.find_conflicts()), 0)
	271	trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	272	self.assertEqual(transform.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	273	[('duplicate', trans_id, trans_id2, 'name')])
	274	self.assertRaises(MalformedTransform, transform.apply)
	275	transform.adjust_path('name', trans_id, trans_id2)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	276	self.assertEqual(transform.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	277	[('non-directory parent', trans_id)])
1534.7.181 by Aaron Bentley Renamed a bunch of functions	278	tinman_id = transform.trans_id_tree_path('tinman')
1534.7.59 by Aaron Bentley Simplified tests	279	transform.adjust_path('name', tinman_id, trans_id2)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	280	self.assertEqual(transform.find_conflicts(),
	281	[('unversioned parent', tinman_id),
1534.7.59 by Aaron Bentley Simplified tests	282	('missing parent', tinman_id)])
1534.7.59 by Aaron Bentley Simplified tests	283	lion_id = transform.create_path('lion', root)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	284	self.assertEqual(transform.find_conflicts(),
	285	[('unversioned parent', tinman_id),
1534.7.59 by Aaron Bentley Simplified tests	286	('missing parent', tinman_id)])
1534.7.59 by Aaron Bentley Simplified tests	287	transform.adjust_path('name', lion_id, trans_id2)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	288	self.assertEqual(transform.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	289	[('unversioned parent', lion_id),
	290	('missing parent', lion_id)])
	291	transform.version_file("Courage", lion_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	292	self.assertEqual(transform.find_conflicts(),
	293	[('missing parent', lion_id),
1534.7.59 by Aaron Bentley Simplified tests	294	('versioning no contents', lion_id)])
1534.7.59 by Aaron Bentley Simplified tests	295	transform.adjust_path('name2', root, trans_id2)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	296	self.assertEqual(transform.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	297	[('versioning no contents', lion_id)])
	298	transform.create_file('Contents, okay?', lion_id)
	299	transform.adjust_path('name2', trans_id2, trans_id2)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	300	self.assertEqual(transform.find_conflicts(),
	301	[('parent loop', trans_id2),
1534.7.59 by Aaron Bentley Simplified tests	302	('non-directory parent', trans_id2)])
	303	transform.adjust_path('name2', root, trans_id2)
	304	oz_id = transform.new_directory('oz', root)
	305	transform.set_executability(True, oz_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	306	self.assertEqual(transform.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	307	[('unversioned executability', oz_id)])
1534.7.59 by Aaron Bentley Simplified tests	308	transform.version_file('oz-id', oz_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	309	self.assertEqual(transform.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	310	[('non-file executability', oz_id)])
1534.7.59 by Aaron Bentley Simplified tests	311	transform.set_executability(None, oz_id)
1534.7.71 by abentley All tests pass under Windows	312	tip_id = transform.new_file('tip', oz_id, 'ozma', 'tip-id')
1534.7.59 by Aaron Bentley Simplified tests	313	transform.apply()
	314	self.assertEqual(self.wt.path2id('name'), 'my_pretties')
	315	self.assertEqual('contents', file(self.wt.abspath('name')).read())
	316	transform2, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	317	oz_id = transform2.trans_id_tree_file_id('oz-id')
1534.7.59 by Aaron Bentley Simplified tests	318	newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
1534.7.59 by Aaron Bentley Simplified tests	319	result = transform2.find_conflicts()
1534.7.135 by Aaron Bentley Fixed deletion handling	320	fp = FinalPaths(transform2)
1534.7.59 by Aaron Bentley Simplified tests	321	self.assert_('oz/tip' in transform2._tree_path_ids)
1534.7.176 by abentley Fixed up tests for Windows	322	self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
1534.7.59 by Aaron Bentley Simplified tests	323	self.assertEqual(len(result), 2)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	324	self.assertEqual((result[0][0], result[0][1]),
1534.7.59 by Aaron Bentley Simplified tests	325	('duplicate', newtip))
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	326	self.assertEqual((result[1][0], result[1][2]),
1534.7.59 by Aaron Bentley Simplified tests	327	('duplicate id', newtip))
1534.7.73 by Aaron Bentley Changed model again. Now iterator is used immediately.	328	transform2.finalize()
1534.7.59 by Aaron Bentley Simplified tests	329	transform3 = TreeTransform(self.wt)
1534.7.59 by Aaron Bentley Simplified tests	330	self.addCleanup(transform3.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	331	oz_id = transform3.trans_id_tree_file_id('oz-id')
1534.7.59 by Aaron Bentley Simplified tests	332	transform3.delete_contents(oz_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	333	self.assertEqual(transform3.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	334	[('missing parent', oz_id)])
1731.1.33 by Aaron Bentley Revert no-special-root changes	335	root_id = transform3.root
1534.7.181 by Aaron Bentley Renamed a bunch of functions	336	tip_id = transform3.trans_id_tree_file_id('tip-id')
1534.7.59 by Aaron Bentley Simplified tests	337	transform3.adjust_path('tip', root_id, tip_id)
1534.7.59 by Aaron Bentley Simplified tests	338	transform3.apply()
1534.7.36 by Aaron Bentley Added rename tests	339
3034.4.1 by Aaron Bentley Start handling case-insensitivity	340	def test_conflict_on_case_insensitive(self):
	341	tree = self.make_branch_and_tree('tree')
	342	# Don't try this at home, kids!
	343	# Force the tree to report that it is case sensitive, for conflict
	344	# resolution tests
	345	tree.case_sensitive = True
	346	transform = TreeTransform(tree)
	347	self.addCleanup(transform.finalize)
	348	transform.new_file('file', transform.root, 'content')
	349	transform.new_file('FiLe', transform.root, 'content')
	350	result = transform.find_conflicts()
	351	self.assertEqual([], result)
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	352	transform.finalize()
3034.4.1 by Aaron Bentley Start handling case-insensitivity	353	# Force the tree to report that it is case insensitive, for conflict
	354	# generation tests
	355	tree.case_sensitive = False
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	356	transform = TreeTransform(tree)
	357	self.addCleanup(transform.finalize)
	358	transform.new_file('file', transform.root, 'content')
	359	transform.new_file('FiLe', transform.root, 'content')
3034.4.1 by Aaron Bentley Start handling case-insensitivity	360	result = transform.find_conflicts()
	361	self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
	362
3034.4.7 by Aaron Bentley Add test for filename conflicts with existing files	363	def test_conflict_on_case_insensitive_existing(self):
	364	tree = self.make_branch_and_tree('tree')
	365	self.build_tree(['tree/FiLe'])
	366	# Don't try this at home, kids!
	367	# Force the tree to report that it is case sensitive, for conflict
	368	# resolution tests
	369	tree.case_sensitive = True
	370	transform = TreeTransform(tree)
	371	self.addCleanup(transform.finalize)
	372	transform.new_file('file', transform.root, 'content')
	373	result = transform.find_conflicts()
	374	self.assertEqual([], result)
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	375	transform.finalize()
3034.4.7 by Aaron Bentley Add test for filename conflicts with existing files	376	# Force the tree to report that it is case insensitive, for conflict
	377	# generation tests
	378	tree.case_sensitive = False
3008.1.15 by Aaron Bentley Make case_sensitive an aspect of the transform, not the source tree	379	transform = TreeTransform(tree)
	380	self.addCleanup(transform.finalize)
	381	transform.new_file('file', transform.root, 'content')
3034.4.7 by Aaron Bentley Add test for filename conflicts with existing files	382	result = transform.find_conflicts()
	383	self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
	384
3034.4.1 by Aaron Bentley Start handling case-insensitivity	385	def test_resolve_case_insensitive_conflict(self):
	386	tree = self.make_branch_and_tree('tree')
	387	# Don't try this at home, kids!
	388	# Force the tree to report that it is case insensitive, for conflict
	389	# resolution tests
	390	tree.case_sensitive = False
	391	transform = TreeTransform(tree)
	392	self.addCleanup(transform.finalize)
	393	transform.new_file('file', transform.root, 'content')
	394	transform.new_file('FiLe', transform.root, 'content')
	395	resolve_conflicts(transform)
	396	transform.apply()
	397	self.failUnlessExists('tree/file')
	398	self.failUnlessExists('tree/FiLe.moved')
	399
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	400	def test_resolve_checkout_case_conflict(self):
3034.4.1 by Aaron Bentley Start handling case-insensitivity	401	tree = self.make_branch_and_tree('tree')
	402	# Don't try this at home, kids!
	403	# Force the tree to report that it is case insensitive, for conflict
	404	# resolution tests
	405	tree.case_sensitive = False
	406	transform = TreeTransform(tree)
	407	self.addCleanup(transform.finalize)
	408	transform.new_file('file', transform.root, 'content')
	409	transform.new_file('FiLe', transform.root, 'content')
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	410	resolve_conflicts(transform,
	411	pass_func=lambda t, c: resolve_checkout(t, c, []))
3034.4.1 by Aaron Bentley Start handling case-insensitivity	412	transform.apply()
	413	self.failUnlessExists('tree/file')
	414	self.failUnlessExists('tree/FiLe.moved')
	415
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	416	def test_apply_case_conflict(self):
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	417	"""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	418	tree = self.make_branch_and_tree('tree')
	419	transform = TreeTransform(tree)
	420	self.addCleanup(transform.finalize)
	421	transform.new_file('file', transform.root, 'content')
	422	transform.new_file('FiLe', transform.root, 'content')
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	423	dir = transform.new_directory('dir', transform.root)
	424	transform.new_file('dirfile', dir, 'content')
	425	transform.new_file('dirFiLe', dir, 'content')
	426	resolve_conflicts(transform)
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	427	transform.apply()
3034.4.3 by Aaron Bentley Add case-sensitivity handling to WorkingTree	428	self.failUnlessExists('tree/file')
	429	if not os.path.exists('tree/FiLe.moved'):
	430	self.failUnlessExists('tree/FiLe')
3034.4.6 by Aaron Bentley Update apply_case_conflict tests	431	self.failUnlessExists('tree/dir/dirfile')
	432	if not os.path.exists('tree/dir/dirFiLe.moved'):
	433	self.failUnlessExists('tree/dir/dirFiLe')
3034.4.2 by Aaron Bentley Get conflict handling and case-insensitive tree creation under test	434
3034.4.1 by Aaron Bentley Start handling case-insensitivity	435	def test_case_insensitive_limbo(self):
	436	tree = self.make_branch_and_tree('tree')
	437	# Don't try this at home, kids!
	438	# Force the tree to report that it is case insensitive
	439	tree.case_sensitive = False
	440	transform = TreeTransform(tree)
	441	self.addCleanup(transform.finalize)
	442	dir = transform.new_directory('dir', transform.root)
	443	first = transform.new_file('file', dir, 'content')
	444	second = transform.new_file('FiLe', dir, 'content')
	445	self.assertContainsRe(transform._limbo_name(first), 'new-1/file')
	446	self.assertNotContainsRe(transform._limbo_name(second), 'new-1/FiLe')
	447
4634.78.1 by Aaron Bentley adjust_path updatest limbo paths.	448	def test_adjust_path_updates_child_limbo_names(self):
	449	tree = self.make_branch_and_tree('tree')
	450	transform = TreeTransform(tree)
	451	self.addCleanup(transform.finalize)
	452	foo_id = transform.new_directory('foo', transform.root)
	453	bar_id = transform.new_directory('bar', foo_id)
	454	baz_id = transform.new_directory('baz', bar_id)
	455	qux_id = transform.new_directory('qux', baz_id)
	456	transform.adjust_path('quxx', foo_id, bar_id)
	457	self.assertStartsWith(transform._limbo_name(qux_id),
	458	transform._limbo_name(bar_id))
	459
1558.7.11 by Aaron Bentley Avoid spurious conflict on add/delete	460	def test_add_del(self):
	461	start, root = self.get_transform()
	462	start.new_directory('a', root, 'a')
	463	start.apply()
	464	transform, root = self.get_transform()
	465	transform.delete_versioned(transform.trans_id_tree_file_id('a'))
	466	transform.new_directory('a', root, 'a')
	467	transform.apply()
	468
1534.7.46 by Aaron Bentley Ensured a conflict when parents of versioned files are unversioned	469	def test_unversioning(self):
1534.7.59 by Aaron Bentley Simplified tests	470	create_tree, root = self.get_transform()
	471	parent_id = create_tree.new_directory('parent', root, 'parent-id')
	472	create_tree.new_file('child', parent_id, 'child', 'child-id')
	473	create_tree.apply()
	474	unversion = TreeTransform(self.wt)
	475	self.addCleanup(unversion.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	476	parent = unversion.trans_id_tree_path('parent')
1534.7.59 by Aaron Bentley Simplified tests	477	unversion.unversion_file(parent)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	478	self.assertEqual(unversion.find_conflicts(),
1534.7.59 by Aaron Bentley Simplified tests	479	[('unversioned parent', parent_id)])
1534.7.181 by Aaron Bentley Renamed a bunch of functions	480	file_id = unversion.trans_id_tree_file_id('child-id')
1534.7.59 by Aaron Bentley Simplified tests	481	unversion.unversion_file(file_id)
1534.7.59 by Aaron Bentley Simplified tests	482	unversion.apply()
1534.7.46 by Aaron Bentley Ensured a conflict when parents of versioned files are unversioned	483
1534.7.36 by Aaron Bentley Added rename tests	484	def test_name_invariants(self):
1534.7.59 by Aaron Bentley Simplified tests	485	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	486	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	487	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	488	create_tree.new_file('name1', root, 'hello1', 'name1')
	489	create_tree.new_file('name2', root, 'hello2', 'name2')
	490	ddir = create_tree.new_directory('dying_directory', root, 'ddir')
	491	create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
	492	create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
	493	create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
	494	create_tree.apply()
	495
	496	mangle_tree,root = self.get_transform()
1731.1.33 by Aaron Bentley Revert no-special-root changes	497	root = mangle_tree.root
1534.7.59 by Aaron Bentley Simplified tests	498	#swap names
1534.7.181 by Aaron Bentley Renamed a bunch of functions	499	name1 = mangle_tree.trans_id_tree_file_id('name1')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	500	name2 = mangle_tree.trans_id_tree_file_id('name2')
1534.7.59 by Aaron Bentley Simplified tests	501	mangle_tree.adjust_path('name2', root, name1)
	502	mangle_tree.adjust_path('name1', root, name2)
	503
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	504	#tests for deleting parent directories
1534.7.181 by Aaron Bentley Renamed a bunch of functions	505	ddir = mangle_tree.trans_id_tree_file_id('ddir')
1534.7.59 by Aaron Bentley Simplified tests	506	mangle_tree.delete_contents(ddir)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	507	dfile = mangle_tree.trans_id_tree_file_id('dfile')
1534.7.59 by Aaron Bentley Simplified tests	508	mangle_tree.delete_versioned(dfile)
1534.7.59 by Aaron Bentley Simplified tests	509	mangle_tree.unversion_file(dfile)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	510	mfile = mangle_tree.trans_id_tree_file_id('mfile')
1534.7.59 by Aaron Bentley Simplified tests	511	mangle_tree.adjust_path('mfile', root, mfile)
	512
	513	#tests for adding parent directories
	514	newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	515	mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
1534.7.59 by Aaron Bentley Simplified tests	516	mangle_tree.adjust_path('mfile2', newdir, mfile2)
	517	mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
	518	self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
	519	self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
	520	self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
	521	mangle_tree.apply()
	522	self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
	523	self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
1534.7.176 by abentley Fixed up tests for Windows	524	mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
1534.7.41 by Aaron Bentley Got inventory ID movement working	525	self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
1534.7.38 by Aaron Bentley Tested adding paths	526	self.assertEqual(file(mfile2_path).read(), 'later2')
1534.7.59 by Aaron Bentley Simplified tests	527	self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
1534.7.59 by Aaron Bentley Simplified tests	528	self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
1534.7.176 by abentley Fixed up tests for Windows	529	newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
1534.7.38 by Aaron Bentley Tested adding paths	530	self.assertEqual(file(newfile_path).read(), 'hello3')
1534.7.59 by Aaron Bentley Simplified tests	531	self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
1534.7.59 by Aaron Bentley Simplified tests	532	self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
1534.7.176 by abentley Fixed up tests for Windows	533	mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
1534.7.43 by abentley Fixed some Windows bugs, introduced a conflicts bug	534
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	535	def test_both_rename(self):
	536	create_tree,root = self.get_transform()
	537	newdir = create_tree.new_directory('selftest', root, 'selftest-id')
	538	create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	539	create_tree.apply()
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	540	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	541	selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	542	blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	543	mangle_tree.adjust_path('test', root, selftest)
	544	mangle_tree.adjust_path('test_too_much', root, selftest)
	545	mangle_tree.set_executability(True, blackbox)
	546	mangle_tree.apply()
	547
	548	def test_both_rename2(self):
	549	create_tree,root = self.get_transform()
	550	bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
	551	tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
	552	blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	553	create_tree.new_file('test_too_much.py', blackbox, 'hello1',
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	554	'test_too_much-id')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	555	create_tree.apply()
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	556	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	557	bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
	558	tests = mangle_tree.trans_id_tree_file_id('tests-id')
	559	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	560	mangle_tree.adjust_path('selftest', bzrlib, tests)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	561	mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	562	mangle_tree.set_executability(True, test_too_much)
	563	mangle_tree.apply()
	564
	565	def test_both_rename3(self):
	566	create_tree,root = self.get_transform()
	567	tests = create_tree.new_directory('tests', root, 'tests-id')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	568	create_tree.new_file('test_too_much.py', tests, 'hello1',
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	569	'test_too_much-id')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	570	create_tree.apply()
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	571	mangle_tree,root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	572	tests = mangle_tree.trans_id_tree_file_id('tests-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	573	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	574	mangle_tree.adjust_path('selftest', root, tests)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	575	mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
1534.7.150 by Aaron Bentley Handled simultaneous renames of parent and child better	576	mangle_tree.set_executability(True, test_too_much)
	577	mangle_tree.apply()
	578
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	579	def test_move_dangling_ie(self):
1534.7.59 by Aaron Bentley Simplified tests	580	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	581	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	582	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	583	create_tree.new_file('name1', root, 'hello1', 'name1')
	584	create_tree.apply()
	585	delete_contents, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	586	file = delete_contents.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	587	delete_contents.delete_contents(file)
	588	delete_contents.apply()
	589	move_id, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	590	name1 = move_id.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	591	newdir = move_id.new_directory('dir', root, 'newdir')
	592	move_id.adjust_path('name2', newdir, name1)
	593	move_id.apply()
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	594
1534.7.50 by Aaron Bentley Detect duplicate inventory ids	595	def test_replace_dangling_ie(self):
1534.7.59 by Aaron Bentley Simplified tests	596	create_tree, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	597	# prepare tree
1731.1.33 by Aaron Bentley Revert no-special-root changes	598	root = create_tree.root
1534.7.59 by Aaron Bentley Simplified tests	599	create_tree.new_file('name1', root, 'hello1', 'name1')
	600	create_tree.apply()
	601	delete_contents = TreeTransform(self.wt)
	602	self.addCleanup(delete_contents.finalize)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	603	file = delete_contents.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	604	delete_contents.delete_contents(file)
	605	delete_contents.apply()
	606	delete_contents.finalize()
	607	replace = TreeTransform(self.wt)
	608	self.addCleanup(replace.finalize)
	609	name2 = replace.new_file('name2', root, 'hello2', 'name1')
	610	conflicts = replace.find_conflicts()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	611	name1 = replace.trans_id_tree_file_id('name1')
1534.7.59 by Aaron Bentley Simplified tests	612	self.assertEqual(conflicts, [('duplicate id', name1, name2)])
	613	resolve_conflicts(replace)
	614	replace.apply()
1534.7.48 by Aaron Bentley Ensured we can move/rename dangling inventory entries	615
4241.14.17 by Vincent Ladeuil Add more tests for unicode symlinks to test_transform.	616	def _test_symlinks(self, link_name1,link_target1,
	617	link_name2, link_target2):
	618
	619	def ozpath(p): return 'oz/' + p
	620
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	621	self.requireFeature(SymlinkFeature)
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	622	transform, root = self.get_transform()
1534.7.59 by Aaron Bentley Simplified tests	623	oz_id = transform.new_directory('oz', root, 'oz-id')
4241.14.17 by Vincent Ladeuil Add more tests for unicode symlinks to test_transform.	624	wizard = transform.new_symlink(link_name1, oz_id, link_target1,
1534.7.59 by Aaron Bentley Simplified tests	625	'wizard-id')
4241.14.17 by Vincent Ladeuil Add more tests for unicode symlinks to test_transform.	626	wiz_id = transform.create_path(link_name2, oz_id)
	627	transform.create_symlink(link_target2, wiz_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	628	transform.version_file('wiz-id2', wiz_id)
1534.7.71 by abentley All tests pass under Windows	629	transform.set_executability(True, wiz_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	630	self.assertEqual(transform.find_conflicts(),
1534.7.71 by abentley All tests pass under Windows	631	[('non-file executability', wiz_id)])
1534.7.71 by abentley All tests pass under Windows	632	transform.set_executability(None, wiz_id)
1534.7.59 by Aaron Bentley Simplified tests	633	transform.apply()
4241.14.17 by Vincent Ladeuil Add more tests for unicode symlinks to test_transform.	634	self.assertEqual(self.wt.path2id(ozpath(link_name1)), 'wizard-id')
	635	self.assertEqual('symlink',
	636	file_kind(self.wt.abspath(ozpath(link_name1))))
	637	self.assertEqual(link_target2,
	638	osutils.readlink(self.wt.abspath(ozpath(link_name2))))
	639	self.assertEqual(link_target1,
	640	osutils.readlink(self.wt.abspath(ozpath(link_name1))))
	641
	642	def test_symlinks(self):
	643	self._test_symlinks('wizard', 'wizard-target',
	644	'wizard2', 'behind_curtain')
	645
	646	def test_symlinks_unicode(self):
	647	self.requireFeature(tests.UnicodeFilenameFeature)
	648	self._test_symlinks(u'\N{Euro Sign}wizard',
	649	u'wizard-targ\N{Euro Sign}t',
	650	u'\N{Euro Sign}wizard2',
	651	u'b\N{Euro Sign}hind_curtain')
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	652
3006.2.2 by Alexander Belchenko tests added.	653	def test_unable_create_symlink(self):
	654	def tt_helper():
	655	wt = self.make_branch_and_tree('.')
	656	tt = TreeTransform(wt) # TreeTransform obtains write lock
	657	try:
	658	tt.new_symlink('foo', tt.root, 'bar')
	659	tt.apply()
	660	finally:
	661	wt.unlock()
	662	os_symlink = getattr(os, 'symlink', None)
	663	os.symlink = None
	664	try:
	665	err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
	666	self.assertEquals(
	667	"Unable to create symlink 'foo' on this platform",
	668	str(err))
	669	finally:
	670	if os_symlink:
	671	os.symlink = os_symlink
	672
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	673	def get_conflicted(self):
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	674	create,root = self.get_transform()
	675	create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
1534.7.61 by Aaron Bentley Handled parent loops, missing parents, unversioned parents	676	oz = create.new_directory('oz', root, 'oz-id')
	677	create.new_directory('emeraldcity', oz, 'emerald-id')
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	678	create.apply()
	679	conflicts,root = self.get_transform()
1534.7.65 by Aaron Bentley Text cleaup/docs	680	# set up duplicate entry, duplicate id
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	681	new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	682	'dorothy-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	683	old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	684	oz = conflicts.trans_id_tree_file_id('oz-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	685	# set up DeletedParent parent conflict
1534.7.65 by Aaron Bentley Text cleaup/docs	686	conflicts.delete_versioned(oz)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	687	emerald = conflicts.trans_id_tree_file_id('emerald-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	688	# set up MissingParent conflict
	689	munchkincity = conflicts.trans_id_file_id('munchkincity-id')
	690	conflicts.adjust_path('munchkincity', root, munchkincity)
	691	conflicts.new_directory('auntem', munchkincity, 'auntem-id')
1534.7.65 by Aaron Bentley Text cleaup/docs	692	# set up parent loop
1534.7.61 by Aaron Bentley Handled parent loops, missing parents, unversioned parents	693	conflicts.adjust_path('emeraldcity', emerald, emerald)
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	694	return conflicts, emerald, oz, old_dorothy, new_dorothy
	695
	696	def test_conflict_resolution(self):
	697	conflicts, emerald, oz, old_dorothy, new_dorothy =\
	698	self.get_conflicted()
1534.7.60 by Aaron Bentley Tested existing conflict resolution functionality	699	resolve_conflicts(conflicts)
	700	self.assertEqual(conflicts.final_name(old_dorothy), 'dorothy.moved')
	701	self.assertIs(conflicts.final_file_id(old_dorothy), None)
	702	self.assertEqual(conflicts.final_name(new_dorothy), 'dorothy')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	703	self.assertEqual(conflicts.final_file_id(new_dorothy), 'dorothy-id')
1534.7.64 by Aaron Bentley Extra testing	704	self.assertEqual(conflicts.final_parent(emerald), oz)
1534.7.63 by Aaron Bentley Ensure transform can be applied after resolution	705	conflicts.apply()
1534.7.62 by Aaron Bentley Fixed moving versioned directories	706
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	707	def test_cook_conflicts(self):
	708	tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
	709	raw_conflicts = resolve_conflicts(tt)
	710	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	711	duplicate = DuplicateEntry('Moved existing file to', 'dorothy.moved',
1534.10.20 by Aaron Bentley Got all tests passing	712	'dorothy', None, 'dorothy-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	713	self.assertEqual(cooked_conflicts[0], duplicate)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	714	duplicate_id = DuplicateID('Unversioned existing file',
1534.10.20 by Aaron Bentley Got all tests passing	715	'dorothy.moved', 'dorothy', None,
1534.10.20 by Aaron Bentley Got all tests passing	716	'dorothy-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	717	self.assertEqual(cooked_conflicts[1], duplicate_id)
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	718	missing_parent = MissingParent('Created directory', 'munchkincity',
	719	'munchkincity-id')
	720	deleted_parent = DeletingParent('Not deleting', 'oz', 'oz-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	721	self.assertEqual(cooked_conflicts[2], missing_parent)
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	722	unversioned_parent = UnversionedParent('Versioned directory',
	723	'munchkincity',
	724	'munchkincity-id')
	725	unversioned_parent2 = UnversionedParent('Versioned directory', 'oz',
1534.10.20 by Aaron Bentley Got all tests passing	726	'oz-id')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	727	self.assertEqual(cooked_conflicts[3], unversioned_parent)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	728	parent_loop = ParentLoop('Cancelled move', 'oz/emeraldcity',
1534.10.20 by Aaron Bentley Got all tests passing	729	'oz/emeraldcity', 'emerald-id', 'emerald-id')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	730	self.assertEqual(cooked_conflicts[4], deleted_parent)
	731	self.assertEqual(cooked_conflicts[5], unversioned_parent2)
	732	self.assertEqual(cooked_conflicts[6], parent_loop)
	733	self.assertEqual(len(cooked_conflicts), 7)
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	734	tt.finalize()
	735
	736	def test_string_conflicts(self):
	737	tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
	738	raw_conflicts = resolve_conflicts(tt)
	739	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
	740	tt.finalize()
1534.10.24 by Aaron Bentley Eliminated conflicts_to_strings, made remove_files a ConflictList member	741	conflicts_s = [str(c) for c in cooked_conflicts]
1534.7.171 by Aaron Bentley Implemented stringifying filesystem conflicts	742	self.assertEqual(len(cooked_conflicts), len(conflicts_s))
	743	self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy. '
	744	'Moved existing file to '
	745	'dorothy.moved.')
	746	self.assertEqual(conflicts_s[1], 'Conflict adding id to dorothy. '
	747	'Unversioned existing file '
	748	'dorothy.moved.')
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	749	self.assertEqual(conflicts_s[2], 'Conflict adding files to'
	750	' munchkincity. Created directory.')
	751	self.assertEqual(conflicts_s[3], 'Conflict because munchkincity is not'
	752	' versioned, but has versioned'
	753	' children. Versioned directory.')
1551.8.23 by Aaron Bentley Tweaked conflict message to be more understandable	754	self.assertEqualDiff(conflicts_s[4], "Conflict: can't delete oz because it"
	755	" is not empty. Not deleting.")
1551.8.22 by Aaron Bentley Improve message when OTHER deletes an in-use tree	756	self.assertEqual(conflicts_s[5], 'Conflict because oz is not'
	757	' versioned, but has versioned'
	758	' children. Versioned directory.')
	759	self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
4597.8.11 by Vincent Ladeuil The ParentLoop.format has been updated, fix fallouts.	760	' oz/emeraldcity. Cancelled move.')
1534.7.170 by Aaron Bentley Cleaned up filesystem conflict handling	761
3144.4.2 by Aaron Bentley Handle non-directory parent conflicts (abentley, #177390)	762	def prepare_wrong_parent_kind(self):
	763	tt, root = self.get_transform()
	764	tt.new_file('parent', root, 'contents', 'parent-id')
	765	tt.apply()
	766	tt, root = self.get_transform()
	767	parent_id = tt.trans_id_file_id('parent-id')
	768	tt.new_file('child,', parent_id, 'contents2', 'file-id')
	769	return tt
	770
3144.4.1 by Aaron Bentley Handle trying to list parents of a non-directory	771	def test_find_conflicts_wrong_parent_kind(self):
3144.4.2 by Aaron Bentley Handle non-directory parent conflicts (abentley, #177390)	772	tt = self.prepare_wrong_parent_kind()
3144.4.1 by Aaron Bentley Handle trying to list parents of a non-directory	773	tt.find_conflicts()
	774
3144.4.2 by Aaron Bentley Handle non-directory parent conflicts (abentley, #177390)	775	def test_resolve_conflicts_wrong_existing_parent_kind(self):
	776	tt = self.prepare_wrong_parent_kind()
	777	raw_conflicts = resolve_conflicts(tt)
	778	self.assertEqual(set([('non-directory parent', 'Created directory',
	779	'new-3')]), raw_conflicts)
	780	cooked_conflicts = cook_conflicts(raw_conflicts, tt)
	781	self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
	782	'parent-id')], cooked_conflicts)
	783	tt.apply()
	784	self.assertEqual(None, self.wt.path2id('parent'))
	785	self.assertEqual('parent-id', self.wt.path2id('parent.new'))
	786
	787	def test_resolve_conflicts_wrong_new_parent_kind(self):
	788	tt, root = self.get_transform()
	789	parent_id = tt.new_directory('parent', root, 'parent-id')
	790	tt.new_file('child,', parent_id, 'contents2', 'file-id')
	791	tt.apply()
	792	tt, root = self.get_transform()
	793	parent_id = tt.trans_id_file_id('parent-id')
	794	tt.delete_contents(parent_id)
	795	tt.create_file('contents', parent_id)
	796	raw_conflicts = resolve_conflicts(tt)
	797	self.assertEqual(set([('non-directory parent', 'Created directory',
	798	'new-3')]), raw_conflicts)
	799	tt.apply()
	800	self.assertEqual(None, self.wt.path2id('parent'))
	801	self.assertEqual('parent-id', self.wt.path2id('parent.new'))
	802
	803	def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
	804	tt, root = self.get_transform()
	805	parent_id = tt.new_directory('parent', root)
	806	tt.new_file('child,', parent_id, 'contents2')
	807	tt.apply()
	808	tt, root = self.get_transform()
	809	parent_id = tt.trans_id_tree_path('parent')
	810	tt.delete_contents(parent_id)
	811	tt.create_file('contents', parent_id)
	812	resolve_conflicts(tt)
	813	tt.apply()
	814	self.assertIs(None, self.wt.path2id('parent'))
	815	self.assertIs(None, self.wt.path2id('parent.new'))
	816
1534.7.62 by Aaron Bentley Fixed moving versioned directories	817	def test_moving_versioned_directories(self):
	818	create, root = self.get_transform()
	819	kansas = create.new_directory('kansas', root, 'kansas-id')
	820	create.new_directory('house', kansas, 'house-id')
	821	create.new_directory('oz', root, 'oz-id')
	822	create.apply()
	823	cyclone, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	824	oz = cyclone.trans_id_tree_file_id('oz-id')
1534.7.181 by Aaron Bentley Renamed a bunch of functions	825	house = cyclone.trans_id_tree_file_id('house-id')
1534.7.62 by Aaron Bentley Fixed moving versioned directories	826	cyclone.adjust_path('house', oz, house)
	827	cyclone.apply()
1534.7.66 by Aaron Bentley Ensured we don't accidentally move the root directory	828
	829	def test_moving_root(self):
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	830	create, root = self.get_transform()
	831	fun = create.new_directory('fun', root, 'fun-id')
	832	create.new_directory('sun', root, 'sun-id')
	833	create.new_directory('moon', root, 'moon')
	834	create.apply()
1534.7.66 by Aaron Bentley Ensured we don't accidentally move the root directory	835	transform, root = self.get_transform()
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	836	transform.adjust_root_path('oldroot', fun)
4634.122.2 by Aaron Bentley, John Arbash Meinel Bring the fixup_new_roots code from the nested-trees code.	837	new_root = transform.trans_id_tree_path('')
1534.7.69 by Aaron Bentley Got real root moves working	838	transform.version_file('new-root', new_root)
1534.7.68 by Aaron Bentley Got semi-reasonable root directory renaming working	839	transform.apply()
1534.7.93 by Aaron Bentley Added text merge test	840
1534.7.114 by Aaron Bentley Added file renaming test case	841	def test_renames(self):
	842	create, root = self.get_transform()
	843	old = create.new_directory('old-parent', root, 'old-id')
	844	intermediate = create.new_directory('intermediate', old, 'im-id')
	845	myfile = create.new_file('myfile', intermediate, 'myfile-text',
	846	'myfile-id')
	847	create.apply()
	848	rename, root = self.get_transform()
1534.7.181 by Aaron Bentley Renamed a bunch of functions	849	old = rename.trans_id_file_id('old-id')
1534.7.114 by Aaron Bentley Added file renaming test case	850	rename.adjust_path('new', root, old)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	851	myfile = rename.trans_id_file_id('myfile-id')
1534.7.114 by Aaron Bentley Added file renaming test case	852	rename.set_executability(True, myfile)
	853	rename.apply()
	854
1740.2.4 by Aaron Bentley Update transform tests and docs	855	def test_set_executability_order(self):
1740.2.4 by Aaron Bentley Update transform tests and docs	856	"""Ensure that executability behaves the same, no matter what order.
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	857
1740.2.4 by Aaron Bentley Update transform tests and docs	858	- create file and set executability simultaneously
	859	- create file and set executability afterward
	860	- unsetting the executability of a file whose executability has not been
	861	declared should throw an exception (this may happen when a
	862	merge attempts to create a file with a duplicate ID)
	863	"""
	864	transform, root = self.get_transform()
	865	wt = transform._tree
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	866	wt.lock_read()
3034.2.1 by Aaron Bentley Fix is_executable tests for win32	867	self.addCleanup(wt.unlock)
1740.2.4 by Aaron Bentley Update transform tests and docs	868	transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
1740.2.4 by Aaron Bentley Update transform tests and docs	869	True)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	870	sac = transform.new_file('set_after_creation', root,
	871	'Set after creation', 'sac')
1740.2.4 by Aaron Bentley Update transform tests and docs	872	transform.set_executability(True, sac)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	873	uws = transform.new_file('unset_without_set', root, 'Unset badly',
	874	'uws')
1740.2.4 by Aaron Bentley Update transform tests and docs	875	self.assertRaises(KeyError, transform.set_executability, None, uws)
	876	transform.apply()
	877	self.assertTrue(wt.is_executable('soc'))
	878	self.assertTrue(wt.is_executable('sac'))
	879
1534.12.2 by Aaron Bentley Added test for preserving file mode	880	def test_preserve_mode(self):
	881	"""File mode is preserved when replacing content"""
	882	if sys.platform == 'win32':
	883	raise TestSkipped('chmod has no effect on win32')
	884	transform, root = self.get_transform()
	885	transform.new_file('file1', root, 'contents', 'file1-id', True)
	886	transform.apply()
3146.4.12 by Aaron Bentley Add needed write lock to test	887	self.wt.lock_write()
3146.4.12 by Aaron Bentley Add needed write lock to test	888	self.addCleanup(self.wt.unlock)
1534.12.2 by Aaron Bentley Added test for preserving file mode	889	self.assertTrue(self.wt.is_executable('file1-id'))
	890	transform, root = self.get_transform()
	891	file1_id = transform.trans_id_tree_file_id('file1-id')
	892	transform.delete_contents(file1_id)
	893	transform.create_file('contents2', file1_id)
	894	transform.apply()
	895	self.assertTrue(self.wt.is_executable('file1-id'))
	896
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	897	def test__set_mode_stats_correctly(self):
	898	"""_set_mode stats to determine file mode."""
	899	if sys.platform == 'win32':
	900	raise TestSkipped('chmod has no effect on win32')
	901
	902	stat_paths = []
	903	real_stat = os.stat
	904	def instrumented_stat(path):
	905	stat_paths.append(path)
	906	return real_stat(path)
	907
	908	transform, root = self.get_transform()
	909
	910	bar1_id = transform.new_file('bar', root, 'bar contents 1\n',
	911	file_id='bar-id-1', executable=False)
	912	transform.apply()
	913
	914	transform, root = self.get_transform()
	915	bar1_id = transform.trans_id_tree_path('bar')
	916	bar2_id = transform.trans_id_tree_path('bar2')
	917	try:
	918	os.stat = instrumented_stat
	919	transform.create_file('bar2 contents\n', bar2_id, mode_id=bar1_id)
	920	finally:
	921	os.stat = real_stat
	922	transform.finalize()
	923
	924	bar1_abspath = self.wt.abspath('bar')
	925	self.assertEqual([bar1_abspath], stat_paths)
	926
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	927	def test_iter_changes(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	928	self.wt.set_root_id('eert_toor')
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	929	transform, root = self.get_transform()
	930	transform.new_file('old', root, 'blah', 'id-1', True)
	931	transform.apply()
	932	transform, root = self.get_transform()
	933	try:
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	934	self.assertEqual([], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	935	old = transform.trans_id_tree_file_id('id-1')
	936	transform.unversion_file(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	937	self.assertEqual([('id-1', ('old', None), False, (True, False),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	938	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	939	(True, True))], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	940	transform.new_directory('new', root, 'id-1')
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	941	self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	942	('eert_toor', 'eert_toor'), ('old', 'new'),
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	943	('file', 'directory'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	944	(True, False))], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	945	finally:
	946	transform.finalize()
	947
	948	def test_iter_changes_new(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	949	self.wt.set_root_id('eert_toor')
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	950	transform, root = self.get_transform()
	951	transform.new_file('old', root, 'blah')
	952	transform.apply()
	953	transform, root = self.get_transform()
	954	try:
	955	old = transform.trans_id_tree_path('old')
	956	transform.version_file('id-1', old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	957	self.assertEqual([('id-1', (None, 'old'), False, (False, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	958	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	959	(False, False))], list(transform.iter_changes()))
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	960	finally:
	961	transform.finalize()
	962
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	963	def test_iter_changes_modifications(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	964	self.wt.set_root_id('eert_toor')
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	965	transform, root = self.get_transform()
	966	transform.new_file('old', root, 'blah', 'id-1')
	967	transform.new_file('new', root, 'blah')
	968	transform.new_directory('subdir', root, 'subdir-id')
	969	transform.apply()
	970	transform, root = self.get_transform()
	971	try:
	972	old = transform.trans_id_tree_path('old')
	973	subdir = transform.trans_id_tree_file_id('subdir-id')
	974	new = transform.trans_id_tree_path('new')
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	975	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	976
	977	#content deletion
	978	transform.delete_contents(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	979	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	980	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	981	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	982
	983	#content change
	984	transform.create_file('blah', old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	985	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	986	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	987	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	988	transform.cancel_deletion(old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	989	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	990	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	991	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	992	transform.cancel_creation(old)
	993
	994	# move file_id to a different file
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	995	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	996	transform.unversion_file(old)
	997	transform.version_file('id-1', new)
	998	transform.adjust_path('old', root, new)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	999	self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	1000	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1001	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1002	transform.cancel_versioning(new)
	1003	transform._removed_id = set()
	1004
	1005	#execute bit
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1006	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1007	transform.set_executability(True, old)
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	1008	self.assertEqual([('id-1', ('old', 'old'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	1009	('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1010	(False, True))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1011	transform.set_executability(None, old)
	1012
	1013	# filename
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1014	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1015	transform.adjust_path('new', root, old)
	1016	transform._new_parent = {}
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	1017	self.assertEqual([('id-1', ('old', 'new'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	1018	('eert_toor', 'eert_toor'), ('old', 'new'), ('file', 'file'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1019	(False, False))], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1020	transform._new_name = {}
	1021
	1022	# parent directory
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1023	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1024	transform.adjust_path('new', subdir, old)
	1025	transform._new_name = {}
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	1026	self.assertEqual([('id-1', ('old', 'subdir/old'), False,
2255.2.180 by Martin Pool merge dirstate	1027	(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.	1028	('file', 'file'), (False, False))],
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1029	list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1030	transform._new_path = {}
	1031
	1032	finally:
	1033	transform.finalize()
	1034
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	1035	def test_iter_changes_modified_bleed(self):
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	1036	self.wt.set_root_id('eert_toor')
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	1037	"""Modified flag should not bleed from one change to another"""
	1038	# unfortunately, we have no guarantee that file1 (which is modified)
	1039	# will be applied before file2. And if it's applied after file2, it
	1040	# obviously can't bleed into file2's change output. But for now, it
	1041	# works.
	1042	transform, root = self.get_transform()
	1043	transform.new_file('file1', root, 'blah', 'id-1')
	1044	transform.new_file('file2', root, 'blah', 'id-2')
	1045	transform.apply()
	1046	transform, root = self.get_transform()
	1047	try:
	1048	transform.delete_contents(transform.trans_id_file_id('id-1'))
	1049	transform.set_executability(True,
	1050	transform.trans_id_file_id('id-2'))
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	1051	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	1052	('eert_toor', 'eert_toor'), ('file1', u'file1'),
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	1053	('file', None), (False, False)),
2255.7.96 by Robert Collins Change _iter_changes interface to yield both old and new paths.	1054	('id-2', (u'file2', u'file2'), False, (True, True),
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	1055	('eert_toor', 'eert_toor'), ('file2', u'file2'),
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	1056	('file', 'file'), (False, True))],
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1057	list(transform.iter_changes()))
1551.11.7 by Aaron Bentley Stop modified flag bleeding into later changes	1058	finally:
	1059	transform.finalize()
	1060
1551.10.37 by Aaron Bentley recommit of TreeTransform._iter_changes fix with missing files	1061	def test_iter_changes_move_missing(self):
	1062	"""Test moving ids with no files around"""
	1063	self.wt.set_root_id('toor_eert')
	1064	# Need two steps because versioning a non-existant file is a conflict.
	1065	transform, root = self.get_transform()
	1066	transform.new_directory('floater', root, 'floater-id')
	1067	transform.apply()
	1068	transform, root = self.get_transform()
	1069	transform.delete_contents(transform.trans_id_tree_path('floater'))
	1070	transform.apply()
	1071	transform, root = self.get_transform()
	1072	floater = transform.trans_id_tree_path('floater')
	1073	try:
	1074	transform.adjust_path('flitter', root, floater)
	1075	self.assertEqual([('floater-id', ('floater', 'flitter'), False,
	1076	(True, True), ('toor_eert', 'toor_eert'), ('floater', 'flitter'),
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1077	(None, None), (False, False))], list(transform.iter_changes()))
1551.10.37 by Aaron Bentley recommit of TreeTransform._iter_changes fix with missing files	1078	finally:
	1079	transform.finalize()
	1080
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1081	def test_iter_changes_pointless(self):
	1082	"""Ensure that no-ops are not treated as modifications"""
2100.3.33 by Aaron Bentley Handle unique roots in tests for TreeTransform.iter_changes	1083	self.wt.set_root_id('eert_toor')
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1084	transform, root = self.get_transform()
	1085	transform.new_file('old', root, 'blah', 'id-1')
	1086	transform.new_directory('subdir', root, 'subdir-id')
	1087	transform.apply()
	1088	transform, root = self.get_transform()
	1089	try:
	1090	old = transform.trans_id_tree_path('old')
	1091	subdir = transform.trans_id_tree_file_id('subdir-id')
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1092	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1093	transform.delete_contents(subdir)
	1094	transform.create_directory(subdir)
	1095	transform.set_executability(False, old)
	1096	transform.unversion_file(old)
	1097	transform.version_file('id-1', old)
	1098	transform.adjust_path('old', root, old)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1099	self.assertEqual([], list(transform.iter_changes()))
1551.11.2 by Aaron Bentley Get kind change detection working for iter_changes	1100	finally:
	1101	transform.finalize()
1534.7.93 by Aaron Bentley Added text merge test	1102
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1103	def test_rename_count(self):
	1104	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1105	transform.new_file('name1', root, 'contents')
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1106	self.assertEqual(transform.rename_count, 0)
	1107	transform.apply()
	1108	self.assertEqual(transform.rename_count, 1)
	1109	transform2, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1110	transform2.adjust_path('name2', root,
2502.1.8 by Aaron Bentley Updates from review comments	1111	transform2.trans_id_tree_path('name1'))
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1112	self.assertEqual(transform2.rename_count, 0)
	1113	transform2.apply()
	1114	self.assertEqual(transform2.rename_count, 2)
	1115
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1116	def test_change_parent(self):
2502.1.8 by Aaron Bentley Updates from review comments	1117	"""Ensure that after we change a parent, the results are still right.
	1118
	1119	Renames and parent changes on pending transforms can happen as part
	1120	of conflict resolution, and are explicitly permitted by the
	1121	TreeTransform API.
	1122
	1123	This test ensures they work correctly with the rename-avoidance
	1124	optimization.
	1125	"""
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1126	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1127	parent1 = transform.new_directory('parent1', root)
	1128	child1 = transform.new_file('child1', parent1, 'contents')
	1129	parent2 = transform.new_directory('parent2', root)
	1130	transform.adjust_path('child1', parent2, child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1131	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1132	self.failIfExists(self.wt.abspath('parent1/child1'))
	1133	self.failUnlessExists(self.wt.abspath('parent2/child1'))
	1134	# rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
	1135	# 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	1136	self.failUnlessEqual(2, transform.rename_count)
	1137
	1138	def test_cancel_parent(self):
	1139	"""Cancelling a parent doesn't cause deletion of a non-empty directory
	1140
	1141	This is like the test_change_parent, except that we cancel the parent
	1142	before adjusting the path. The transform must detect that the
	1143	directory is non-empty, and move children to safe locations.
	1144	"""
	1145	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1146	parent1 = transform.new_directory('parent1', root)
	1147	child1 = transform.new_file('child1', parent1, 'contents')
	1148	child2 = transform.new_file('child2', parent1, 'contents')
	1149	try:
	1150	transform.cancel_creation(parent1)
	1151	except OSError:
	1152	self.fail('Failed to move child1 before deleting parent1')
	1153	transform.cancel_creation(child2)
	1154	transform.create_directory(parent1)
	1155	try:
	1156	transform.cancel_creation(parent1)
	1157	# If the transform incorrectly believes that child2 is still in
	1158	# parent1's limbo directory, it will try to rename it and fail
	1159	# because was already moved by the first cancel_creation.
	1160	except OSError:
	1161	self.fail('Transform still thinks child2 is a child of parent1')
	1162	parent2 = transform.new_directory('parent2', root)
	1163	transform.adjust_path('child1', parent2, child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1164	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1165	self.failIfExists(self.wt.abspath('parent1'))
	1166	self.failUnlessExists(self.wt.abspath('parent2/child1'))
	1167	# 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	1168	self.failUnlessEqual(2, transform.rename_count)
	1169
	1170	def test_adjust_and_cancel(self):
2502.1.8 by Aaron Bentley Updates from review comments	1171	"""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	1172	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1173	parent1 = transform.new_directory('parent1', root)
	1174	child1 = transform.new_file('child1', parent1, 'contents')
	1175	parent2 = transform.new_directory('parent2', root)
	1176	transform.adjust_path('child1', parent2, child1)
	1177	transform.cancel_creation(child1)
2502.1.2 by Aaron Bentley Make the limited-renames functionality safer in the general case	1178	try:
2502.1.8 by Aaron Bentley Updates from review comments	1179	transform.cancel_creation(parent1)
	1180	# if the transform thinks child1 is still in parent1's limbo
	1181	# 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	1182	except OSError:
2502.1.8 by Aaron Bentley Updates from review comments	1183	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	1184	transform.finalize()
	1185
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1186	def test_noname_contents(self):
2502.1.8 by Aaron Bentley Updates from review comments	1187	"""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	1188	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1189	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	1190	try:
2502.1.8 by Aaron Bentley Updates from review comments	1191	transform.create_directory(parent)
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1192	except KeyError:
	1193	self.fail("Can't handle contents with no name")
	1194	transform.finalize()
	1195
2502.1.9 by Aaron Bentley Add additional test for no-name contents	1196	def test_noname_contents_nested(self):
	1197	"""TreeTransform should permit deferring naming files."""
	1198	transform, root = self.get_transform()
	1199	parent = transform.trans_id_file_id('parent-id')
	1200	try:
	1201	transform.create_directory(parent)
	1202	except KeyError:
	1203	self.fail("Can't handle contents with no name")
	1204	child = transform.new_directory('child', parent)
	1205	transform.adjust_path('parent', root, parent)
	1206	transform.apply()
	1207	self.failUnlessExists(self.wt.abspath('parent/child'))
	1208	self.assertEqual(1, transform.rename_count)
	1209
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1210	def test_reuse_name(self):
	1211	"""Avoid reusing the same limbo name for different files"""
	1212	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1213	parent = transform.new_directory('parent', root)
2502.1.8 by Aaron Bentley Updates from review comments	1214	child1 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1215	try:
2502.1.8 by Aaron Bentley Updates from review comments	1216	child2 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1217	except OSError:
	1218	self.fail('Tranform tried to use the same limbo name twice')
2502.1.8 by Aaron Bentley Updates from review comments	1219	transform.adjust_path('child2', parent, child2)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1220	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1221	# limbo/new-1 => parent, limbo/new-3 => parent/child2
	1222	# child2 is put into top-level limbo because child1 has already
	1223	# claimed the direct limbo path when child2 is created. There is no
	1224	# advantage in renaming files once they're in top-level limbo, except
	1225	# as part of apply.
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1226	self.assertEqual(2, transform.rename_count)
	1227
	1228	def test_reuse_when_first_moved(self):
	1229	"""Don't avoid direct paths when it is safe to use them"""
	1230	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1231	parent = transform.new_directory('parent', root)
	1232	child1 = transform.new_directory('child', parent)
	1233	transform.adjust_path('child1', parent, child1)
	1234	child2 = transform.new_directory('child', parent)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1235	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1236	# limbo/new-1 => parent
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1237	self.assertEqual(1, transform.rename_count)
	1238
	1239	def test_reuse_after_cancel(self):
	1240	"""Don't avoid direct paths when it is safe to use them"""
	1241	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1242	parent2 = transform.new_directory('parent2', root)
	1243	child1 = transform.new_directory('child1', parent2)
	1244	transform.cancel_creation(parent2)
	1245	transform.create_directory(parent2)
	1246	child2 = transform.new_directory('child1', parent2)
	1247	transform.adjust_path('child2', parent2, child1)
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1248	transform.apply()
2502.1.8 by Aaron Bentley Updates from review comments	1249	# limbo/new-1 => parent2, limbo/new-2 => parent2/child1
2502.1.4 by Aaron Bentley Ensure we only reuse limbo names appropriately	1250	self.assertEqual(2, transform.rename_count)
	1251
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1252	def test_finalize_order(self):
2502.1.8 by Aaron Bentley Updates from review comments	1253	"""Finalize must be done in child-to-parent order"""
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1254	transform, root = self.get_transform()
2502.1.8 by Aaron Bentley Updates from review comments	1255	parent = transform.new_directory('parent', root)
2502.1.8 by Aaron Bentley Updates from review comments	1256	child = transform.new_directory('child', parent)
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1257	try:
	1258	transform.finalize()
	1259	except OSError:
2502.1.8 by Aaron Bentley Updates from review comments	1260	self.fail('Tried to remove parent before child1')
2502.1.7 by Aaron Bentley Fix finalize deletion ordering	1261
2502.1.13 by Aaron Bentley Updates from review	1262	def test_cancel_with_cancelled_child_should_succeed(self):
2502.1.12 by Aaron Bentley Avoid renaming children with no content	1263	transform, root = self.get_transform()
	1264	parent = transform.new_directory('parent', root)
	1265	child = transform.new_directory('child', parent)
	1266	transform.cancel_creation(child)
2502.1.13 by Aaron Bentley Updates from review	1267	transform.cancel_creation(parent)
2502.1.12 by Aaron Bentley Avoid renaming children with no content	1268	transform.finalize()
	1269
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1270	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).	1271	def tt_helper():
3638.3.17 by Vincent Ladeuil Fixed as per Aaron's review.	1272	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).	1273	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1274	try:
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1275	foo = tt.new_directory('foo', tt.root)
	1276	tt.new_file('bar', foo, 'foobar')
	1277	baz = tt.new_directory('baz', tt.root)
	1278	tt.new_file('qux', baz, 'quux')
	1279	# Ask for a rename 'foo' -> 'baz'
	1280	tt.adjust_path('baz', tt.root, foo)
3063.1.3 by Aaron Bentley Update for Linux	1281	# 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).	1282	tt.apply(no_conflicts=True)
3063.1.3 by Aaron Bentley Update for Linux	1283	except:
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	1284	wt.unlock()
3063.1.3 by Aaron Bentley Update for Linux	1285	raise
3638.3.17 by Vincent Ladeuil Fixed as per Aaron's review.	1286	# The rename will fail because the target directory is not empty (but
3638.3.17 by Vincent Ladeuil Fixed as per Aaron's review.	1287	# 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).	1288	err = self.assertRaises(errors.FileExists, tt_helper)
	1289	self.assertContainsRe(str(err),
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1290	"^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).	1291
3063.1.2 by Alexander Belchenko test for two directories clash	1292	def test_two_directories_clash(self):
	1293	def tt_helper():
	1294	wt = self.make_branch_and_tree('.')
	1295	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1296	try:
3063.1.3 by Aaron Bentley Update for Linux	1297	foo_1 = tt.new_directory('foo', tt.root)
3063.1.3 by Aaron Bentley Update for Linux	1298	tt.new_directory('bar', foo_1)
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1299	# Adding the same directory with a different content
3063.1.3 by Aaron Bentley Update for Linux	1300	foo_2 = tt.new_directory('foo', tt.root)
	1301	tt.new_directory('baz', foo_2)
	1302	# Lie to tt that we've already resolved all conflicts.
3063.1.2 by Alexander Belchenko test for two directories clash	1303	tt.apply(no_conflicts=True)
3063.1.3 by Aaron Bentley Update for Linux	1304	except:
3063.1.2 by Alexander Belchenko test for two directories clash	1305	wt.unlock()
3063.1.3 by Aaron Bentley Update for Linux	1306	raise
3063.1.2 by Alexander Belchenko test for two directories clash	1307	err = self.assertRaises(errors.FileExists, tt_helper)
	1308	self.assertContainsRe(str(err),
	1309	"^File exists: .+/foo")
	1310
3100.1.1 by Aaron Bentley Fix ImmortalLimbo errors when transforms fail	1311	def test_two_directories_clash_finalize(self):
	1312	def tt_helper():
	1313	wt = self.make_branch_and_tree('.')
	1314	tt = TreeTransform(wt) # TreeTransform obtains write lock
	1315	try:
	1316	foo_1 = tt.new_directory('foo', tt.root)
	1317	tt.new_directory('bar', foo_1)
3638.3.15 by Vincent Ladeuil Fix test_case_insensitive_clash to pass on all platforms (renamed too).	1318	# Adding the same directory with a different content
3100.1.1 by Aaron Bentley Fix ImmortalLimbo errors when transforms fail	1319	foo_2 = tt.new_directory('foo', tt.root)
	1320	tt.new_directory('baz', foo_2)
	1321	# Lie to tt that we've already resolved all conflicts.
	1322	tt.apply(no_conflicts=True)
	1323	except:
	1324	tt.finalize()
	1325	raise
	1326	err = self.assertRaises(errors.FileExists, tt_helper)
	1327	self.assertContainsRe(str(err),
	1328	"^File exists: .+/foo")
	1329
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1330	def test_file_to_directory(self):
	1331	wt = self.make_branch_and_tree('.')
3535.6.2 by James Westby Fixes from review. Thanks Aaron and John.	1332	self.build_tree(['foo'])
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1333	wt.add(['foo'])
3590.3.1 by James Westby Make TreeTransform update the inventory with new kind information.	1334	wt.commit("one")
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1335	tt = TreeTransform(wt)
3535.6.2 by James Westby Fixes from review. Thanks Aaron and John.	1336	self.addCleanup(tt.finalize)
3535.6.3 by James Westby Fix the test to not create transform conflicts.	1337	foo_trans_id = tt.trans_id_tree_path("foo")
	1338	tt.delete_contents(foo_trans_id)
	1339	tt.create_directory(foo_trans_id)
	1340	bar_trans_id = tt.trans_id_tree_path("foo/bar")
	1341	tt.create_file(["aa\n"], bar_trans_id)
	1342	tt.version_file("bar-1", bar_trans_id)
3535.6.2 by James Westby Fixes from review. Thanks Aaron and John.	1343	tt.apply()
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1344	self.failUnlessExists("foo/bar")
3590.3.2 by James Westby Handle ->symlink changes as well.	1345	wt.lock_read()
	1346	try:
	1347	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1348	"directory")
	1349	finally:
	1350	wt.unlock()
3590.3.1 by James Westby Make TreeTransform update the inventory with new kind information.	1351	wt.commit("two")
	1352	changes = wt.changes_from(wt.basis_tree())
	1353	self.assertFalse(changes.has_changed(), changes)
3535.6.1 by James Westby Handle a file turning in to a directory in TreeTransform.	1354
3590.3.2 by James Westby Handle ->symlink changes as well.	1355	def test_file_to_symlink(self):
3590.3.3 by James Westby Make ->file changes work as well.	1356	self.requireFeature(SymlinkFeature)
3590.3.2 by James Westby Handle ->symlink changes as well.	1357	wt = self.make_branch_and_tree('.')
	1358	self.build_tree(['foo'])
	1359	wt.add(['foo'])
	1360	wt.commit("one")
	1361	tt = TreeTransform(wt)
	1362	self.addCleanup(tt.finalize)
	1363	foo_trans_id = tt.trans_id_tree_path("foo")
	1364	tt.delete_contents(foo_trans_id)
	1365	tt.create_symlink("bar", foo_trans_id)
	1366	tt.apply()
	1367	self.failUnlessExists("foo")
	1368	wt.lock_read()
	1369	self.addCleanup(wt.unlock)
	1370	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1371	"symlink")
	1372
3590.3.3 by James Westby Make ->file changes work as well.	1373	def test_dir_to_file(self):
	1374	wt = self.make_branch_and_tree('.')
	1375	self.build_tree(['foo/', 'foo/bar'])
	1376	wt.add(['foo', 'foo/bar'])
	1377	wt.commit("one")
	1378	tt = TreeTransform(wt)
	1379	self.addCleanup(tt.finalize)
	1380	foo_trans_id = tt.trans_id_tree_path("foo")
	1381	bar_trans_id = tt.trans_id_tree_path("foo/bar")
	1382	tt.delete_contents(foo_trans_id)
	1383	tt.delete_versioned(bar_trans_id)
	1384	tt.create_file(["aa\n"], foo_trans_id)
	1385	tt.apply()
	1386	self.failUnlessExists("foo")
	1387	wt.lock_read()
	1388	self.addCleanup(wt.unlock)
	1389	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1390	"file")
	1391
3590.3.4 by James Westby Add a test for creating hardlinks as well.	1392	def test_dir_to_hardlink(self):
3590.3.5 by James Westby Use HardlinkFeature for the hardlink test.	1393	self.requireFeature(HardlinkFeature)
3590.3.4 by James Westby Add a test for creating hardlinks as well.	1394	wt = self.make_branch_and_tree('.')
	1395	self.build_tree(['foo/', 'foo/bar'])
	1396	wt.add(['foo', 'foo/bar'])
	1397	wt.commit("one")
	1398	tt = TreeTransform(wt)
	1399	self.addCleanup(tt.finalize)
	1400	foo_trans_id = tt.trans_id_tree_path("foo")
	1401	bar_trans_id = tt.trans_id_tree_path("foo/bar")
	1402	tt.delete_contents(foo_trans_id)
	1403	tt.delete_versioned(bar_trans_id)
	1404	self.build_tree(['baz'])
	1405	tt.create_hardlink("baz", foo_trans_id)
	1406	tt.apply()
	1407	self.failUnlessExists("foo")
	1408	self.failUnlessExists("baz")
	1409	wt.lock_read()
	1410	self.addCleanup(wt.unlock)
	1411	self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
	1412	"file")
	1413
3619.2.10 by Aaron Bentley Compensate for stale entries in TT._needs_rename	1414	def test_no_final_path(self):
	1415	transform, root = self.get_transform()
	1416	trans_id = transform.trans_id_file_id('foo')
	1417	transform.create_file('bar', trans_id)
	1418	transform.cancel_creation(trans_id)
	1419	transform.apply()
	1420
3363.17.24 by Aaron Bentley Implement create_by_tree	1421	def test_create_from_tree(self):
	1422	tree1 = self.make_branch_and_tree('tree1')
	1423	self.build_tree_contents([('tree1/foo/',), ('tree1/bar', 'baz')])
	1424	tree1.add(['foo', 'bar'], ['foo-id', 'bar-id'])
	1425	tree2 = self.make_branch_and_tree('tree2')
	1426	tt = TreeTransform(tree2)
	1427	foo_trans_id = tt.create_path('foo', tt.root)
	1428	create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
	1429	bar_trans_id = tt.create_path('bar', tt.root)
	1430	create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
	1431	tt.apply()
	1432	self.assertEqual('directory', osutils.file_kind('tree2/foo'))
	1433	self.assertFileEqual('baz', 'tree2/bar')
	1434
3363.17.25 by Aaron Bentley remove get_inventory_entry, replace with create_from_tree	1435	def test_create_from_tree_bytes(self):
	1436	"""Provided lines are used instead of tree content."""
	1437	tree1 = self.make_branch_and_tree('tree1')
	1438	self.build_tree_contents([('tree1/foo', 'bar'),])
	1439	tree1.add('foo', 'foo-id')
	1440	tree2 = self.make_branch_and_tree('tree2')
	1441	tt = TreeTransform(tree2)
	1442	foo_trans_id = tt.create_path('foo', tt.root)
	1443	create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
	1444	tt.apply()
	1445	self.assertFileEqual('qux', 'tree2/foo')
	1446
	1447	def test_create_from_tree_symlink(self):
3363.17.24 by Aaron Bentley Implement create_by_tree	1448	self.requireFeature(SymlinkFeature)
	1449	tree1 = self.make_branch_and_tree('tree1')
	1450	os.symlink('bar', 'tree1/foo')
	1451	tree1.add('foo', 'foo-id')
	1452	tt = TreeTransform(self.make_branch_and_tree('tree2'))
	1453	foo_trans_id = tt.create_path('foo', tt.root)
	1454	create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
	1455	tt.apply()
	1456	self.assertEqual('bar', os.readlink('tree2/foo'))
	1457
2502.1.3 by Aaron Bentley Don't cause errors when creating contents for trans_ids with no parent/name	1458
1534.7.93 by Aaron Bentley Added text merge test	1459	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).	1460
1731.1.33 by Aaron Bentley Revert no-special-root changes	1461	def __init__(self, dirname, root_id):
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1462	self.name = dirname
1534.7.93 by Aaron Bentley Added text merge test	1463	os.mkdir(dirname)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	1464	self.wt = BzrDir.create_standalone_workingtree(dirname)
1731.1.33 by Aaron Bentley Revert no-special-root changes	1465	self.wt.set_root_id(root_id)
1558.1.3 by Aaron Bentley Fixed deprecated op use in test suite	1466	self.b = self.wt.branch
1534.7.93 by Aaron Bentley Added text merge test	1467	self.tt = TreeTransform(self.wt)
1534.7.181 by Aaron Bentley Renamed a bunch of functions	1468	self.root = self.tt.trans_id_tree_file_id(self.wt.get_root_id())
1534.7.93 by Aaron Bentley Added text merge test	1469
1551.11.1 by Aaron Bentley Initial work on converting TreeTransform to iter_changes format	1470
1534.7.95 by Aaron Bentley Added more text merge tests	1471	def conflict_text(tree, merge):
	1472	template = '%s TREE\n%s%s\n%s%s MERGE-SOURCE\n'
	1473	return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
	1474
1534.7.93 by Aaron Bentley Added text merge test	1475
1534.7.93 by Aaron Bentley Added text merge test	1476	class TestTransformMerge(TestCaseInTempDir):
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	1477
1534.7.93 by Aaron Bentley Added text merge test	1478	def test_text_merge(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1479	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1480	base = TransformGroup("base", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1481	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	1482	base.tt.new_file('b', base.root, 'b1', 'b')
	1483	base.tt.new_file('c', base.root, 'c', 'c')
	1484	base.tt.new_file('d', base.root, 'd', 'd')
	1485	base.tt.new_file('e', base.root, 'e', 'e')
	1486	base.tt.new_file('f', base.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1487	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	1488	base.tt.new_directory('h', base.root, 'h')
1534.7.93 by Aaron Bentley Added text merge test	1489	base.tt.apply()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1490	other = TransformGroup("other", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1491	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	1492	other.tt.new_file('b', other.root, 'b2', 'b')
	1493	other.tt.new_file('c', other.root, 'c2', 'c')
	1494	other.tt.new_file('d', other.root, 'd', 'd')
	1495	other.tt.new_file('e', other.root, 'e2', 'e')
	1496	other.tt.new_file('f', other.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1497	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	1498	other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1499	other.tt.new_file('i', other.root, 'h\ni\nj\nk\n', 'i')
1534.7.93 by Aaron Bentley Added text merge test	1500	other.tt.apply()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1501	this = TransformGroup("this", root_id)
1534.7.93 by Aaron Bentley Added text merge test	1502	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	1503	this.tt.new_file('b', this.root, 'b', 'b')
	1504	this.tt.new_file('c', this.root, 'c', 'c')
	1505	this.tt.new_file('d', this.root, 'd2', 'd')
	1506	this.tt.new_file('e', this.root, 'e2', 'e')
	1507	this.tt.new_file('f', this.root, 'f', 'f')
1534.7.96 by Aaron Bentley Tested with BASE as directory	1508	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	1509	this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1510	this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
1534.7.93 by Aaron Bentley Added text merge test	1511	this.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1512	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
3008.1.6 by Michael Hudson chop up Merge3Merger.__init__ into pieces	1513
1534.7.95 by Aaron Bentley Added more text merge tests	1514	# textual merge
1534.7.93 by Aaron Bentley Added text merge test	1515	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	1516	# three-way text conflict
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1517	self.assertEqual(this.wt.get_file('b').read(),
1534.7.95 by Aaron Bentley Added more text merge tests	1518	conflict_text('b', 'b2'))
	1519	# OTHER wins
	1520	self.assertEqual(this.wt.get_file('c').read(), 'c2')
	1521	# THIS wins
	1522	self.assertEqual(this.wt.get_file('d').read(), 'd2')
	1523	# Ambigious clean merge
	1524	self.assertEqual(this.wt.get_file('e').read(), 'e2')
	1525	# No change
	1526	self.assertEqual(this.wt.get_file('f').read(), 'f')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1527	# Correct correct results when THIS == OTHER
1534.7.96 by Aaron Bentley Tested with BASE as directory	1528	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	1529	# Text conflict when THIS & OTHER are text and BASE is dir
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1530	self.assertEqual(this.wt.get_file('h').read(),
1534.7.97 by Aaron Bentley Ensured foo.BASE is a directory if there's a conflict	1531	conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
	1532	self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
	1533	'1\n2\n3\n4\n')
	1534	self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
	1535	'h\ni\nj\nk\n')
	1536	self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1537	self.assertEqual(this.wt.get_file('i').read(),
1534.7.99 by Aaron Bentley Handle non-existent BASE properly	1538	conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
	1539	self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
	1540	'1\n2\n3\n4\n')
	1541	self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
	1542	'h\ni\nj\nk\n')
	1543	self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1534.7.192 by Aaron Bentley Record hashes produced by merges	1544	modified = ['a', 'b', 'c', 'h', 'i']
	1545	merge_modified = this.wt.merge_modified()
	1546	self.assertSubset(merge_modified, modified)
	1547	self.assertEqual(len(merge_modified), len(modified))
	1548	file(this.wt.id2abspath('a'), 'wb').write('booga')
	1549	modified.pop(0)
	1550	merge_modified = this.wt.merge_modified()
	1551	self.assertSubset(merge_modified, modified)
	1552	self.assertEqual(len(merge_modified), len(modified))
1558.12.10 by Aaron Bentley Be robust when merge_hash file_id not in inventory	1553	this.wt.remove('b')
2796.1.4 by Aaron Bentley Fix up various test cases	1554	this.wt.revert()
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1555
	1556	def test_file_merge(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1557	self.requireFeature(SymlinkFeature)
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1558	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1559	base = TransformGroup("BASE", root_id)
	1560	this = TransformGroup("THIS", root_id)
	1561	other = TransformGroup("OTHER", root_id)
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1562	for tg in this, base, other:
	1563	tg.tt.new_directory('a', tg.root, 'a')
	1564	tg.tt.new_symlink('b', tg.root, 'b', 'b')
	1565	tg.tt.new_file('c', tg.root, 'c', 'c')
	1566	tg.tt.new_symlink('d', tg.root, tg.name, 'd')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1567	targets = ((base, 'base-e', 'base-f', None, None),
	1568	(this, 'other-e', 'this-f', 'other-g', 'this-h'),
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1569	(other, 'other-e', None, 'other-g', 'other-h'))
	1570	for tg, e_target, f_target, g_target, h_target in targets:
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1571	for link, target in (('e', e_target), ('f', f_target),
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1572	('g', g_target), ('h', h_target)):
	1573	if target is not None:
	1574	tg.tt.new_symlink(link, tg.root, target, link)
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1575
	1576	for tg in this, base, other:
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1577	tg.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1578	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.101 by Aaron Bentley Got conflicts on symlinks working properly	1579	self.assertIs(os.path.isdir(this.wt.abspath('a')), True)
	1580	self.assertIs(os.path.islink(this.wt.abspath('b')), True)
	1581	self.assertIs(os.path.isfile(this.wt.abspath('c')), True)
	1582	for suffix in ('THIS', 'BASE', 'OTHER'):
	1583	self.assertEqual(os.readlink(this.wt.abspath('d.'+suffix)), suffix)
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1584	self.assertIs(os.path.lexists(this.wt.abspath('d')), False)
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1585	self.assertEqual(this.wt.id2path('d'), 'd.OTHER')
	1586	self.assertEqual(this.wt.id2path('f'), 'f.THIS')
1534.7.102 by Aaron Bentley Deleted old pre-conflict contents	1587	self.assertEqual(os.readlink(this.wt.abspath('e')), 'other-e')
	1588	self.assertIs(os.path.lexists(this.wt.abspath('e.THIS')), False)
	1589	self.assertIs(os.path.lexists(this.wt.abspath('e.OTHER')), False)
	1590	self.assertIs(os.path.lexists(this.wt.abspath('e.BASE')), False)
1534.7.104 by Aaron Bentley Fixed set_versioned, enhanced conflict testing	1591	self.assertIs(os.path.lexists(this.wt.abspath('g')), True)
	1592	self.assertIs(os.path.lexists(this.wt.abspath('g.BASE')), False)
	1593	self.assertIs(os.path.lexists(this.wt.abspath('h')), False)
	1594	self.assertIs(os.path.lexists(this.wt.abspath('h.BASE')), False)
	1595	self.assertIs(os.path.lexists(this.wt.abspath('h.THIS')), True)
	1596	self.assertIs(os.path.lexists(this.wt.abspath('h.OTHER')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1597
1534.7.105 by Aaron Bentley Got merge with rename working	1598	def test_filename_merge(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1599	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1600	base = TransformGroup("BASE", root_id)
	1601	this = TransformGroup("THIS", root_id)
	1602	other = TransformGroup("OTHER", root_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1603	base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1534.7.105 by Aaron Bentley Got merge with rename working	1604	for t in [base, this, other]]
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1605	base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1534.7.105 by Aaron Bentley Got merge with rename working	1606	for t in [base, this, other]]
	1607	base.tt.new_directory('c', base_a, 'c')
	1608	this.tt.new_directory('c1', this_a, 'c')
	1609	other.tt.new_directory('c', other_b, 'c')
	1610
	1611	base.tt.new_directory('d', base_a, 'd')
	1612	this.tt.new_directory('d1', this_b, 'd')
	1613	other.tt.new_directory('d', other_a, 'd')
	1614
	1615	base.tt.new_directory('e', base_a, 'e')
	1616	this.tt.new_directory('e', this_a, 'e')
	1617	other.tt.new_directory('e1', other_b, 'e')
	1618
	1619	base.tt.new_directory('f', base_a, 'f')
	1620	this.tt.new_directory('f1', this_b, 'f')
	1621	other.tt.new_directory('f1', other_b, 'f')
	1622
	1623	for tg in [this, base, other]:
	1624	tg.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1625	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.176 by abentley Fixed up tests for Windows	1626	self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
	1627	self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
	1628	self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
	1629	self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
1534.7.105 by Aaron Bentley Got merge with rename working	1630
1534.7.105 by Aaron Bentley Got merge with rename working	1631	def test_filename_merge_conflicts(self):
2116.4.1 by John Arbash Meinel Update file and revision id generators.	1632	root_id = generate_ids.gen_root_id()
1731.1.33 by Aaron Bentley Revert no-special-root changes	1633	base = TransformGroup("BASE", root_id)
	1634	this = TransformGroup("THIS", root_id)
	1635	other = TransformGroup("OTHER", root_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1636	base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1534.7.105 by Aaron Bentley Got merge with rename working	1637	for t in [base, this, other]]
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1638	base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1534.7.105 by Aaron Bentley Got merge with rename working	1639	for t in [base, this, other]]
	1640
	1641	base.tt.new_file('g', base_a, 'g', 'g')
	1642	other.tt.new_file('g1', other_b, 'g1', 'g')
	1643
	1644	base.tt.new_file('h', base_a, 'h', 'h')
	1645	this.tt.new_file('h1', this_b, 'h1', 'h')
	1646
	1647	base.tt.new_file('i', base.root, 'i', 'i')
1534.7.153 by Aaron Bentley Handled test cases involving symlinks	1648	other.tt.new_directory('i1', this_b, 'i')
1534.7.105 by Aaron Bentley Got merge with rename working	1649
	1650	for tg in [this, base, other]:
	1651	tg.tt.apply()
3008.1.11 by Michael Hudson restore the default behaviour of Merge3Merger.__init__().	1652	Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1534.7.105 by Aaron Bentley Got merge with rename working	1653
1534.7.176 by abentley Fixed up tests for Windows	1654	self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1534.7.105 by Aaron Bentley Got merge with rename working	1655	self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1656	self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1534.7.176 by abentley Fixed up tests for Windows	1657	self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1534.7.105 by Aaron Bentley Got merge with rename working	1658	self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1534.7.105 by Aaron Bentley Got merge with rename working	1659	self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1534.7.176 by abentley Fixed up tests for Windows	1660	self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1661
2027.1.1 by John Arbash Meinel Fix bug #56549, and write a direct test that the right path is being statted	1662
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1663	class TestBuildTree(tests.TestCaseWithTransport):
	1664
3006.2.2 by Alexander Belchenko tests added.	1665	def test_build_tree_with_symlinks(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1666	self.requireFeature(SymlinkFeature)
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1667	os.mkdir('a')
	1668	a = BzrDir.create_standalone_workingtree('a')
	1669	os.mkdir('a/foo')
	1670	file('a/foo/bar', 'wb').write('contents')
	1671	os.symlink('a/foo/bar', 'a/foo/baz')
	1672	a.add(['foo', 'foo/bar', 'foo/baz'])
	1673	a.commit('initial commit')
	1674	b = BzrDir.create_standalone_workingtree('b')
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	1675	basis = a.basis_tree()
	1676	basis.lock_read()
	1677	self.addCleanup(basis.unlock)
	1678	build_tree(basis, b)
1534.7.183 by Aaron Bentley Fixed build_tree with symlinks	1679	self.assertIs(os.path.isdir('b/foo'), True)
	1680	self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
	1681	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	1682
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	1683	def test_build_with_references(self):
2255.2.194 by Robert Collins [BROKEN] Many updates to stop using experimental formats in tests.	1684	tree = self.make_branch_and_tree('source',
	1685	format='dirstate-with-subtree')
	1686	subtree = self.make_branch_and_tree('source/subtree',
	1687	format='dirstate-with-subtree')
2100.3.21 by Aaron Bentley Work on checking out by-reference trees	1688	tree.add_reference(subtree)
	1689	tree.commit('a revision')
	1690	tree.branch.create_checkout('target')
	1691	self.failUnlessExists('target')
	1692	self.failUnlessExists('target/subtree')
	1693
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1694	def test_file_conflict_handling(self):
	1695	"""Ensure that when building trees, conflict handling is done"""
	1696	source = self.make_branch_and_tree('source')
	1697	target = self.make_branch_and_tree('target')
	1698	self.build_tree(['source/file', 'target/file'])
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1699	source.add('file', 'new-file')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1700	source.commit('added file')
	1701	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1702	self.assertEqual([DuplicateEntry('Moved existing file to',
	1703	'file.moved', 'file', None, 'new-file')],
	1704	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1705	target2 = self.make_branch_and_tree('target2')
	1706	target_file = file('target2/file', 'wb')
	1707	try:
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1708	source_file = file('source/file', 'rb')
	1709	try:
	1710	target_file.write(source_file.read())
	1711	finally:
	1712	source_file.close()
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1713	finally:
	1714	target_file.close()
	1715	build_tree(source.basis_tree(), target2)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1716	self.assertEqual([], target2.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1717
	1718	def test_symlink_conflict_handling(self):
	1719	"""Ensure that when building trees, conflict handling is done"""
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	1720	self.requireFeature(SymlinkFeature)
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1721	source = self.make_branch_and_tree('source')
	1722	os.symlink('foo', 'source/symlink')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1723	source.add('symlink', 'new-symlink')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1724	source.commit('added file')
	1725	target = self.make_branch_and_tree('target')
	1726	os.symlink('bar', 'target/symlink')
	1727	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1728	self.assertEqual([DuplicateEntry('Moved existing file to',
	1729	'symlink.moved', 'symlink', None, 'new-symlink')],
	1730	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1731	target = self.make_branch_and_tree('target2')
	1732	os.symlink('foo', 'target2/symlink')
	1733	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1734	self.assertEqual([], target.conflicts())
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1735
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1736	def test_directory_conflict_handling(self):
	1737	"""Ensure that when building trees, conflict handling is done"""
	1738	source = self.make_branch_and_tree('source')
	1739	target = self.make_branch_and_tree('target')
	1740	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	1741	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	1742	source.commit('added file')
	1743	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1744	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1745	self.failUnlessExists('target/dir1/file')
	1746
	1747	# Ensure contents are merged
	1748	target = self.make_branch_and_tree('target2')
	1749	self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
	1750	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1751	self.assertEqual([], target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1752	self.failUnlessExists('target2/dir1/file2')
	1753	self.failUnlessExists('target2/dir1/file')
	1754
	1755	# 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	1756	target = self.make_branch_and_tree('target3')
	1757	self.make_branch('target3/dir1')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1758	self.build_tree(['target3/dir1/file2'])
	1759	build_tree(source.basis_tree(), target)
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1760	self.failIfExists('target3/dir1/file')
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1761	self.failUnlessExists('target3/dir1/file2')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1762	self.failUnlessExists('target3/dir1.diverted/file')
	1763	self.assertEqual([DuplicateEntry('Diverted to',
	1764	'dir1.diverted', 'dir1', 'new-dir1', None)],
	1765	target.conflicts())
	1766
	1767	target = self.make_branch_and_tree('target4')
	1768	self.build_tree(['target4/dir1/'])
	1769	self.make_branch('target4/dir1/file')
	1770	build_tree(source.basis_tree(), target)
	1771	self.failUnlessExists('target4/dir1/file')
	1772	self.assertEqual('directory', file_kind('target4/dir1/file'))
	1773	self.failUnlessExists('target4/dir1/file.diverted')
	1774	self.assertEqual([DuplicateEntry('Diverted to',
	1775	'dir1/file.diverted', 'dir1/file', 'new-file', None)],
	1776	target.conflicts())
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1777
	1778	def test_mixed_conflict_handling(self):
	1779	"""Ensure that when building trees, conflict handling is done"""
	1780	source = self.make_branch_and_tree('source')
	1781	target = self.make_branch_and_tree('target')
	1782	self.build_tree(['source/name', 'target/name/'])
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1783	source.add('name', 'new-name')
	1784	source.commit('added file')
	1785	build_tree(source.basis_tree(), target)
	1786	self.assertEqual([DuplicateEntry('Moved existing file to',
	1787	'name.moved', 'name', None, 'new-name')], target.conflicts())
	1788
	1789	def test_raises_in_populated(self):
	1790	source = self.make_branch_and_tree('source')
	1791	self.build_tree(['source/name'])
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1792	source.add('name')
1966.1.2 by Aaron Bentley Divert files instead of failing to create them, update from review	1793	source.commit('added name')
	1794	target = self.make_branch_and_tree('target')
	1795	self.build_tree(['target/name'])
	1796	target.add('name')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1797	self.assertRaises(errors.WorkingTreeAlreadyPopulated,
2090.2.1 by Martin Pool Fix some code which relies on assertions and breaks under python -O	1798	build_tree, source.basis_tree(), target)
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	1799
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1800	def test_build_tree_rename_count(self):
	1801	source = self.make_branch_and_tree('source')
	1802	self.build_tree(['source/file1', 'source/dir1/'])
	1803	source.add(['file1', 'dir1'])
	1804	source.commit('add1')
	1805	target1 = self.make_branch_and_tree('target1')
2502.1.6 by Aaron Bentley Update from review comments	1806	transform_result = build_tree(source.basis_tree(), target1)
2502.1.6 by Aaron Bentley Update from review comments	1807	self.assertEqual(2, transform_result.rename_count)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1808
	1809	self.build_tree(['source/dir1/file2'])
	1810	source.add(['dir1/file2'])
	1811	source.commit('add3')
	1812	target2 = self.make_branch_and_tree('target2')
2502.1.6 by Aaron Bentley Update from review comments	1813	transform_result = build_tree(source.basis_tree(), target2)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1814	# children of non-root directories should not be renamed
2502.1.6 by Aaron Bentley Update from review comments	1815	self.assertEqual(2, transform_result.rename_count)
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	1816
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1817	def create_ab_tree(self):
	1818	"""Create a committed test tree with two files"""
	1819	source = self.make_branch_and_tree('source')
	1820	self.build_tree_contents([('source/file1', 'A')])
	1821	self.build_tree_contents([('source/file2', 'B')])
	1822	source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
	1823	source.commit('commit files')
	1824	source.lock_write()
	1825	self.addCleanup(source.unlock)
	1826	return source
	1827
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1828	def test_build_tree_accelerator_tree(self):
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1829	source = self.create_ab_tree()
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1830	self.build_tree_contents([('source/file2', 'C')])
	1831	calls = []
	1832	real_source_get_file = source.get_file
	1833	def get_file(file_id, path=None):
	1834	calls.append(file_id)
	1835	return real_source_get_file(file_id, path)
	1836	source.get_file = get_file
	1837	target = self.make_branch_and_tree('target')
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1838	revision_tree = source.basis_tree()
	1839	revision_tree.lock_read()
	1840	self.addCleanup(revision_tree.unlock)
	1841	build_tree(revision_tree, target, source)
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1842	self.assertEqual(['file1-id'], calls)
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1843	target.lock_read()
	1844	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1845	self.assertEqual([], list(target.iter_changes(revision_tree)))
3123.5.1 by Aaron Bentley Make build-tree able to use an additional 'accelerator' tree	1846
3123.5.4 by Aaron Bentley Use an accelerator tree when branching, handle no-such-id correctly	1847	def test_build_tree_accelerator_tree_missing_file(self):
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1848	source = self.create_ab_tree()
3123.5.4 by Aaron Bentley Use an accelerator tree when branching, handle no-such-id correctly	1849	os.unlink('source/file1')
	1850	source.remove(['file2'])
	1851	target = self.make_branch_and_tree('target')
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1852	revision_tree = source.basis_tree()
	1853	revision_tree.lock_read()
	1854	self.addCleanup(revision_tree.unlock)
	1855	build_tree(revision_tree, target, source)
	1856	target.lock_read()
	1857	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1858	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	1859
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1860	def test_build_tree_accelerator_wrong_kind(self):
3146.4.8 by Aaron Bentley Add missing symlink requirement	1861	self.requireFeature(SymlinkFeature)
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1862	source = self.make_branch_and_tree('source')
	1863	self.build_tree_contents([('source/file1', '')])
	1864	self.build_tree_contents([('source/file2', '')])
	1865	source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
	1866	source.commit('commit files')
	1867	os.unlink('source/file2')
	1868	self.build_tree_contents([('source/file2/', 'C')])
	1869	os.unlink('source/file1')
	1870	os.symlink('file2', 'source/file1')
	1871	calls = []
	1872	real_source_get_file = source.get_file
	1873	def get_file(file_id, path=None):
	1874	calls.append(file_id)
	1875	return real_source_get_file(file_id, path)
	1876	source.get_file = get_file
	1877	target = self.make_branch_and_tree('target')
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1878	revision_tree = source.basis_tree()
	1879	revision_tree.lock_read()
	1880	self.addCleanup(revision_tree.unlock)
	1881	build_tree(revision_tree, target, source)
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1882	self.assertEqual([], calls)
3123.5.19 by Aaron Bentley Ensure content is exactly the same, when accelerator used	1883	target.lock_read()
	1884	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1885	self.assertEqual([], list(target.iter_changes(revision_tree)))
3123.5.16 by Aaron Bentley Test handling of conversion to non-file	1886
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1887	def test_build_tree_hardlink(self):
	1888	self.requireFeature(HardlinkFeature)
	1889	source = self.create_ab_tree()
	1890	target = self.make_branch_and_tree('target')
	1891	revision_tree = source.basis_tree()
	1892	revision_tree.lock_read()
	1893	self.addCleanup(revision_tree.unlock)
	1894	build_tree(revision_tree, target, source, hardlink=True)
	1895	target.lock_read()
	1896	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1897	self.assertEqual([], list(target.iter_changes(revision_tree)))
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1898	source_stat = os.stat('source/file1')
	1899	target_stat = os.stat('target/file1')
	1900	self.assertEqual(source_stat, target_stat)
	1901
	1902	# Explicitly disallowing hardlinks should prevent them.
	1903	target2 = self.make_branch_and_tree('target2')
	1904	build_tree(revision_tree, target2, source, hardlink=False)
	1905	target2.lock_read()
	1906	self.addCleanup(target2.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1907	self.assertEqual([], list(target2.iter_changes(revision_tree)))
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1908	source_stat = os.stat('source/file1')
	1909	target2_stat = os.stat('target2/file1')
	1910	self.assertNotEqual(source_stat, target2_stat)
	1911
3137.1.1 by Aaron Bentley Fix build_tree acceleration when file is moved in accelerator_tree	1912	def test_build_tree_accelerator_tree_moved(self):
	1913	source = self.make_branch_and_tree('source')
	1914	self.build_tree_contents([('source/file1', 'A')])
	1915	source.add(['file1'], ['file1-id'])
	1916	source.commit('commit files')
	1917	source.rename_one('file1', 'file2')
	1918	source.lock_read()
	1919	self.addCleanup(source.unlock)
	1920	target = self.make_branch_and_tree('target')
	1921	revision_tree = source.basis_tree()
	1922	revision_tree.lock_read()
	1923	self.addCleanup(revision_tree.unlock)
	1924	build_tree(revision_tree, target, source)
	1925	target.lock_read()
	1926	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1927	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	1928
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1929	def test_build_tree_hardlinks_preserve_execute(self):
	1930	self.requireFeature(HardlinkFeature)
	1931	source = self.create_ab_tree()
	1932	tt = TreeTransform(source)
	1933	trans_id = tt.trans_id_tree_file_id('file1-id')
	1934	tt.set_executability(True, trans_id)
	1935	tt.apply()
	1936	self.assertTrue(source.is_executable('file1-id'))
	1937	target = self.make_branch_and_tree('target')
	1938	revision_tree = source.basis_tree()
	1939	revision_tree.lock_read()
	1940	self.addCleanup(revision_tree.unlock)
	1941	build_tree(revision_tree, target, source, hardlink=True)
	1942	target.lock_read()
	1943	self.addCleanup(target.unlock)
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	1944	self.assertEqual([], list(target.iter_changes(revision_tree)))
3136.1.2 by Aaron Bentley Implement hard-linking for build_tree	1945	self.assertTrue(source.is_executable('file1-id'))
	1946
4826.1.5 by Andrew Bennetts Add test that content filtered files are not hardlinked by build_tree.	1947	def install_rot13_content_filter(self, pattern):
4985.2.1 by Vincent Ladeuil Deploy addAttrCleanup on the whole test suite.	1948	# We could use
	1949	# self.addCleanup(filters._reset_registry, filters._reset_registry())
	1950	# below, but that looks a bit... hard to read even if it's exactly
	1951	# the same thing.
4826.1.5 by Andrew Bennetts Add test that content filtered files are not hardlinked by build_tree.	1952	original_registry = filters._reset_registry()
	1953	def restore_registry():
	1954	filters._reset_registry(original_registry)
	1955	self.addCleanup(restore_registry)
	1956	def rot13(chunks, context=None):
	1957	return [''.join(chunks).encode('rot13')]
	1958	rot13filter = filters.ContentFilter(rot13, rot13)
	1959	filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
	1960	os.mkdir(self.test_home_dir + '/.bazaar')
	1961	rules_filename = self.test_home_dir + '/.bazaar/rules'
4826.1.8 by Andrew Bennetts Tweaks suggested by John.	1962	f = open(rules_filename, 'wb')
4826.1.5 by Andrew Bennetts Add test that content filtered files are not hardlinked by build_tree.	1963	f.write('[name %s]\nrot13=yes\n' % (pattern,))
	1964	f.close()
	1965	def uninstall_rules():
	1966	os.remove(rules_filename)
	1967	rules.reset_rules()
	1968	self.addCleanup(uninstall_rules)
	1969	rules.reset_rules()
	1970
	1971	def test_build_tree_content_filtered_files_are_not_hardlinked(self):
	1972	"""build_tree will not hardlink files that have content filtering rules
	1973	applied to them (but will still hardlink other files from the same tree
	1974	if it can).
	1975	"""
	1976	self.requireFeature(HardlinkFeature)
	1977	self.install_rot13_content_filter('file1')
	1978	source = self.create_ab_tree()
	1979	target = self.make_branch_and_tree('target')
	1980	revision_tree = source.basis_tree()
	1981	revision_tree.lock_read()
	1982	self.addCleanup(revision_tree.unlock)
	1983	build_tree(revision_tree, target, source, hardlink=True)
	1984	target.lock_read()
	1985	self.addCleanup(target.unlock)
	1986	self.assertEqual([], list(target.iter_changes(revision_tree)))
	1987	source_stat = os.stat('source/file1')
	1988	target_stat = os.stat('target/file1')
	1989	self.assertNotEqual(source_stat, target_stat)
	1990	source_stat = os.stat('source/file2')
	1991	target_stat = os.stat('target/file2')
4826.1.8 by Andrew Bennetts Tweaks suggested by John.	1992	self.assertEqualStat(source_stat, target_stat)
4826.1.5 by Andrew Bennetts Add test that content filtered files are not hardlinked by build_tree.	1993
3453.2.4 by Aaron Bentley Disable fast-path when conflicts are encountered	1994	def test_case_insensitive_build_tree_inventory(self):
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	1995	if (tests.CaseInsensitiveFilesystemFeature.available()
	1996	or tests.CaseInsCasePresFilenameFeature.available()):
4241.9.4 by Vincent Ladeuil Fix test_case_insensitive_build_tree_inventory failure on OSX.	1997	raise tests.UnavailableFeature('Fully case sensitive filesystem')
3453.2.4 by Aaron Bentley Disable fast-path when conflicts are encountered	1998	source = self.make_branch_and_tree('source')
	1999	self.build_tree(['source/file', 'source/FILE'])
	2000	source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
	2001	source.commit('added files')
	2002	# Don't try this at home, kids!
	2003	# Force the tree to report that it is case insensitive
	2004	target = self.make_branch_and_tree('target')
	2005	target.case_sensitive = False
3453.2.6 by Aaron Bentley Rename mutate_tree to delta_from_tree, add comment	2006	build_tree(source.basis_tree(), target, source, delta_from_tree=True)
3453.2.4 by Aaron Bentley Disable fast-path when conflicts are encountered	2007	self.assertEqual('file.moved', target.id2path('lower-id'))
	2008	self.assertEqual('FILE', target.id2path('upper-id'))
	2009
1966.1.1 by Aaron Bentley Implement disk-content merge and conflict resolution for build_tree	2010
4526.8.1 by Aaron Bentley Support committing a TreeTransform to a branch.	2011	class TestCommitTransform(tests.TestCaseWithTransport):
	2012
	2013	def get_branch(self):
	2014	tree = self.make_branch_and_tree('tree')
	2015	tree.lock_write()
	2016	self.addCleanup(tree.unlock)
	2017	tree.commit('empty commit')
	2018	return tree.branch
	2019
	2020	def get_branch_and_transform(self):
	2021	branch = self.get_branch()
	2022	tt = TransformPreview(branch.basis_tree())
	2023	self.addCleanup(tt.finalize)
	2024	return branch, tt
	2025
	2026	def test_commit_wrong_basis(self):
	2027	branch = self.get_branch()
	2028	basis = branch.repository.revision_tree(
	2029	_mod_revision.NULL_REVISION)
	2030	tt = TransformPreview(basis)
	2031	self.addCleanup(tt.finalize)
4526.8.5 by Aaron Bentley Updates from review.	2032	e = self.assertRaises(ValueError, tt.commit, branch, '')
4526.8.1 by Aaron Bentley Support committing a TreeTransform to a branch.	2033	self.assertEqual('TreeTransform not based on branch basis: null:',
	2034	str(e))
	2035
	2036	def test_empy_commit(self):
	2037	branch, tt = self.get_branch_and_transform()
	2038	rev = tt.commit(branch, 'my message')
	2039	self.assertEqual(2, branch.revno())
	2040	repo = branch.repository
	2041	self.assertEqual('my message', repo.get_revision(rev).message)
	2042
	2043	def test_merge_parents(self):
	2044	branch, tt = self.get_branch_and_transform()
	2045	rev = tt.commit(branch, 'my message', ['rev1b', 'rev1c'])
	2046	self.assertEqual(['rev1b', 'rev1c'],
	2047	branch.basis_tree().get_parent_ids()[1:])
	2048
4526.8.3 by Aaron Bentley Clean up merge parent handling.	2049	def test_first_commit(self):
	2050	branch = self.make_branch('branch')
	2051	branch.lock_write()
	2052	self.addCleanup(branch.unlock)
	2053	tt = TransformPreview(branch.basis_tree())
4659.2.4 by Vincent Ladeuil Cleanup remaining bzr-limbo-XXXXXX leaks in /tmp during selftest.	2054	self.addCleanup(tt.finalize)
4526.9.23 by Robert Collins Change the tree transform test_first_commit test to set a root id in the new tree, and workaround an apparent bug in TreeTransform._determine_path.	2055	tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
4526.8.3 by Aaron Bentley Clean up merge parent handling.	2056	rev = tt.commit(branch, 'my message')
4526.8.3 by Aaron Bentley Clean up merge parent handling.	2057	self.assertEqual([], branch.basis_tree().get_parent_ids())
4526.8.5 by Aaron Bentley Updates from review.	2058	self.assertNotEqual(_mod_revision.NULL_REVISION,
4526.8.5 by Aaron Bentley Updates from review.	2059	branch.last_revision())
4526.8.3 by Aaron Bentley Clean up merge parent handling.	2060
4526.8.5 by Aaron Bentley Updates from review.	2061	def test_first_commit_with_merge_parents(self):
4526.8.3 by Aaron Bentley Clean up merge parent handling.	2062	branch = self.make_branch('branch')
	2063	branch.lock_write()
	2064	self.addCleanup(branch.unlock)
	2065	tt = TransformPreview(branch.basis_tree())
4659.2.4 by Vincent Ladeuil Cleanup remaining bzr-limbo-XXXXXX leaks in /tmp during selftest.	2066	self.addCleanup(tt.finalize)
4526.8.5 by Aaron Bentley Updates from review.	2067	e = self.assertRaises(ValueError, tt.commit, branch,
4526.8.3 by Aaron Bentley Clean up merge parent handling.	2068	'my message', ['rev1b-id'])
4526.8.5 by Aaron Bentley Updates from review.	2069	self.assertEqual('Cannot supply merge parents for first commit.',
	2070	str(e))
	2071	self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
4526.8.3 by Aaron Bentley Clean up merge parent handling.	2072
4526.8.1 by Aaron Bentley Support committing a TreeTransform to a branch.	2073	def test_add_files(self):
	2074	branch, tt = self.get_branch_and_transform()
	2075	tt.new_file('file', tt.root, 'contents', 'file-id')
	2076	trans_id = tt.new_directory('dir', tt.root, 'dir-id')
4789.25.2 by John Arbash Meinel Fix 3 tests that meant to skip exec or symlink testing on win32	2077	if SymlinkFeature.available():
	2078	tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
4526.8.1 by Aaron Bentley Support committing a TreeTransform to a branch.	2079	rev = tt.commit(branch, 'message')
	2080	tree = branch.basis_tree()
	2081	self.assertEqual('file', tree.id2path('file-id'))
	2082	self.assertEqual('contents', tree.get_file_text('file-id'))
	2083	self.assertEqual('dir', tree.id2path('dir-id'))
4789.25.2 by John Arbash Meinel Fix 3 tests that meant to skip exec or symlink testing on win32	2084	if SymlinkFeature.available():
	2085	self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
	2086	self.assertEqual('target', tree.get_symlink_target('symlink-id'))
4526.8.1 by Aaron Bentley Support committing a TreeTransform to a branch.	2087
4526.8.2 by Aaron Bentley Proved strict commit handling.	2088	def test_add_unversioned(self):
	2089	branch, tt = self.get_branch_and_transform()
	2090	tt.new_file('file', tt.root, 'contents')
	2091	self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
	2092	'message', strict=True)
	2093
	2094	def test_modify_strict(self):
	2095	branch, tt = self.get_branch_and_transform()
	2096	tt.new_file('file', tt.root, 'contents', 'file-id')
	2097	tt.commit(branch, 'message', strict=True)
	2098	tt = TransformPreview(branch.basis_tree())
4659.2.4 by Vincent Ladeuil Cleanup remaining bzr-limbo-XXXXXX leaks in /tmp during selftest.	2099	self.addCleanup(tt.finalize)
4526.8.2 by Aaron Bentley Proved strict commit handling.	2100	trans_id = tt.trans_id_file_id('file-id')
	2101	tt.delete_contents(trans_id)
	2102	tt.create_file('contents', trans_id)
	2103	tt.commit(branch, 'message', strict=True)
	2104
4526.8.6 by Aaron Bentley Check for malformed transforms before committing.	2105	def test_commit_malformed(self):
	2106	"""Committing a malformed transform should raise an exception.
	2107
	2108	In this case, we are adding a file without adding its parent.
	2109	"""
	2110	branch, tt = self.get_branch_and_transform()
	2111	parent_id = tt.trans_id_file_id('parent-id')
	2112	tt.new_file('file', parent_id, 'contents', 'file-id')
	2113	self.assertRaises(errors.MalformedTransform, tt.commit, branch,
	2114	'message')
	2115
5162.4.1 by Aaron Bentley TreeTransform supports normal commit parameters and includes branch nick.	2116	def test_commit_rich_revision_data(self):
	2117	branch, tt = self.get_branch_and_transform()
5162.4.3 by Aaron Bentley Fix failing test.	2118	rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
5162.4.1 by Aaron Bentley TreeTransform supports normal commit parameters and includes branch nick.	2119	committer='me <me@example.com>',
	2120	revprops={'foo': 'bar'}, revision_id='revid-1',
	2121	authors=['Author1 <author1@example.com>',
	2122	'Author2 <author2@example.com>',
	2123	])
	2124	self.assertEqual('revid-1', rev_id)
	2125	revision = branch.repository.get_revision(rev_id)
	2126	self.assertEqual(1, revision.timestamp)
5162.4.3 by Aaron Bentley Fix failing test.	2127	self.assertEqual(43201, revision.timezone)
5162.4.1 by Aaron Bentley TreeTransform supports normal commit parameters and includes branch nick.	2128	self.assertEqual('me <me@example.com>', revision.committer)
	2129	self.assertEqual(['Author1 <author1@example.com>',
	2130	'Author2 <author2@example.com>'],
	2131	revision.get_apparent_authors())
	2132	del revision.properties['authors']
	2133	self.assertEqual({'foo': 'bar',
	2134	'branch-nick': 'tree'},
	2135	revision.properties)
	2136
	2137	def test_no_explicit_revprops(self):
	2138	branch, tt = self.get_branch_and_transform()
	2139	rev_id = tt.commit(branch, 'message', authors=[
	2140	'Author1 <author1@example.com>',
	2141	'Author2 <author2@example.com>', ])
	2142	revision = branch.repository.get_revision(rev_id)
	2143	self.assertEqual(['Author1 <author1@example.com>',
	2144	'Author2 <author2@example.com>'],
	2145	revision.get_apparent_authors())
	2146	self.assertEqual('tree', revision.properties['branch-nick'])
	2147
4526.8.1 by Aaron Bentley Support committing a TreeTransform to a branch.	2148
1534.10.28 by Aaron Bentley Use numbered backup files	2149	class MockTransform(object):
	2150
	2151	def has_named_child(self, by_parent, parent_id, name):
	2152	for child_id in by_parent[parent_id]:
	2153	if child_id == '0':
	2154	if name == "name~":
	2155	return True
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	2156	elif name == "name.~%s~" % child_id:
1534.10.28 by Aaron Bentley Use numbered backup files	2157	return True
	2158	return False
	2159
2502.1.1 by Aaron Bentley Ensure renames only root children are renamed when building trees	2160
1534.10.28 by Aaron Bentley Use numbered backup files	2161	class MockEntry(object):
	2162	def __init__(self):
	2163	object.__init__(self)
	2164	self.name = "name"
	2165
3063.1.1 by Alexander Belchenko Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).	2166
1534.10.28 by Aaron Bentley Use numbered backup files	2167	class TestGetBackupName(TestCase):
	2168	def test_get_backup_name(self):
	2169	tt = MockTransform()
	2170	name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	2171	self.assertEqual(name, 'name.~1~')
	2172	name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
	2173	self.assertEqual(name, 'name.~2~')
1534.10.28 by Aaron Bentley Use numbered backup files	2174	name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	2175	self.assertEqual(name, 'name.~1~')
1534.10.28 by Aaron Bentley Use numbered backup files	2176	name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	2177	self.assertEqual(name, 'name.~1~')
	2178	name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
	2179	self.assertEqual(name, 'name.~4~')
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	2180
	2181
	2182	class TestFileMover(tests.TestCaseWithTransport):
	2183
	2184	def test_file_mover(self):
	2185	self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
	2186	mover = _FileMover()
	2187	mover.rename('a', 'q')
	2188	self.failUnlessExists('q')
	2189	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	2190	self.failUnlessExists('q/b')
	2191	self.failUnlessExists('c')
	2192	self.failUnlessExists('c/d')
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	2193
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	2194	def test_pre_delete_rollback(self):
	2195	self.build_tree(['a/'])
	2196	mover = _FileMover()
	2197	mover.pre_delete('a', 'q')
	2198	self.failUnlessExists('q')
	2199	self.failIfExists('a')
	2200	mover.rollback()
	2201	self.failIfExists('q')
	2202	self.failUnlessExists('a')
	2203
	2204	def test_apply_deletions(self):
2733.2.12 by Aaron Bentley Updates from review	2205	self.build_tree(['a/', 'b/'])
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	2206	mover = _FileMover()
	2207	mover.pre_delete('a', 'q')
2733.2.12 by Aaron Bentley Updates from review	2208	mover.pre_delete('b', 'r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	2209	self.failUnlessExists('q')
2733.2.12 by Aaron Bentley Updates from review	2210	self.failUnlessExists('r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	2211	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	2212	self.failIfExists('b')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	2213	mover.apply_deletions()
	2214	self.failIfExists('q')
2733.2.12 by Aaron Bentley Updates from review	2215	self.failIfExists('r')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	2216	self.failIfExists('a')
2733.2.12 by Aaron Bentley Updates from review	2217	self.failIfExists('b')
2733.2.5 by Aaron Bentley Implement FileMover.pre_delete and FileMover.apply_deletions	2218
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	2219	def test_file_mover_rollback(self):
	2220	self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
	2221	mover = _FileMover()
	2222	mover.rename('c/d', 'c/f')
	2223	mover.rename('c/e', 'c/d')
	2224	try:
	2225	mover.rename('a', 'c')
3063.1.3 by Aaron Bentley Update for Linux	2226	except errors.FileExists, e:
2733.2.1 by Aaron Bentley Implement FileMover, to support TreeTransform rollback	2227	mover.rollback()
	2228	self.failUnlessExists('a')
	2229	self.failUnlessExists('c/d')
2733.2.3 by Aaron Bentley Test tranform rollback	2230
	2231
	2232	class Bogus(Exception):
	2233	pass
	2234
	2235
	2236	class TestTransformRollback(tests.TestCaseWithTransport):
	2237
	2238	class ExceptionFileMover(_FileMover):
	2239
2733.2.4 by Aaron Bentley Test transform rollback when renaming into place	2240	def __init__(self, bad_source=None, bad_target=None):
	2241	_FileMover.__init__(self)
	2242	self.bad_source = bad_source
	2243	self.bad_target = bad_target
	2244
2733.2.3 by Aaron Bentley Test tranform rollback	2245	def rename(self, source, target):
2733.2.4 by Aaron Bentley Test transform rollback when renaming into place	2246	if (self.bad_source is not None and
	2247	source.endswith(self.bad_source)):
	2248	raise Bogus
	2249	elif (self.bad_target is not None and
	2250	target.endswith(self.bad_target)):
2733.2.3 by Aaron Bentley Test tranform rollback	2251	raise Bogus
	2252	else:
	2253	_FileMover.rename(self, source, target)
	2254
	2255	def test_rollback_rename(self):
	2256	tree = self.make_branch_and_tree('.')
	2257	self.build_tree(['a/', 'a/b'])
	2258	tt = TreeTransform(tree)
	2259	self.addCleanup(tt.finalize)
	2260	a_id = tt.trans_id_tree_path('a')
	2261	tt.adjust_path('c', tt.root, a_id)
	2262	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	2263	self.assertRaises(Bogus, tt.apply,
	2264	_mover=self.ExceptionFileMover(bad_source='a'))
	2265	self.failUnlessExists('a')
	2266	self.failUnlessExists('a/b')
	2267	tt.apply()
	2268	self.failUnlessExists('c')
	2269	self.failUnlessExists('c/d')
	2270
	2271	def test_rollback_rename_into_place(self):
	2272	tree = self.make_branch_and_tree('.')
	2273	self.build_tree(['a/', 'a/b'])
	2274	tt = TreeTransform(tree)
	2275	self.addCleanup(tt.finalize)
	2276	a_id = tt.trans_id_tree_path('a')
	2277	tt.adjust_path('c', tt.root, a_id)
	2278	tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
	2279	self.assertRaises(Bogus, tt.apply,
	2280	_mover=self.ExceptionFileMover(bad_target='c/d'))
	2281	self.failUnlessExists('a')
	2282	self.failUnlessExists('a/b')
	2283	tt.apply()
	2284	self.failUnlessExists('c')
	2285	self.failUnlessExists('c/d')
2733.2.6 by Aaron Bentley Make TreeTransform commits rollbackable	2286
	2287	def test_rollback_deletion(self):
	2288	tree = self.make_branch_and_tree('.')
	2289	self.build_tree(['a/', 'a/b'])
	2290	tt = TreeTransform(tree)
	2291	self.addCleanup(tt.finalize)
	2292	a_id = tt.trans_id_tree_path('a')
	2293	tt.delete_contents(a_id)
	2294	tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
	2295	self.assertRaises(Bogus, tt.apply,
	2296	_mover=self.ExceptionFileMover(bad_target='d'))
	2297	self.failUnlessExists('a')
	2298	self.failUnlessExists('a/b')
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2299
1551.19.6 by Aaron Bentley Revert doesn't crash restoring a file from a deleted directory	2300	def test_resolve_no_parent(self):
	2301	wt = self.make_branch_and_tree('.')
	2302	tt = TreeTransform(wt)
	2303	self.addCleanup(tt.finalize)
	2304	parent = tt.trans_id_file_id('parent-id')
	2305	tt.new_file('file', parent, 'Contents')
	2306	resolve_conflicts(tt)
3008.1.13 by Michael Hudson merge bzr.dev	2307
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2308
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2309	A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
	2310	('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
	2311	(False, False))
	2312	ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
	2313	('', ''), ('directory', 'directory'), (False, None))
	2314
	2315
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2316	class TestTransformPreview(tests.TestCaseWithTransport):
	2317
	2318	def create_tree(self):
	2319	tree = self.make_branch_and_tree('.')
	2320	self.build_tree_contents([('a', 'content 1')])
4600.3.1 by Robert Collins Set tree root ID in tree transform tests that don't care about the root id.	2321	tree.set_root_id('TREE_ROOT')
3008.2.1 by Aaron Bentley Ensure conflict resolution works	2322	tree.add('a', 'a-id')
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2323	tree.commit('rev1', rev_id='rev1')
	2324	return tree.branch.repository.revision_tree('rev1')
	2325
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	2326	def get_empty_preview(self):
	2327	repository = self.make_repository('repo')
	2328	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	2329	preview = TransformPreview(tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2330	self.addCleanup(preview.finalize)
3199.1.4 by Vincent Ladeuil Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview	2331	return preview
	2332
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2333	def test_transform_preview(self):
	2334	revision_tree = self.create_tree()
	2335	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2336	self.addCleanup(preview.finalize)
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2337
	2338	def test_transform_preview_tree(self):
	2339	revision_tree = self.create_tree()
	2340	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2341	self.addCleanup(preview.finalize)
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2342	preview.get_preview_tree()
	2343
3008.1.5 by Michael Hudson a more precise test	2344	def test_transform_new_file(self):
	2345	revision_tree = self.create_tree()
	2346	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2347	self.addCleanup(preview.finalize)
3008.1.5 by Michael Hudson a more precise test	2348	preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
	2349	preview_tree = preview.get_preview_tree()
	2350	self.assertEqual(preview_tree.kind('file2-id'), 'file')
	2351	self.assertEqual(
	2352	preview_tree.get_file('file2-id').read(), 'content B\n')
	2353
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2354	def test_diff_preview_tree(self):
	2355	revision_tree = self.create_tree()
	2356	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2357	self.addCleanup(preview.finalize)
3008.1.4 by Michael Hudson Merge test enhancements	2358	preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
3008.1.1 by Aaron Bentley Start work allowing previews of transforms	2359	preview_tree = preview.get_preview_tree()
	2360	out = StringIO()
	2361	show_diff_trees(revision_tree, preview_tree, out)
3008.1.4 by Michael Hudson Merge test enhancements	2362	lines = out.getvalue().splitlines()
	2363	self.assertEqual(lines[0], "=== added file 'file2'")
	2364	# 3 lines of diff administrivia
	2365	self.assertEqual(lines[4], "+content B")
3008.2.1 by Aaron Bentley Ensure conflict resolution works	2366
	2367	def test_transform_conflicts(self):
	2368	revision_tree = self.create_tree()
	2369	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2370	self.addCleanup(preview.finalize)
3008.2.1 by Aaron Bentley Ensure conflict resolution works	2371	preview.new_file('a', preview.root, 'content 2')
	2372	resolve_conflicts(preview)
	2373	trans_id = preview.trans_id_file_id('a-id')
	2374	self.assertEqual('a.moved', preview.final_name(trans_id))
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2375
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2376	def get_tree_and_preview_tree(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2377	revision_tree = self.create_tree()
	2378	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2379	self.addCleanup(preview.finalize)
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2380	a_trans_id = preview.trans_id_file_id('a-id')
	2381	preview.delete_contents(a_trans_id)
	2382	preview.create_file('b content', a_trans_id)
	2383	preview_tree = preview.get_preview_tree()
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2384	return revision_tree, preview_tree
	2385
	2386	def test_iter_changes(self):
	2387	revision_tree, preview_tree = self.get_tree_and_preview_tree()
	2388	root = revision_tree.inventory.root.file_id
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2389	self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
	2390	(root, root), ('a', 'a'), ('file', 'file'),
	2391	(False, False))],
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	2392	list(preview_tree.iter_changes(revision_tree)))
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2393
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2394	def test_include_unchanged_succeeds(self):
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2395	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2396	changes = preview_tree.iter_changes(revision_tree,
	2397	include_unchanged=True)
	2398	root = revision_tree.inventory.root.file_id
	2399
	2400	self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2401
	2402	def test_specific_files(self):
	2403	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2404	changes = preview_tree.iter_changes(revision_tree,
	2405	specific_files=[''])
	2406	self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2407
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2408	def test_want_unversioned(self):
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2409	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3363.19.1 by Aaron Bentley Make PreviewTree.iter_changes accept all options.	2410	changes = preview_tree.iter_changes(revision_tree,
	2411	want_unversioned=True)
	2412	self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2413
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2414	def test_ignore_extra_trees_no_specific_files(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2415	# extra_trees is harmless without specific_files, so we'll silently
	2416	# accept it, even though we won't use it.
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2417	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	2418	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	2419
	2420	def test_ignore_require_versioned_no_specific_files(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2421	# require_versioned is meaningless without specific_files.
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2422	revision_tree, preview_tree = self.get_tree_and_preview_tree()
3254.1.1 by Aaron Bentley Make Tree.iter_changes a public method	2423	preview_tree.iter_changes(revision_tree, require_versioned=False)
3008.1.31 by Aaron Bentley Split PreviewTree._iter_changes parameter tests into smaller tests	2424
	2425	def test_ignore_pb(self):
3008.1.17 by Aaron Bentley Test unused parameters of preview_tree._iter_changes	2426	# 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	2427	revision_tree, preview_tree = self.get_tree_and_preview_tree()
4961.2.9 by Martin Pool Rip out most remaining uses of DummyProgressBar	2428	preview_tree.iter_changes(revision_tree)
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	2429
	2430	def test_kind(self):
	2431	revision_tree = self.create_tree()
	2432	preview = TransformPreview(revision_tree)
3199.1.5 by Vincent Ladeuil Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.	2433	self.addCleanup(preview.finalize)
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	2434	preview.new_file('file', preview.root, 'contents', 'file-id')
	2435	preview.new_directory('directory', preview.root, 'dir-id')
	2436	preview_tree = preview.get_preview_tree()
	2437	self.assertEqual('file', preview_tree.kind('file-id'))
	2438	self.assertEqual('directory', preview_tree.kind('dir-id'))
	2439
	2440	def test_get_file_mtime(self):
	2441	preview = self.get_empty_preview()
	2442	file_trans_id = preview.new_file('file', preview.root, 'contents',
	2443	'file-id')
	2444	limbo_path = preview._limbo_name(file_trans_id)
	2445	preview_tree = preview.get_preview_tree()
	2446	self.assertEqual(os.stat(limbo_path).st_mtime,
	2447	preview_tree.get_file_mtime('file-id'))
	2448
4635.1.1 by Aaron Bentley Fix OSError with renamed files in PreviewTree.	2449	def test_get_file_mtime_renamed(self):
	2450	work_tree = self.make_branch_and_tree('tree')
	2451	self.build_tree(['tree/file'])
	2452	work_tree.add('file', 'file-id')
	2453	preview = TransformPreview(work_tree)
	2454	self.addCleanup(preview.finalize)
	2455	file_trans_id = preview.trans_id_tree_file_id('file-id')
	2456	preview.adjust_path('renamed', preview.root, file_trans_id)
	2457	preview_tree = preview.get_preview_tree()
	2458	preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
	2459	work_mtime = work_tree.get_file_mtime('file-id', 'file')
	2460
3008.1.18 by Aaron Bentley Get supported PreviewTree functionality under test	2461	def test_get_file(self):
	2462	preview = self.get_empty_preview()
	2463	preview.new_file('file', preview.root, 'contents', 'file-id')
	2464	preview_tree = preview.get_preview_tree()
	2465	tree_file = preview_tree.get_file('file-id')
	2466	try:
	2467	self.assertEqual('contents', tree_file.read())
	2468	finally:
	2469	tree_file.close()
3228.1.2 by James Henstridge Simplify test, and move it down to be next to the other _PreviewTree tests.	2470
	2471	def test_get_symlink_target(self):
	2472	self.requireFeature(SymlinkFeature)
	2473	preview = self.get_empty_preview()
	2474	preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
	2475	preview_tree = preview.get_preview_tree()
	2476	self.assertEqual('target',
	2477	preview_tree.get_symlink_target('symlink-id'))
3363.2.18 by Aaron Bentley Implement correct all_file_ids for PreviewTree	2478
	2479	def test_all_file_ids(self):
	2480	tree = self.make_branch_and_tree('tree')
	2481	self.build_tree(['tree/a', 'tree/b', 'tree/c'])
	2482	tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
	2483	preview = TransformPreview(tree)
	2484	self.addCleanup(preview.finalize)
	2485	preview.unversion_file(preview.trans_id_file_id('b-id'))
	2486	c_trans_id = preview.trans_id_file_id('c-id')
	2487	preview.unversion_file(c_trans_id)
	2488	preview.version_file('c-id', c_trans_id)
	2489	preview_tree = preview.get_preview_tree()
	2490	self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
	2491	preview_tree.all_file_ids())
3363.2.19 by Aaron Bentley Make PreviewTree.path2id correct	2492
	2493	def test_path2id_deleted_unchanged(self):
	2494	tree = self.make_branch_and_tree('tree')
	2495	self.build_tree(['tree/unchanged', 'tree/deleted'])
	2496	tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
	2497	preview = TransformPreview(tree)
	2498	self.addCleanup(preview.finalize)
	2499	preview.unversion_file(preview.trans_id_file_id('deleted-id'))
	2500	preview_tree = preview.get_preview_tree()
	2501	self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
	2502	self.assertIs(None, preview_tree.path2id('deleted'))
	2503
	2504	def test_path2id_created(self):
	2505	tree = self.make_branch_and_tree('tree')
	2506	self.build_tree(['tree/unchanged'])
	2507	tree.add(['unchanged'], ['unchanged-id'])
	2508	preview = TransformPreview(tree)
	2509	self.addCleanup(preview.finalize)
	2510	preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
	2511	'contents', 'new-id')
	2512	preview_tree = preview.get_preview_tree()
	2513	self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
	2514
	2515	def test_path2id_moved(self):
	2516	tree = self.make_branch_and_tree('tree')
	2517	self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
	2518	tree.add(['old_parent', 'old_parent/child'],
	2519	['old_parent-id', 'child-id'])
	2520	preview = TransformPreview(tree)
	2521	self.addCleanup(preview.finalize)
	2522	new_parent = preview.new_directory('new_parent', preview.root,
	2523	'new_parent-id')
	2524	preview.adjust_path('child', new_parent,
	2525	preview.trans_id_file_id('child-id'))
	2526	preview_tree = preview.get_preview_tree()
	2527	self.assertIs(None, preview_tree.path2id('old_parent/child'))
	2528	self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
	2529
	2530	def test_path2id_renamed_parent(self):
	2531	tree = self.make_branch_and_tree('tree')
	2532	self.build_tree(['tree/old_name/', 'tree/old_name/child'])
	2533	tree.add(['old_name', 'old_name/child'],
	2534	['parent-id', 'child-id'])
	2535	preview = TransformPreview(tree)
	2536	self.addCleanup(preview.finalize)
	2537	preview.adjust_path('new_name', preview.root,
	2538	preview.trans_id_file_id('parent-id'))
	2539	preview_tree = preview.get_preview_tree()
	2540	self.assertIs(None, preview_tree.path2id('old_name/child'))
	2541	self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
3363.2.21 by Aaron Bentley Implement iter_entries_by_dir	2542
	2543	def assertMatchingIterEntries(self, tt, specific_file_ids=None):
	2544	preview_tree = tt.get_preview_tree()
	2545	preview_result = list(preview_tree.iter_entries_by_dir(
	2546	specific_file_ids))
	2547	tree = tt._tree
	2548	tt.apply()
	2549	actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
	2550	self.assertEqual(actual_result, preview_result)
	2551
	2552	def test_iter_entries_by_dir_new(self):
	2553	tree = self.make_branch_and_tree('tree')
	2554	tt = TreeTransform(tree)
	2555	tt.new_file('new', tt.root, 'contents', 'new-id')
	2556	self.assertMatchingIterEntries(tt)
	2557
	2558	def test_iter_entries_by_dir_deleted(self):
	2559	tree = self.make_branch_and_tree('tree')
	2560	self.build_tree(['tree/deleted'])
	2561	tree.add('deleted', 'deleted-id')
	2562	tt = TreeTransform(tree)
	2563	tt.delete_contents(tt.trans_id_file_id('deleted-id'))
	2564	self.assertMatchingIterEntries(tt)
	2565
	2566	def test_iter_entries_by_dir_unversioned(self):
	2567	tree = self.make_branch_and_tree('tree')
	2568	self.build_tree(['tree/removed'])
	2569	tree.add('removed', 'removed-id')
	2570	tt = TreeTransform(tree)
	2571	tt.unversion_file(tt.trans_id_file_id('removed-id'))
	2572	self.assertMatchingIterEntries(tt)
	2573
	2574	def test_iter_entries_by_dir_moved(self):
	2575	tree = self.make_branch_and_tree('tree')
	2576	self.build_tree(['tree/moved', 'tree/new_parent/'])
	2577	tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
	2578	tt = TreeTransform(tree)
	2579	tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
	2580	tt.trans_id_file_id('moved-id'))
	2581	self.assertMatchingIterEntries(tt)
	2582
	2583	def test_iter_entries_by_dir_specific_file_ids(self):
	2584	tree = self.make_branch_and_tree('tree')
	2585	tree.set_root_id('tree-root-id')
	2586	self.build_tree(['tree/parent/', 'tree/parent/child'])
	2587	tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
	2588	tt = TreeTransform(tree)
	2589	self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
3363.2.26 by Aaron Bentley Get symlinks working	2590
	2591	def test_symlink_content_summary(self):
	2592	self.requireFeature(SymlinkFeature)
	2593	preview = self.get_empty_preview()
	2594	preview.new_symlink('path', preview.root, 'target', 'path-id')
	2595	summary = preview.get_preview_tree().path_content_summary('path')
	2596	self.assertEqual(('symlink', None, None, 'target'), summary)
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2597
	2598	def test_missing_content_summary(self):
	2599	preview = self.get_empty_preview()
	2600	summary = preview.get_preview_tree().path_content_summary('path')
	2601	self.assertEqual(('missing', None, None, None), summary)
	2602
	2603	def test_deleted_content_summary(self):
	2604	tree = self.make_branch_and_tree('tree')
	2605	self.build_tree(['tree/path/'])
	2606	tree.add('path')
	2607	preview = TransformPreview(tree)
	2608	self.addCleanup(preview.finalize)
	2609	preview.delete_contents(preview.trans_id_tree_path('path'))
	2610	summary = preview.get_preview_tree().path_content_summary('path')
	2611	self.assertEqual(('missing', None, None, None), summary)
	2612
3363.2.30 by Aaron Bentley Improve execute bit testing	2613	def test_file_content_summary_executable(self):
	2614	preview = self.get_empty_preview()
	2615	path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
	2616	preview.set_executability(True, path_id)
	2617	summary = preview.get_preview_tree().path_content_summary('path')
	2618	self.assertEqual(4, len(summary))
	2619	self.assertEqual('file', summary[0])
	2620	# size must be known
	2621	self.assertEqual(len('contents'), summary[1])
	2622	# executable
	2623	self.assertEqual(True, summary[2])
3363.2.31 by Aaron Bentley Tweak tests	2624	# will not have hash (not cheap to determine)
3363.2.31 by Aaron Bentley Tweak tests	2625	self.assertIs(None, summary[3])
3363.2.30 by Aaron Bentley Improve execute bit testing	2626
	2627	def test_change_executability(self):
	2628	tree = self.make_branch_and_tree('tree')
	2629	self.build_tree(['tree/path'])
	2630	tree.add('path')
	2631	preview = TransformPreview(tree)
	2632	self.addCleanup(preview.finalize)
	2633	path_id = preview.trans_id_tree_path('path')
	2634	preview.set_executability(True, path_id)
	2635	summary = preview.get_preview_tree().path_content_summary('path')
	2636	self.assertEqual(True, summary[2])
	2637
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2638	def test_file_content_summary_non_exec(self):
	2639	preview = self.get_empty_preview()
	2640	preview.new_file('path', preview.root, 'contents', 'path-id')
	2641	summary = preview.get_preview_tree().path_content_summary('path')
	2642	self.assertEqual(4, len(summary))
	2643	self.assertEqual('file', summary[0])
	2644	# size must be known
3363.2.30 by Aaron Bentley Improve execute bit testing	2645	self.assertEqual(len('contents'), summary[1])
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2646	# not executable
4789.15.3 by John Arbash Meinel PreviewTree now returns False for exec bit properly.	2647	self.assertEqual(False, summary[2])
3363.2.31 by Aaron Bentley Tweak tests	2648	# will not have hash (not cheap to determine)
3363.2.31 by Aaron Bentley Tweak tests	2649	self.assertIs(None, summary[3])
3363.2.27 by Aaron Bentley Make path_content_summary a core API	2650
	2651	def test_dir_content_summary(self):
	2652	preview = self.get_empty_preview()
	2653	preview.new_directory('path', preview.root, 'path-id')
	2654	summary = preview.get_preview_tree().path_content_summary('path')
	2655	self.assertEqual(('directory', None, None, None), summary)
	2656
	2657	def test_tree_content_summary(self):
	2658	preview = self.get_empty_preview()
	2659	path = preview.new_directory('path', preview.root, 'path-id')
	2660	preview.set_tree_reference('rev-1', path)
	2661	summary = preview.get_preview_tree().path_content_summary('path')
	2662	self.assertEqual(4, len(summary))
	2663	self.assertEqual('tree-reference', summary[0])
3363.2.33 by Aaron Bentley Implement PreviewTree.annotate_iter	2664
	2665	def test_annotate(self):
	2666	tree = self.make_branch_and_tree('tree')
	2667	self.build_tree_contents([('tree/file', 'a\n')])
	2668	tree.add('file', 'file-id')
	2669	tree.commit('a', rev_id='one')
	2670	self.build_tree_contents([('tree/file', 'a\nb\n')])
	2671	preview = TransformPreview(tree)
	2672	self.addCleanup(preview.finalize)
	2673	file_trans_id = preview.trans_id_file_id('file-id')
	2674	preview.delete_contents(file_trans_id)
	2675	preview.create_file('a\nb\nc\n', file_trans_id)
	2676	preview_tree = preview.get_preview_tree()
	2677	expected = [
	2678	('one', 'a\n'),
	2679	('me:', 'b\n'),
	2680	('me:', 'c\n'),
	2681	]
	2682	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2683	self.assertEqual(expected, annotation)
	2684
	2685	def test_annotate_missing(self):
	2686	preview = self.get_empty_preview()
	2687	preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
	2688	preview_tree = preview.get_preview_tree()
	2689	expected = [
	2690	('me:', 'a\n'),
	2691	('me:', 'b\n'),
	2692	('me:', 'c\n'),
	2693	]
	2694	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2695	self.assertEqual(expected, annotation)
	2696
3363.7.3 by Aaron Bentley Add test that annotate correctly handles renames	2697	def test_annotate_rename(self):
	2698	tree = self.make_branch_and_tree('tree')
	2699	self.build_tree_contents([('tree/file', 'a\n')])
	2700	tree.add('file', 'file-id')
	2701	tree.commit('a', rev_id='one')
	2702	preview = TransformPreview(tree)
	2703	self.addCleanup(preview.finalize)
	2704	file_trans_id = preview.trans_id_file_id('file-id')
	2705	preview.adjust_path('newname', preview.root, file_trans_id)
	2706	preview_tree = preview.get_preview_tree()
	2707	expected = [
	2708	('one', 'a\n'),
	2709	]
	2710	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2711	self.assertEqual(expected, annotation)
	2712
3363.2.33 by Aaron Bentley Implement PreviewTree.annotate_iter	2713	def test_annotate_deleted(self):
	2714	tree = self.make_branch_and_tree('tree')
	2715	self.build_tree_contents([('tree/file', 'a\n')])
	2716	tree.add('file', 'file-id')
	2717	tree.commit('a', rev_id='one')
	2718	self.build_tree_contents([('tree/file', 'a\nb\n')])
	2719	preview = TransformPreview(tree)
	2720	self.addCleanup(preview.finalize)
	2721	file_trans_id = preview.trans_id_file_id('file-id')
	2722	preview.delete_contents(file_trans_id)
	2723	preview_tree = preview.get_preview_tree()
	2724	annotation = preview_tree.annotate_iter('file-id', 'me:')
	2725	self.assertIs(None, annotation)
	2726
3363.2.36 by Aaron Bentley Fix PreviewTree.stored_kind	2727	def test_stored_kind(self):
	2728	preview = self.get_empty_preview()
	2729	preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
	2730	preview_tree = preview.get_preview_tree()
	2731	self.assertEqual('file', preview_tree.stored_kind('file-id'))
3363.2.37 by Aaron Bentley Fix is_executable	2732
	2733	def test_is_executable(self):
	2734	preview = self.get_empty_preview()
	2735	preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
	2736	preview.set_executability(True, preview.trans_id_file_id('file-id'))
	2737	preview_tree = preview.get_preview_tree()
	2738	self.assertEqual(True, preview_tree.is_executable('file-id'))
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2739
3571.1.1 by Aaron Bentley Allow set/get of parent_ids in PreviewTree	2740	def test_get_set_parent_ids(self):
	2741	revision_tree, preview_tree = self.get_tree_and_preview_tree()
	2742	self.assertEqual([], preview_tree.get_parent_ids())
	2743	preview_tree.set_parent_ids(['rev-1'])
	2744	self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
	2745
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2746	def test_plan_file_merge(self):
	2747	work_a = self.make_branch_and_tree('wta')
	2748	self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
	2749	work_a.add('file', 'file-id')
3363.9.7 by Aaron Bentley Fix up to use set_parent_ids	2750	base_id = work_a.commit('base version')
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2751	tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
	2752	preview = TransformPreview(work_a)
	2753	self.addCleanup(preview.finalize)
	2754	trans_id = preview.trans_id_file_id('file-id')
	2755	preview.delete_contents(trans_id)
	2756	preview.create_file('b\nc\nd\ne\n', trans_id)
	2757	self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
	2758	tree_a = preview.get_preview_tree()
3363.9.7 by Aaron Bentley Fix up to use set_parent_ids	2759	tree_a.set_parent_ids([base_id])
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2760	self.assertEqual([
3363.9.5 by Aaron Bentley Move killed-a from top to bottom	2761	('killed-a', 'a\n'),
3363.9.1 by Aaron Bentley Implement plan_merge, refactoring various bits	2762	('killed-b', 'b\n'),
	2763	('unchanged', 'c\n'),
	2764	('unchanged', 'd\n'),
	2765	('new-a', 'e\n'),
	2766	('new-b', 'f\n'),
	2767	], 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	2768
	2769	def test_plan_file_merge_revision_tree(self):
	2770	work_a = self.make_branch_and_tree('wta')
	2771	self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
	2772	work_a.add('file', 'file-id')
	2773	base_id = work_a.commit('base version')
	2774	tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
	2775	preview = TransformPreview(work_a.basis_tree())
	2776	self.addCleanup(preview.finalize)
	2777	trans_id = preview.trans_id_file_id('file-id')
	2778	preview.delete_contents(trans_id)
	2779	preview.create_file('b\nc\nd\ne\n', trans_id)
	2780	self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
	2781	tree_a = preview.get_preview_tree()
	2782	tree_a.set_parent_ids([base_id])
	2783	self.assertEqual([
	2784	('killed-a', 'a\n'),
	2785	('killed-b', 'b\n'),
	2786	('unchanged', 'c\n'),
	2787	('unchanged', 'd\n'),
	2788	('new-a', 'e\n'),
	2789	('new-b', 'f\n'),
	2790	], list(tree_a.plan_file_merge('file-id', tree_b)))
3363.9.9 by Aaron Bentley Implement walkdirs in terms of TreeTransform	2791
	2792	def test_walkdirs(self):
	2793	preview = self.get_empty_preview()
4634.57.3 by Aaron Bentley Fix failing test.	2794	root = preview.new_directory('', ROOT_PARENT, 'tree-root')
4634.57.3 by Aaron Bentley Fix failing test.	2795	# FIXME: new_directory should mark root.
4634.122.6 by John Arbash Meinel Fix a test that used 'adjust_path' to set the root.	2796	preview.fixup_new_roots()
3363.9.9 by Aaron Bentley Implement walkdirs in terms of TreeTransform	2797	preview_tree = preview.get_preview_tree()
	2798	file_trans_id = preview.new_file('a', preview.root, 'contents',
	2799	'a-id')
	2800	expected = [(('', 'tree-root'),
	2801	[('a', 'a', 'file', None, 'a-id', 'file')])]
	2802	self.assertEqual(expected, list(preview_tree.walkdirs()))
3363.13.2 by Aaron Bentley Test specific cases for PreviewTree.extras	2803
	2804	def test_extras(self):
	2805	work_tree = self.make_branch_and_tree('tree')
	2806	self.build_tree(['tree/removed-file', 'tree/existing-file',
	2807	'tree/not-removed-file'])
	2808	work_tree.add(['removed-file', 'not-removed-file'])
	2809	preview = TransformPreview(work_tree)
3363.13.3 by Aaron Bentley Add cleanup	2810	self.addCleanup(preview.finalize)
3363.13.2 by Aaron Bentley Test specific cases for PreviewTree.extras	2811	preview.new_file('new-file', preview.root, 'contents')
	2812	preview.new_file('new-versioned-file', preview.root, 'contents',
	2813	'new-versioned-id')
	2814	tree = preview.get_preview_tree()
	2815	preview.unversion_file(preview.trans_id_tree_path('removed-file'))
	2816	self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
	2817	set(tree.extras()))
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2818
3363.17.2 by Aaron Bentley Add text checking	2819	def test_merge_into_preview(self):
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2820	work_tree = self.make_branch_and_tree('tree')
3363.17.2 by Aaron Bentley Add text checking	2821	self.build_tree_contents([('tree/file','b\n')])
3363.17.2 by Aaron Bentley Add text checking	2822	work_tree.add('file', 'file-id')
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2823	work_tree.commit('first commit')
	2824	child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
3363.17.2 by Aaron Bentley Add text checking	2825	self.build_tree_contents([('child/file','b\nc\n')])
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2826	child_tree.commit('child commit')
	2827	child_tree.lock_write()
	2828	self.addCleanup(child_tree.unlock)
	2829	work_tree.lock_write()
	2830	self.addCleanup(work_tree.unlock)
	2831	preview = TransformPreview(work_tree)
	2832	self.addCleanup(preview.finalize)
3363.17.6 by Aaron Bentley Improve test scenario	2833	file_trans_id = preview.trans_id_file_id('file-id')
	2834	preview.delete_contents(file_trans_id)
	2835	preview.create_file('a\nb\n', file_trans_id)
4634.57.2 by Aaron Bentley Fix failing test.	2836	preview_tree = preview.get_preview_tree()
4961.2.9 by Martin Pool Rip out most remaining uses of DummyProgressBar	2837	merger = Merger.from_revision_ids(None, preview_tree,
3363.17.1 by Aaron Bentley Avoid inventory for merge and transform code	2838	child_tree.branch.last_revision(),
	2839	other_branch=child_tree.branch,
	2840	tree_branch=work_tree.branch)
	2841	merger.merge_type = Merge3Merger
	2842	tt = merger.make_merger().make_preview_transform()
3363.17.2 by Aaron Bentley Add text checking	2843	self.addCleanup(tt.finalize)
	2844	final_tree = tt.get_preview_tree()
	2845	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	2846
	2847	def test_merge_preview_into_workingtree(self):
	2848	tree = self.make_branch_and_tree('tree')
4600.3.1 by Robert Collins Set tree root ID in tree transform tests that don't care about the root id.	2849	tree.set_root_id('TREE_ROOT')
3363.17.17 by Aaron Bentley Start testing merging PreviewTree as OTHER	2850	tt = TransformPreview(tree)
	2851	self.addCleanup(tt.finalize)
	2852	tt.new_file('name', tt.root, 'content', 'file-id')
	2853	tree2 = self.make_branch_and_tree('tree2')
4600.3.1 by Robert Collins Set tree root ID in tree transform tests that don't care about the root id.	2854	tree2.set_root_id('TREE_ROOT')
3363.17.17 by Aaron Bentley Start testing merging PreviewTree as OTHER	2855	merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
4961.2.9 by Martin Pool Rip out most remaining uses of DummyProgressBar	2856	None, tree.basis_tree())
3363.17.17 by Aaron Bentley Start testing merging PreviewTree as OTHER	2857	merger.merge_type = Merge3Merger
	2858	merger.do_merge()
3363.17.18 by Aaron Bentley Fix is_executable for PreviewTree	2859
3363.17.21 by Aaron Bentley Conflicts are handled when merging from preview trees	2860	def test_merge_preview_into_workingtree_handles_conflicts(self):
	2861	tree = self.make_branch_and_tree('tree')
	2862	self.build_tree_contents([('tree/foo', 'bar')])
	2863	tree.add('foo', 'foo-id')
	2864	tree.commit('foo')
	2865	tt = TransformPreview(tree)
	2866	self.addCleanup(tt.finalize)
	2867	trans_id = tt.trans_id_file_id('foo-id')
	2868	tt.delete_contents(trans_id)
	2869	tt.create_file('baz', trans_id)
	2870	tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
	2871	self.build_tree_contents([('tree2/foo', 'qux')])
4961.2.9 by Martin Pool Rip out most remaining uses of DummyProgressBar	2872	pb = None
3363.17.21 by Aaron Bentley Conflicts are handled when merging from preview trees	2873	merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
	2874	pb, tree.basis_tree())
	2875	merger.merge_type = Merge3Merger
	2876	merger.do_merge()
	2877
3363.17.18 by Aaron Bentley Fix is_executable for PreviewTree	2878	def test_is_executable(self):
	2879	tree = self.make_branch_and_tree('tree')
	2880	preview = TransformPreview(tree)
	2881	self.addCleanup(preview.finalize)
	2882	preview.new_file('foo', preview.root, 'bar', 'baz-id')
	2883	preview_tree = preview.get_preview_tree()
	2884	self.assertEqual(False, preview_tree.is_executable('baz-id',
	2885	'tree/foo'))
	2886	self.assertEqual(False, preview_tree.is_executable('baz-id'))
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	2887
4354.4.4 by Aaron Bentley Simplify by using CommitBuilder directly	2888	def test_commit_preview_tree(self):
	2889	tree = self.make_branch_and_tree('tree')
	2890	rev_id = tree.commit('rev1')
	2891	tree.branch.lock_write()
	2892	self.addCleanup(tree.branch.unlock)
	2893	tt = TransformPreview(tree)
	2894	tt.new_file('file', tt.root, 'contents', 'file_id')
	2895	self.addCleanup(tt.finalize)
	2896	preview = tt.get_preview_tree()
	2897	preview.set_parent_ids([rev_id])
	2898	builder = tree.branch.get_commit_builder([rev_id])
	2899	list(builder.record_iter_changes(preview, rev_id, tt.iter_changes()))
	2900	builder.finish_inventory()
	2901	rev2_id = builder.commit('rev2')
	2902	rev2_tree = tree.branch.repository.revision_tree(rev2_id)
	2903	self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
	2904
4634.79.1 by Aaron Bentley TransformPreview uses ascii-only filenames.	2905	def test_ascii_limbo_paths(self):
4634.79.2 by Aaron Bentley Avoid runing test on non-unicode filesystems.	2906	self.requireFeature(tests.UnicodeFilenameFeature)
4634.79.1 by Aaron Bentley TransformPreview uses ascii-only filenames.	2907	branch = self.make_branch('any')
	2908	tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
	2909	tt = TransformPreview(tree)
4789.25.7 by John Arbash Meinel We can run the executable tests.	2910	self.addCleanup(tt.finalize)
4634.79.1 by Aaron Bentley TransformPreview uses ascii-only filenames.	2911	foo_id = tt.new_directory('', ROOT_PARENT)
	2912	bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')
	2913	limbo_path = tt._limbo_name(bar_id)
	2914	self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)
	2915
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	2916
0.13.13 by Aaron Bentley Add direct test of serialization records	2917	class FakeSerializer(object):
	2918	"""Serializer implementation that simply returns the input.
	2919
	2920	The input is returned in the order used by pack.ContainerPushParser.
	2921	"""
	2922	@staticmethod
	2923	def bytes_record(bytes, names):
	2924	return names, bytes
	2925
	2926
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	2927	class TestSerializeTransform(tests.TestCaseWithTransport):
	2928
0.13.22 by Aaron Bentley More unicodeness for Shelf tests	2929	_test_needs_features = [tests.UnicodeFilenameFeature]
0.13.22 by Aaron Bentley More unicodeness for Shelf tests	2930
0.13.17 by Aaron Bentley Convert roundtrip destruction test to serialization/deserialization pair	2931	def get_preview(self, tree=None):
	2932	if tree is None:
	2933	tree = self.make_branch_and_tree('tree')
0.13.14 by Aaron Bentley Add deserialization test, remove roundtrip test.	2934	tt = TransformPreview(tree)
	2935	self.addCleanup(tt.finalize)
	2936	return tt
	2937
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	2938	def assertSerializesTo(self, expected, tt):
	2939	records = list(tt.serialize(FakeSerializer()))
	2940	self.assertEqual(expected, records)
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	2941
0.13.13 by Aaron Bentley Add direct test of serialization records	2942	@staticmethod
	2943	def default_attribs():
	2944	return {
0.13.15 by Aaron Bentley Convert symlink tests to avoid roundtripping	2945	'_id_number': 1,
0.13.13 by Aaron Bentley Add direct test of serialization records	2946	'_new_name': {},
	2947	'_new_parent': {},
	2948	'_new_executability': {},
	2949	'_new_id': {},
0.13.15 by Aaron Bentley Convert symlink tests to avoid roundtripping	2950	'_tree_path_ids': {'': 'new-0'},
0.13.13 by Aaron Bentley Add direct test of serialization records	2951	'_removed_id': [],
	2952	'_removed_contents': [],
	2953	'_non_present_ids': {},
	2954	}
	2955
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	2956	def make_records(self, attribs, contents):
	2957	records = [
	2958	(((('attribs'),),), bencode.bencode(attribs))]
	2959	records.extend([(((n, k),), c) for n, k, c in contents])
	2960	return records
	2961
0.13.13 by Aaron Bentley Add direct test of serialization records	2962	def creation_records(self):
	2963	attribs = self.default_attribs()
	2964	attribs['_id_number'] = 3
	2965	attribs['_new_name'] = {
	2966	'new-1': u'foo\u1234'.encode('utf-8'), 'new-2': 'qux'}
	2967	attribs['_new_id'] = {'new-1': 'baz', 'new-2': 'quxx'}
	2968	attribs['_new_parent'] = {'new-1': 'new-0', 'new-2': 'new-0'}
	2969	attribs['_new_executability'] = {'new-1': 1}
	2970	contents = [
	2971	('new-1', 'file', 'i 1\nbar\n'),
	2972	('new-2', 'directory', ''),
	2973	]
	2974	return self.make_records(attribs, contents)
	2975
	2976	def test_serialize_creation(self):
0.13.14 by Aaron Bentley Add deserialization test, remove roundtrip test.	2977	tt = self.get_preview()
0.13.13 by Aaron Bentley Add direct test of serialization records	2978	tt.new_file(u'foo\u1234', tt.root, 'bar', 'baz', True)
	2979	tt.new_directory('qux', tt.root, 'quxx')
0.13.21 by Aaron Bentley Use assertSerializesTo in more places	2980	self.assertSerializesTo(self.creation_records(), tt)
0.13.13 by Aaron Bentley Add direct test of serialization records	2981
0.13.14 by Aaron Bentley Add deserialization test, remove roundtrip test.	2982	def test_deserialize_creation(self):
	2983	tt = self.get_preview()
	2984	tt.deserialize(iter(self.creation_records()))
	2985	self.assertEqual(3, tt._id_number)
	2986	self.assertEqual({'new-1': u'foo\u1234',
	2987	'new-2': 'qux'}, tt._new_name)
	2988	self.assertEqual({'new-1': 'baz', 'new-2': 'quxx'}, tt._new_id)
	2989	self.assertEqual({'new-1': tt.root, 'new-2': tt.root}, tt._new_parent)
	2990	self.assertEqual({'baz': 'new-1', 'quxx': 'new-2'}, tt._r_new_id)
	2991	self.assertEqual({'new-1': True}, tt._new_executability)
	2992	self.assertEqual({'new-1': 'file',
	2993	'new-2': 'directory'}, tt._new_contents)
	2994	foo_limbo = open(tt._limbo_name('new-1'), 'rb')
	2995	try:
	2996	foo_content = foo_limbo.read()
	2997	finally:
	2998	foo_limbo.close()
	2999	self.assertEqual('bar', foo_content)
	3000
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3001	def symlink_creation_records(self):
	3002	attribs = self.default_attribs()
	3003	attribs['_id_number'] = 2
	3004	attribs['_new_name'] = {'new-1': u'foo\u1234'.encode('utf-8')}
	3005	attribs['_new_parent'] = {'new-1': 'new-0'}
	3006	contents = [('new-1', 'symlink', u'bar\u1234'.encode('utf-8'))]
	3007	return self.make_records(attribs, contents)
	3008
0.13.15 by Aaron Bentley Convert symlink tests to avoid roundtripping	3009	def test_serialize_symlink_creation(self):
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3010	self.requireFeature(tests.SymlinkFeature)
0.13.15 by Aaron Bentley Convert symlink tests to avoid roundtripping	3011	tt = self.get_preview()
0.13.16 by Aaron Bentley Add unicode symlink targets to tests	3012	tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
0.13.21 by Aaron Bentley Use assertSerializesTo in more places	3013	self.assertSerializesTo(self.symlink_creation_records(), tt)
0.13.15 by Aaron Bentley Convert symlink tests to avoid roundtripping	3014
	3015	def test_deserialize_symlink_creation(self):
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	3016	self.requireFeature(tests.SymlinkFeature)
0.13.15 by Aaron Bentley Convert symlink tests to avoid roundtripping	3017	tt = self.get_preview()
	3018	tt.deserialize(iter(self.symlink_creation_records()))
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	3019	abspath = tt._limbo_name('new-1')
4241.14.17 by Vincent Ladeuil Add more tests for unicode symlinks to test_transform.	3020	foo_content = osutils.readlink(abspath)
0.13.22 by Aaron Bentley More unicodeness for Shelf tests	3021	self.assertEqual(u'bar\u1234', foo_content)
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3022
0.13.19 by Aaron Bentley Clean up serialization tests	3023	def make_destruction_preview(self):
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3024	tree = self.make_branch_and_tree('.')
	3025	self.build_tree([u'foo\u1234', 'bar'])
	3026	tree.add([u'foo\u1234', 'bar'], ['foo-id', 'bar-id'])
0.13.19 by Aaron Bentley Clean up serialization tests	3027	return self.get_preview(tree)
0.13.17 by Aaron Bentley Convert roundtrip destruction test to serialization/deserialization pair	3028
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3029	def destruction_records(self):
	3030	attribs = self.default_attribs()
	3031	attribs['_id_number'] = 3
	3032	attribs['_removed_id'] = ['new-1']
	3033	attribs['_removed_contents'] = ['new-2']
	3034	attribs['_tree_path_ids'] = {
	3035	'': 'new-0',
	3036	u'foo\u1234'.encode('utf-8'): 'new-1',
	3037	'bar': 'new-2',
	3038	}
	3039	return self.make_records(attribs, [])
	3040
0.13.17 by Aaron Bentley Convert roundtrip destruction test to serialization/deserialization pair	3041	def test_serialize_destruction(self):
0.13.19 by Aaron Bentley Clean up serialization tests	3042	tt = self.make_destruction_preview()
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3043	foo_trans_id = tt.trans_id_tree_file_id('foo-id')
	3044	tt.unversion_file(foo_trans_id)
	3045	bar_trans_id = tt.trans_id_tree_file_id('bar-id')
	3046	tt.delete_contents(bar_trans_id)
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3047	self.assertSerializesTo(self.destruction_records(), tt)
0.13.17 by Aaron Bentley Convert roundtrip destruction test to serialization/deserialization pair	3048
	3049	def test_deserialize_destruction(self):
0.13.19 by Aaron Bentley Clean up serialization tests	3050	tt = self.make_destruction_preview()
0.13.17 by Aaron Bentley Convert roundtrip destruction test to serialization/deserialization pair	3051	tt.deserialize(iter(self.destruction_records()))
	3052	self.assertEqual({u'foo\u1234': 'new-1',
	3053	'bar': 'new-2',
	3054	'': tt.root}, tt._tree_path_ids)
	3055	self.assertEqual({'new-1': u'foo\u1234',
	3056	'new-2': 'bar',
	3057	tt.root: ''}, tt._tree_id_paths)
	3058	self.assertEqual(set(['new-1']), tt._removed_id)
	3059	self.assertEqual(set(['new-2']), tt._removed_contents)
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3060
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3061	def missing_records(self):
	3062	attribs = self.default_attribs()
	3063	attribs['_id_number'] = 2
	3064	attribs['_non_present_ids'] = {
	3065	'boo': 'new-1',}
	3066	return self.make_records(attribs, [])
	3067
	3068	def test_serialize_missing(self):
	3069	tt = self.get_preview()
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3070	boo_trans_id = tt.trans_id_file_id('boo')
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3071	self.assertSerializesTo(self.missing_records(), tt)
	3072
	3073	def test_deserialize_missing(self):
	3074	tt = self.get_preview()
	3075	tt.deserialize(iter(self.missing_records()))
	3076	self.assertEqual({'boo': 'new-1'}, tt._non_present_ids)
	3077
	3078	def make_modification_preview(self):
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3079	LINES_ONE = 'aa\nbb\ncc\ndd\n'
	3080	LINES_TWO = 'z\nbb\nx\ndd\n'
	3081	tree = self.make_branch_and_tree('tree')
	3082	self.build_tree_contents([('tree/file', LINES_ONE)])
	3083	tree.add('file', 'file-id')
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3084	return self.get_preview(tree), LINES_TWO
	3085
	3086	def modification_records(self):
	3087	attribs = self.default_attribs()
	3088	attribs['_id_number'] = 2
	3089	attribs['_tree_path_ids'] = {
	3090	'file': 'new-1',
	3091	'': 'new-0',}
	3092	attribs['_removed_contents'] = ['new-1']
	3093	contents = [('new-1', 'file',
	3094	'i 1\nz\n\nc 0 1 1 1\ni 1\nx\n\nc 0 3 3 1\n')]
	3095	return self.make_records(attribs, contents)
	3096
	3097	def test_serialize_modification(self):
	3098	tt, LINES = self.make_modification_preview()
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3099	trans_id = tt.trans_id_file_id('file-id')
	3100	tt.delete_contents(trans_id)
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3101	tt.create_file(LINES, trans_id)
	3102	self.assertSerializesTo(self.modification_records(), tt)
	3103
	3104	def test_deserialize_modification(self):
	3105	tt, LINES = self.make_modification_preview()
	3106	tt.deserialize(iter(self.modification_records()))
	3107	self.assertFileEqual(LINES, tt._limbo_name('new-1'))
	3108
	3109	def make_kind_change_preview(self):
	3110	LINES = 'a\nb\nc\nd\n'
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3111	tree = self.make_branch_and_tree('tree')
	3112	self.build_tree(['tree/foo/'])
	3113	tree.add('foo', 'foo-id')
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3114	return self.get_preview(tree), LINES
	3115
	3116	def kind_change_records(self):
	3117	attribs = self.default_attribs()
	3118	attribs['_id_number'] = 2
	3119	attribs['_tree_path_ids'] = {
	3120	'foo': 'new-1',
	3121	'': 'new-0',}
	3122	attribs['_removed_contents'] = ['new-1']
	3123	contents = [('new-1', 'file',
	3124	'i 4\na\nb\nc\nd\n\n')]
	3125	return self.make_records(attribs, contents)
	3126
	3127	def test_serialize_kind_change(self):
	3128	tt, LINES = self.make_kind_change_preview()
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3129	trans_id = tt.trans_id_file_id('foo-id')
	3130	tt.delete_contents(trans_id)
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3131	tt.create_file(LINES, trans_id)
	3132	self.assertSerializesTo(self.kind_change_records(), tt)
	3133
	3134	def test_deserialize_kind_change(self):
	3135	tt, LINES = self.make_kind_change_preview()
	3136	tt.deserialize(iter(self.kind_change_records()))
	3137	self.assertFileEqual(LINES, tt._limbo_name('new-1'))
	3138
	3139	def make_add_contents_preview(self):
	3140	LINES = 'a\nb\nc\nd\n'
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3141	tree = self.make_branch_and_tree('tree')
	3142	self.build_tree(['tree/foo'])
	3143	tree.add('foo')
	3144	os.unlink('tree/foo')
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3145	return self.get_preview(tree), LINES
	3146
	3147	def add_contents_records(self):
	3148	attribs = self.default_attribs()
	3149	attribs['_id_number'] = 2
	3150	attribs['_tree_path_ids'] = {
	3151	'foo': 'new-1',
	3152	'': 'new-0',}
	3153	contents = [('new-1', 'file',
	3154	'i 4\na\nb\nc\nd\n\n')]
	3155	return self.make_records(attribs, contents)
	3156
	3157	def test_serialize_add_contents(self):
	3158	tt, LINES = self.make_add_contents_preview()
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3159	trans_id = tt.trans_id_tree_path('foo')
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3160	tt.create_file(LINES, trans_id)
	3161	self.assertSerializesTo(self.add_contents_records(), tt)
	3162
	3163	def test_deserialize_add_contents(self):
	3164	tt, LINES = self.make_add_contents_preview()
	3165	tt.deserialize(iter(self.add_contents_records()))
	3166	self.assertFileEqual(LINES, tt._limbo_name('new-1'))
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3167
	3168	def test_get_parents_lines(self):
	3169	LINES_ONE = 'aa\nbb\ncc\ndd\n'
	3170	LINES_TWO = 'z\nbb\nx\ndd\n'
	3171	tree = self.make_branch_and_tree('tree')
	3172	self.build_tree_contents([('tree/file', LINES_ONE)])
	3173	tree.add('file', 'file-id')
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3174	tt = self.get_preview(tree)
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3175	trans_id = tt.trans_id_tree_path('file')
	3176	self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
	3177	tt._get_parents_lines(trans_id))
	3178
	3179	def test_get_parents_texts(self):
	3180	LINES_ONE = 'aa\nbb\ncc\ndd\n'
	3181	LINES_TWO = 'z\nbb\nx\ndd\n'
	3182	tree = self.make_branch_and_tree('tree')
	3183	self.build_tree_contents([('tree/file', LINES_ONE)])
	3184	tree.add('file', 'file-id')
0.13.18 by Aaron Bentley Finish converting tests to direct serialize/deserialize tests, clean up	3185	tt = self.get_preview(tree)
0.13.8 by Aaron Bentley Integrate serialization into TreeTransforms	3186	trans_id = tt.trans_id_tree_path('file')
	3187	self.assertEqual((LINES_ONE,),
	3188	tt._get_parents_texts(trans_id))