/brz/remove-bazaar : contents of bzrlib/tests/per_workingtree/test

: (revision 5807.1.8)

To get this branch, use:

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

5557.1.15 by John Arbash Meinel Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt	1	# Copyright (C) 2006-2011 Canonical Ltd
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	2	# Authors: Robert Collins <robert.collins@canonical.com>
2255.13.4 by Martin Pool merge	3	# and others
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	4	#
	5	# This program is free software; you can redistribute it and/or modify
	6	# it under the terms of the GNU General Public License as published by
	7	# the Free Software Foundation; either version 2 of the License, or
	8	# (at your option) any later version.
	9	#
	10	# This program is distributed in the hope that it will be useful,
	11	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	# GNU General Public License for more details.
	14	#
	15	# You should have received a copy of the GNU General Public License
	16	# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob update FSF mailing address	17	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	18
	19	from cStringIO import StringIO
3136.1.10 by Aaron Bentley Clean error if filesystem does not support hard-links	20	import errno
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	21	import os
	22
3287.20.3 by John Arbash Meinel Aaron recommended to make this a WT_impl test.	23	from bzrlib import (
	24	branch,
4985.3.18 by Vincent Ladeuil Start rewriting the test.	25	branchbuilder,
3287.20.3 by John Arbash Meinel Aaron recommended to make this a WT_impl test.	26	bzrdir,
	27	errors,
	28	osutils,
	29	tests,
	30	urlutils,
5582.4.3 by Jelmer Vernooij remove more unused imports, avoid relying on a specific set of working tree formats that support references.	31	)
	32	from bzrlib.errors import (
	33	UnsupportedOperation,
	34	PathsNotVersionedError,
	35	)
1852.15.14 by Robert Collins test that WorkingTree._write_inventory works as expected by the current code.	36	from bzrlib.inventory import Inventory
1685.1.45 by John Arbash Meinel Moved url functions into bzrlib.urlutils	37	from bzrlib.osutils import pathjoin, getcwd, has_symlinks
3619.6.7 by Mark Hammond John asked for TestNotApplicable instead of TestSkipped when no os.link.	38	from bzrlib.tests import TestSkipped, TestNotApplicable
4523.1.4 by Martin Pool Rename remaining *_implementations tests	39	from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
5582.4.3 by Jelmer Vernooij remove more unused imports, avoid relying on a specific set of working tree formats that support references.	40	from bzrlib.workingtree import (
	41	TreeDirectory,
	42	TreeFile,
	43	TreeLink,
5807.1.2 by Jelmer Vernooij Skip some inventory-specific tests for non-inventory working trees.	44	InventoryWorkingTree,
5582.4.3 by Jelmer Vernooij remove more unused imports, avoid relying on a specific set of working tree formats that support references.	45	WorkingTree,
	46	)
1551.7.11 by Aaron Bentley Add WorkingTree.add_conflicts	47	from bzrlib.conflicts import ConflictList, TextConflict, ContentsConflict
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	48
1711.7.19 by John Arbash Meinel file:// urls look slightly different on win32	49
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	50	class TestWorkingTree(TestCaseWithWorkingTree):
	51
5516.1.1 by Vincent Ladeuil TestCaseWithWorkingTree.make_branch_builder respects its relpath parameter.	52	def test_branch_builder(self):
	53	# Just a smoke test that we get a branch at the specified relpath
	54	builder = self.make_branch_builder('foobar')
	55	br = branch.Branch.open('foobar')
	56
1732.1.8 by John Arbash Meinel Adding a test for list_files	57	def test_list_files(self):
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	58	tree = self.make_branch_and_tree('.')
1732.1.8 by John Arbash Meinel Adding a test for list_files	59	self.build_tree(['dir/', 'file'])
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	60	if has_symlinks():
	61	os.symlink('target', 'symlink')
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	62	tree.lock_read()
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	63	files = list(tree.list_files())
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	64	tree.unlock()
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	65	self.assertEqual(files[0], ('dir', '?', 'directory', None, TreeDirectory()))
	66	self.assertEqual(files[1], ('file', '?', 'file', None, TreeFile()))
	67	if has_symlinks():
	68	self.assertEqual(files[2], ('symlink', '?', 'symlink', None, TreeLink()))
	69
1732.1.8 by John Arbash Meinel Adding a test for list_files	70	def test_list_files_sorted(self):
1732.1.8 by John Arbash Meinel Adding a test for list_files	71	tree = self.make_branch_and_tree('.')
1836.1.18 by John Arbash Meinel Cleaned up the last failing tests. All tests pass again.	72	self.build_tree(['dir/', 'file', 'dir/file', 'dir/b',
	73	'dir/subdir/', 'a', 'dir/subfile',
	74	'zz_dir/', 'zz_dir/subfile'])
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	75	tree.lock_read()
1836.1.18 by John Arbash Meinel Cleaned up the last failing tests. All tests pass again.	76	files = [(path, kind) for (path, v, kind, file_id, entry)
	77	in tree.list_files()]
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	78	tree.unlock()
1732.1.8 by John Arbash Meinel Adding a test for list_files	79	self.assertEqual([
	80	('a', 'file'),
	81	('dir', 'directory'),
	82	('file', 'file'),
1732.1.25 by John Arbash Meinel Fix list_files test, we don't need to check if children are empty if we fall off the loop.	83	('zz_dir', 'directory'),
1732.1.8 by John Arbash Meinel Adding a test for list_files	84	], files)
1732.1.8 by John Arbash Meinel Adding a test for list_files	85
1732.1.25 by John Arbash Meinel Fix list_files test, we don't need to check if children are empty if we fall off the loop.	86	tree.add(['dir', 'zz_dir'])
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	87	tree.lock_read()
1836.1.18 by John Arbash Meinel Cleaned up the last failing tests. All tests pass again.	88	files = [(path, kind) for (path, v, kind, file_id, entry)
	89	in tree.list_files()]
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	90	tree.unlock()
1732.1.8 by John Arbash Meinel Adding a test for list_files	91	self.assertEqual([
	92	('a', 'file'),
	93	('dir', 'directory'),
	94	('dir/b', 'file'),
	95	('dir/file', 'file'),
	96	('dir/subdir', 'directory'),
	97	('dir/subfile', 'file'),
	98	('file', 'file'),
1732.1.22 by John Arbash Meinel Bug in list_files if the last entry in a directory is another directory	99	('zz_dir', 'directory'),
	100	('zz_dir/subfile', 'file'),
1732.1.8 by John Arbash Meinel Adding a test for list_files	101	], files)
1732.1.8 by John Arbash Meinel Adding a test for list_files	102
1551.10.29 by Aaron Bentley Fix tree.list_files when file kind changes	103	def test_list_files_kind_change(self):
	104	tree = self.make_branch_and_tree('tree')
	105	self.build_tree(['tree/filename'])
	106	tree.add('filename', 'file-id')
	107	os.unlink('tree/filename')
	108	self.build_tree(['tree/filename/'])
	109	tree.lock_read()
	110	self.addCleanup(tree.unlock)
	111	result = list(tree.list_files())
	112	self.assertEqual(1, len(result))
	113	self.assertEqual(('filename', 'V', 'directory', 'file-id'),
	114	result[0][:4])
	115
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	116	def test_open_containing(self):
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	117	branch = self.make_branch_and_tree('.').branch
1711.7.28 by John Arbash Meinel clean up the WorkingTree.open_containing tests	118	local_base = urlutils.local_path_from_url(branch.base)
	119
	120	# Empty opens '.'
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	121	wt, relpath = WorkingTree.open_containing()
	122	self.assertEqual('', relpath)
1711.7.28 by John Arbash Meinel clean up the WorkingTree.open_containing tests	123	self.assertEqual(wt.basedir + '/', local_base)
	124
	125	# '.' opens this dir
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	126	wt, relpath = WorkingTree.open_containing(u'.')
	127	self.assertEqual('', relpath)
1711.7.28 by John Arbash Meinel clean up the WorkingTree.open_containing tests	128	self.assertEqual(wt.basedir + '/', local_base)
	129
	130	# './foo' finds '.' and a relpath of 'foo'
	131	wt, relpath = WorkingTree.open_containing('./foo')
	132	self.assertEqual('foo', relpath)
	133	self.assertEqual(wt.basedir + '/', local_base)
	134
	135	# abspath(foo) finds '.' and relpath of 'foo'
	136	wt, relpath = WorkingTree.open_containing('./foo')
	137	wt, relpath = WorkingTree.open_containing(getcwd() + '/foo')
	138	self.assertEqual('foo', relpath)
	139	self.assertEqual(wt.basedir + '/', local_base)
	140
	141	# can even be a url: finds '.' and relpath of 'foo'
	142	wt, relpath = WorkingTree.open_containing('./foo')
	143	wt, relpath = WorkingTree.open_containing(
	144	urlutils.local_path_to_url(getcwd() + '/foo'))
	145	self.assertEqual('foo', relpath)
	146	self.assertEqual(wt.basedir + '/', local_base)
	147
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	148	def test_basic_relpath(self):
	149	# for comprehensive relpath tests, see whitebox.py.
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	150	tree = self.make_branch_and_tree('.')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	151	self.assertEqual('child',
	152	tree.relpath(pathjoin(getcwd(), 'child')))
	153
	154	def test_lock_locks_branch(self):
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	155	tree = self.make_branch_and_tree('.')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	156	tree.lock_read()
	157	self.assertEqual('r', tree.branch.peek_lock_mode())
	158	tree.unlock()
	159	self.assertEqual(None, tree.branch.peek_lock_mode())
	160	tree.lock_write()
	161	self.assertEqual('w', tree.branch.peek_lock_mode())
	162	tree.unlock()
	163	self.assertEqual(None, tree.branch.peek_lock_mode())
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	164
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	165	def test_revert(self):
	166	"""Test selected-file revert"""
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	167	tree = self.make_branch_and_tree('.')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	168
	169	self.build_tree(['hello.txt'])
	170	file('hello.txt', 'w').write('initial hello')
	171
1551.7.17 by Aaron Bentley Switch to PathsNotVersioned, accept extra_trees	172	self.assertRaises(PathsNotVersionedError,
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	173	tree.revert, ['hello.txt'])
	174	tree.add(['hello.txt'])
	175	tree.commit('create initial hello.txt')
	176
	177	self.check_file_contents('hello.txt', 'initial hello')
	178	file('hello.txt', 'w').write('new hello')
	179	self.check_file_contents('hello.txt', 'new hello')
	180
	181	# revert file modified since last revision
	182	tree.revert(['hello.txt'])
	183	self.check_file_contents('hello.txt', 'initial hello')
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	184	self.check_file_contents('hello.txt.~1~', 'new hello')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	185
	186	# reverting again does not clobber the backup
	187	tree.revert(['hello.txt'])
	188	self.check_file_contents('hello.txt', 'initial hello')
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	189	self.check_file_contents('hello.txt.~1~', 'new hello')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	190
1534.10.28 by Aaron Bentley Use numbered backup files	191	# backup files are numbered
	192	file('hello.txt', 'w').write('new hello2')
	193	tree.revert(['hello.txt'])
	194	self.check_file_contents('hello.txt', 'initial hello')
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	195	self.check_file_contents('hello.txt.~1~', 'new hello')
	196	self.check_file_contents('hello.txt.~2~', 'new hello2')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	197
1558.12.7 by Aaron Bentley Fixed revert with missing files	198	def test_revert_missing(self):
	199	# Revert a file that has been deleted since last commit
	200	tree = self.make_branch_and_tree('.')
	201	file('hello.txt', 'w').write('initial hello')
	202	tree.add('hello.txt')
	203	tree.commit('added hello.txt')
	204	os.unlink('hello.txt')
	205	tree.remove('hello.txt')
	206	tree.revert(['hello.txt'])
5784.1.3 by Martin Pool Switch away from using failUnlessExists and failIfExists	207	self.assertPathExists('hello.txt')
1558.12.7 by Aaron Bentley Fixed revert with missing files	208
1740.6.1 by Martin Pool Remove Scratch objects used by doctests	209	def test_versioned_files_not_unknown(self):
	210	tree = self.make_branch_and_tree('.')
1831.1.1 by Martin Pool [merge] remove default ignore list & update	211	self.build_tree(['hello.txt'])
1740.6.1 by Martin Pool Remove Scratch objects used by doctests	212	tree.add('hello.txt')
	213	self.assertEquals(list(tree.unknowns()),
	214	[])
1831.1.1 by Martin Pool [merge] remove default ignore list & update	215
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	216	def test_unknowns(self):
	217	tree = self.make_branch_and_tree('.')
	218	self.build_tree(['hello.txt',
1534.10.29 by Aaron Bentley Fixed backup numbering to match GNU standard better	219	'hello.txt.~1~'])
1765.1.1 by Robert Collins Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.	220	self.build_tree_contents([('.bzrignore', '.~\n')])
	221	tree.add('.bzrignore')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	222	self.assertEquals(list(tree.unknowns()),
	223	['hello.txt'])
	224
	225	def test_initialize(self):
	226	# initialize should create a working tree and branch in an existing dir
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	227	t = self.make_branch_and_tree('.')
1773.4.1 by Martin Pool Add pyflakes makefile target; fix many warnings	228	b = branch.Branch.open('.')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	229	self.assertEqual(t.branch.base, b.base)
1508.1.19 by Robert Collins Give format3 working trees their own last-revision marker.	230	t2 = WorkingTree.open('.')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	231	self.assertEqual(t.basedir, t2.basedir)
	232	self.assertEqual(b.base, t2.branch.base)
	233	# TODO maybe we should check the branch format? not sure if its
	234	# appropriate here.
	235
	236	def test_rename_dirs(self):
	237	"""Test renaming directories and the files within them."""
	238	wt = self.make_branch_and_tree('.')
	239	b = wt.branch
	240	self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
	241	wt.add(['dir', 'dir/sub', 'dir/sub/file'])
	242
	243	wt.commit('create initial state')
	244
	245	revid = b.revision_history()[0]
	246	self.log('first revision_id is {%s}' % revid)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	247
5807.1.5 by Jelmer Vernooij Fix more things to use tree objects.	248	tree = b.repository.revision_tree(revid)
	249	self.log('contents of tree: %r' % list(tree.iter_entries_by_dir()))
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	250
5807.1.5 by Jelmer Vernooij Fix more things to use tree objects.	251	self.check_tree_shape(tree, ['dir/', 'dir/sub/', 'dir/sub/file'])
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	252	wt.rename_one('dir', 'newdir')
	253
2255.2.57 by Robert Collins Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory.	254	wt.lock_read()
5807.1.5 by Jelmer Vernooij Fix more things to use tree objects.	255	self.check_tree_shape(wt,
2545.3.2 by James Westby Add a test for check_inventory_shape.	256	['newdir/', 'newdir/sub/', 'newdir/sub/file'])
2255.2.57 by Robert Collins Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory.	257	wt.unlock()
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	258	wt.rename_one('newdir/sub', 'newdir/newsub')
2255.2.57 by Robert Collins Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory.	259	wt.lock_read()
5807.1.5 by Jelmer Vernooij Fix more things to use tree objects.	260	self.check_tree_shape(wt, ['newdir/', 'newdir/newsub/',
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	261	'newdir/newsub/file'])
2255.2.57 by Robert Collins Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory.	262	wt.unlock()
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	263
	264	def test_add_in_unversioned(self):
	265	"""Try to add a file in an unversioned directory.
	266
	267	"bzr add" adds the parent as necessary, but simple working tree add
	268	doesn't do that.
	269	"""
	270	from bzrlib.errors import NotVersionedError
	271	wt = self.make_branch_and_tree('.')
	272	self.build_tree(['foo/',
	273	'foo/hello'])
	274	self.assertRaises(NotVersionedError,
	275	wt.add,
	276	'foo/hello')
	277
	278	def test_add_missing(self):
	279	# adding a msising file -> NoSuchFile
	280	wt = self.make_branch_and_tree('.')
	281	self.assertRaises(errors.NoSuchFile, wt.add, 'fpp')
	282
	283	def test_remove_verbose(self):
	284	#FIXME the remove api should not print or otherwise depend on the
	285	# text UI - RBC 20060124
	286	wt = self.make_branch_and_tree('.')
	287	self.build_tree(['hello'])
	288	wt.add(['hello'])
	289	wt.commit(message='add hello')
	290	stdout = StringIO()
	291	stderr = StringIO()
	292	self.assertEqual(None, self.apply_redirected(None, stdout, stderr,
	293	wt.remove,
	294	['hello'],
	295	verbose=True))
	296	self.assertEqual('? hello\n', stdout.getvalue())
	297	self.assertEqual('', stderr.getvalue())
	298
	299	def test_clone_trivial(self):
	300	wt = self.make_branch_and_tree('source')
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	301	cloned_dir = wt.bzrdir.clone('target')
	302	cloned = cloned_dir.open_workingtree()
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	303	self.assertEqual(cloned.get_parent_ids(), wt.get_parent_ids())
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	304
	305	def test_last_revision(self):
	306	wt = self.make_branch_and_tree('source')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	307	self.assertEqual([], wt.get_parent_ids())
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	308	wt.commit('A', allow_pointless=True, rev_id='A')
2249.5.7 by John Arbash Meinel Make sure WorkingTree revision_ids are also returned as utf8 strings	309	parent_ids = wt.get_parent_ids()
	310	self.assertEqual(['A'], parent_ids)
	311	for parent_id in parent_ids:
	312	self.assertIsInstance(parent_id, str)
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	313
	314	def test_set_last_revision(self):
	315	wt = self.make_branch_and_tree('source')
1908.1.1 by Robert Collins Relax WorkingTree.set_last-revision to allow any revision to be set.	316	# set last-revision to one not in the history
	317	wt.set_last_revision('A')
	318	# set it back to None for an empty tree.
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	319	wt.set_last_revision('null:')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	320	wt.commit('A', allow_pointless=True, rev_id='A')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	321	self.assertEqual(['A'], wt.get_parent_ids())
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	322	# None is aways in the branch
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	323	wt.set_last_revision('null:')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	324	self.assertEqual([], wt.get_parent_ids())
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	325	# and now we can set it to 'A'
1508.1.19 by Robert Collins Give format3 working trees their own last-revision marker.	326	# because some formats mutate the branch to set it on the tree
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	327	# we need to alter the branch to let this pass.
2230.3.27 by Aaron Bentley Skip arbitrary revision-history test for Branch6	328	try:
	329	wt.branch.set_revision_history(['A', 'B'])
	330	except errors.NoSuchRevision, e:
	331	self.assertEqual('B', e.revision)
	332	raise TestSkipped("Branch format does not permit arbitrary"
	333	" history")
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	334	wt.set_last_revision('A')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	335	self.assertEqual(['A'], wt.get_parent_ids())
2229.2.1 by Aaron Bentley Reject reserved ids in versiondfile, tree, branch and repository	336	self.assertRaises(errors.ReservedId, wt.set_last_revision, 'A:')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	337
1508.1.19 by Robert Collins Give format3 working trees their own last-revision marker.	338	def test_set_last_revision_different_to_branch(self):
	339	# working tree formats from the meta-dir format and newer support
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	340	# setting the last revision on a tree independently of that on the
	341	# branch. Its concievable that some future formats may want to
1508.1.19 by Robert Collins Give format3 working trees their own last-revision marker.	342	# couple them again (i.e. because its really a smart server and
	343	# the working tree will always match the branch). So we test
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	344	# that formats where initialising a branch does not initialise a
	345	# tree - and thus have separable entities - support skewing the
1508.1.19 by Robert Collins Give format3 working trees their own last-revision marker.	346	# two things.
	347	branch = self.make_branch('tree')
	348	try:
	349	# if there is a working tree now, this is not supported.
	350	branch.bzrdir.open_workingtree()
	351	return
	352	except errors.NoWorkingTree:
	353	pass
	354	wt = branch.bzrdir.create_workingtree()
	355	wt.commit('A', allow_pointless=True, rev_id='A')
	356	wt.set_last_revision(None)
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	357	self.assertEqual([], wt.get_parent_ids())
1508.1.19 by Robert Collins Give format3 working trees their own last-revision marker.	358	self.assertEqual('A', wt.branch.last_revision())
	359	# and now we can set it back to 'A'
	360	wt.set_last_revision('A')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	361	self.assertEqual(['A'], wt.get_parent_ids())
1508.1.19 by Robert Collins Give format3 working trees their own last-revision marker.	362	self.assertEqual('A', wt.branch.last_revision())
	363
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	364	def test_clone_and_commit_preserves_last_revision(self):
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	365	"""Doing a commit into a clone tree does not affect the source."""
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	366	wt = self.make_branch_and_tree('source')
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	367	cloned_dir = wt.bzrdir.clone('target')
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	368	wt.commit('A', allow_pointless=True, rev_id='A')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	369	self.assertNotEqual(cloned_dir.open_workingtree().get_parent_ids(),
	370	wt.get_parent_ids())
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	371
	372	def test_clone_preserves_content(self):
	373	wt = self.make_branch_and_tree('source')
2255.2.51 by John Arbash Meinel simple rewrap for 79 char lines	374	self.build_tree(['added', 'deleted', 'notadded'],
	375	transport=wt.bzrdir.transport.clone('..'))
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	376	wt.add('deleted', 'deleted')
	377	wt.commit('add deleted')
	378	wt.remove('deleted')
	379	wt.add('added', 'added')
	380	cloned_dir = wt.bzrdir.clone('target')
	381	cloned = cloned_dir.open_workingtree()
	382	cloned_transport = cloned.bzrdir.transport.clone('..')
	383	self.assertFalse(cloned_transport.has('deleted'))
	384	self.assertTrue(cloned_transport.has('added'))
	385	self.assertFalse(cloned_transport.has('notadded'))
	386	self.assertEqual('added', cloned.path2id('added'))
	387	self.assertEqual(None, cloned.path2id('deleted'))
	388	self.assertEqual(None, cloned.path2id('notadded'))
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	389
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	390	def test_basis_tree_returns_last_revision(self):
	391	wt = self.make_branch_and_tree('.')
	392	self.build_tree(['foo'])
	393	wt.add('foo', 'foo-id')
	394	wt.commit('A', rev_id='A')
	395	wt.rename_one('foo', 'bar')
	396	wt.commit('B', rev_id='B')
1908.6.3 by Robert Collins Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.	397	wt.set_parent_ids(['B'])
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	398	tree = wt.basis_tree()
2255.2.30 by Robert Collins Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.	399	tree.lock_read()
5784.1.1 by Martin Pool Stop using failIf, failUnless, etc	400	self.assertTrue(tree.has_filename('bar'))
2255.2.30 by Robert Collins Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.	401	tree.unlock()
1908.6.3 by Robert Collins Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.	402	wt.set_parent_ids(['A'])
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	403	tree = wt.basis_tree()
2255.2.30 by Robert Collins Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.	404	tree.lock_read()
5784.1.1 by Martin Pool Stop using failIf, failUnless, etc	405	self.assertTrue(tree.has_filename('foo'))
2255.2.30 by Robert Collins Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.	406	tree.unlock()
1534.4.46 by Robert Collins Nearly complete .bzr/checkout splitout.	407
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	408	def test_clone_tree_revision(self):
	409	# make a tree with a last-revision,
	410	# and clone it with a different last-revision, this should switch
	411	# do it.
	412	#
	413	# also test that the content is merged
	414	# and conflicts recorded.
	415	# This should merge between the trees - local edits should be preserved
	416	# but other changes occured.
	417	# we test this by having one file that does
	418	# not change between two revisions, and another that does -
	419	# if the changed one is not changed, fail,
	420	# if the one that did not change has lost a local change, fail.
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	421	#
1534.4.50 by Robert Collins Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.	422	raise TestSkipped('revision limiting is not implemented yet.')
1508.1.21 by Robert Collins Implement -r limit for checkout command.	423
	424	def test_initialize_with_revision_id(self):
	425	# a bzrdir can construct a working tree for itself @ a specific revision.
	426	source = self.make_branch_and_tree('source')
	427	source.commit('a', rev_id='a', allow_pointless=True)
	428	source.commit('b', rev_id='b', allow_pointless=True)
	429	self.build_tree(['new/'])
	430	made_control = self.bzrdir_format.initialize('new')
	431	source.branch.repository.clone(made_control)
	432	source.branch.clone(made_control)
5051.3.10 by Jelmer Vernooij Pass colocated branch name around in more places.	433	made_tree = self.workingtree_format.initialize(made_control,
	434	revision_id='a')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	435	self.assertEqual(['a'], made_tree.get_parent_ids())
1508.1.23 by Robert Collins Test that the working tree last revision is indeed set during commit.	436
1508.1.24 by Robert Collins Add update command for use with checkouts.	437	def test_update_sets_last_revision(self):
	438	# working tree formats from the meta-dir format and newer support
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	439	# setting the last revision on a tree independently of that on the
	440	# branch. Its concievable that some future formats may want to
1508.1.24 by Robert Collins Add update command for use with checkouts.	441	# couple them again (i.e. because its really a smart server and
	442	# the working tree will always match the branch). So we test
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	443	# that formats where initialising a branch does not initialise a
	444	# tree - and thus have separable entities - support skewing the
1508.1.24 by Robert Collins Add update command for use with checkouts.	445	# two things.
	446	main_branch = self.make_branch('tree')
	447	try:
	448	# if there is a working tree now, this is not supported.
	449	main_branch.bzrdir.open_workingtree()
	450	return
	451	except errors.NoWorkingTree:
	452	pass
	453	wt = main_branch.bzrdir.create_workingtree()
	454	# create an out of date working tree by making a checkout in this
	455	# current format
	456	self.build_tree(['checkout/', 'tree/file'])
	457	checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout')
5051.3.10 by Jelmer Vernooij Pass colocated branch name around in more places.	458	branch.BranchReferenceFormat().initialize(checkout,
	459	target_branch=main_branch)
1508.1.24 by Robert Collins Add update command for use with checkouts.	460	old_tree = self.workingtree_format.initialize(checkout)
	461	# now commit to 'tree'
	462	wt.add('file')
	463	wt.commit('A', rev_id='A')
	464	# and update old_tree
	465	self.assertEqual(0, old_tree.update())
5784.1.3 by Martin Pool Switch away from using failUnlessExists and failIfExists	466	self.assertPathExists('checkout/file')
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	467	self.assertEqual(['A'], old_tree.get_parent_ids())
1508.1.24 by Robert Collins Add update command for use with checkouts.	468
1731.1.33 by Aaron Bentley Revert no-special-root changes	469	def test_update_sets_root_id(self):
1731.1.33 by Aaron Bentley Revert no-special-root changes	470	"""Ensure tree root is set properly by update.
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	471
1731.1.33 by Aaron Bentley Revert no-special-root changes	472	Since empty trees don't have root_ids, but workingtrees do,
	473	an update of a checkout of revision 0 to a new revision, should set
	474	the root id.
	475	"""
	476	wt = self.make_branch_and_tree('tree')
	477	main_branch = wt.branch
	478	# create an out of date working tree by making a checkout in this
	479	# current format
	480	self.build_tree(['checkout/', 'tree/file'])
1731.1.43 by Aaron Bentley Merge more checkout changes	481	checkout = main_branch.create_checkout('checkout')
1731.1.33 by Aaron Bentley Revert no-special-root changes	482	# now commit to 'tree'
	483	wt.add('file')
	484	wt.commit('A', rev_id='A')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	485	# and update checkout
1731.1.33 by Aaron Bentley Revert no-special-root changes	486	self.assertEqual(0, checkout.update())
5784.1.3 by Martin Pool Switch away from using failUnlessExists and failIfExists	487	self.assertPathExists('checkout/file')
1731.1.33 by Aaron Bentley Revert no-special-root changes	488	self.assertEqual(wt.get_root_id(), checkout.get_root_id())
	489	self.assertNotEqual(None, wt.get_root_id())
	490
4634.123.1 by John Arbash Meinel Add a failing test for 'update'. When this branch lands, update should work.	491	def test_update_sets_updated_root_id(self):
	492	wt = self.make_branch_and_tree('tree')
	493	wt.set_root_id('first_root_id')
	494	self.assertEqual('first_root_id', wt.get_root_id())
	495	self.build_tree(['tree/file'])
	496	wt.add(['file'])
	497	wt.commit('first')
	498	co = wt.branch.create_checkout('checkout')
	499	wt.set_root_id('second_root_id')
	500	wt.commit('second')
	501	self.assertEqual('second_root_id', wt.get_root_id())
	502	self.assertEqual(0, co.update())
	503	self.assertEqual('second_root_id', co.get_root_id())
	504
1508.1.24 by Robert Collins Add update command for use with checkouts.	505	def test_update_returns_conflict_count(self):
	506	# working tree formats from the meta-dir format and newer support
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	507	# setting the last revision on a tree independently of that on the
	508	# branch. Its concievable that some future formats may want to
1508.1.24 by Robert Collins Add update command for use with checkouts.	509	# couple them again (i.e. because its really a smart server and
	510	# the working tree will always match the branch). So we test
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	511	# that formats where initialising a branch does not initialise a
	512	# tree - and thus have separable entities - support skewing the
1508.1.24 by Robert Collins Add update command for use with checkouts.	513	# two things.
	514	main_branch = self.make_branch('tree')
	515	try:
	516	# if there is a working tree now, this is not supported.
	517	main_branch.bzrdir.open_workingtree()
	518	return
	519	except errors.NoWorkingTree:
	520	pass
	521	wt = main_branch.bzrdir.create_workingtree()
	522	# create an out of date working tree by making a checkout in this
	523	# current format
	524	self.build_tree(['checkout/', 'tree/file'])
	525	checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout')
5051.3.10 by Jelmer Vernooij Pass colocated branch name around in more places.	526	branch.BranchReferenceFormat().initialize(checkout,
	527	target_branch=main_branch)
1508.1.24 by Robert Collins Add update command for use with checkouts.	528	old_tree = self.workingtree_format.initialize(checkout)
	529	# now commit to 'tree'
	530	wt.add('file')
	531	wt.commit('A', rev_id='A')
	532	# and add a file file to the checkout
	533	self.build_tree(['checkout/file'])
	534	old_tree.add('file')
	535	# and update old_tree
	536	self.assertEqual(1, old_tree.update())
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	537	self.assertEqual(['A'], old_tree.get_parent_ids())
1508.1.24 by Robert Collins Add update command for use with checkouts.	538
1534.7.199 by Aaron Bentley Moved merge/revert tests into test_workingtree.py	539	def test_merge_revert(self):
	540	from bzrlib.merge import merge_inner
	541	this = self.make_branch_and_tree('b1')
4789.12.1 by John Arbash Meinel Fix per_workingtree.test_workingtree.test_merge_revert	542	self.build_tree_contents([('b1/a', 'a test\n'), ('b1/b', 'b test\n')])
	543	this.add(['a', 'b'])
1534.7.199 by Aaron Bentley Moved merge/revert tests into test_workingtree.py	544	this.commit(message='')
	545	base = this.bzrdir.clone('b2').open_workingtree()
4789.12.1 by John Arbash Meinel Fix per_workingtree.test_workingtree.test_merge_revert	546	self.build_tree_contents([('b2/a', 'b test\n')])
1534.7.199 by Aaron Bentley Moved merge/revert tests into test_workingtree.py	547	other = this.bzrdir.clone('b3').open_workingtree()
4789.12.1 by John Arbash Meinel Fix per_workingtree.test_workingtree.test_merge_revert	548	self.build_tree_contents([('b3/a', 'c test\n'), ('b3/c', 'c test\n')])
1534.7.199 by Aaron Bentley Moved merge/revert tests into test_workingtree.py	549	other.add('c')
	550
4789.12.1 by John Arbash Meinel Fix per_workingtree.test_workingtree.test_merge_revert	551	self.build_tree_contents([('b1/b', 'q test\n'), ('b1/d', 'd test\n')])
	552	# Note: If we don't lock this before calling merge_inner, then we get a
	553	# lock-contention failure. This probably indicates something
	554	# weird going on inside merge_inner. Probably something about
	555	# calling bt = this_tree.basis_tree() in one lock, and then
	556	# locking both this_tree and bt separately, causing a dirstate
	557	# locking race.
	558	this.lock_write()
	559	self.addCleanup(this.unlock)
1534.7.199 by Aaron Bentley Moved merge/revert tests into test_workingtree.py	560	merge_inner(this.branch, other, base, this_tree=this)
4789.12.1 by John Arbash Meinel Fix per_workingtree.test_workingtree.test_merge_revert	561	a = open('b1/a', 'rb')
	562	try:
	563	self.assertNotEqual(a.read(), 'a test\n')
	564	finally:
	565	a.close()
2748.3.2 by Aaron Bentley Fix revert, remove-tree, and various tests to use None for 'no files specified'	566	this.revert()
4789.12.1 by John Arbash Meinel Fix per_workingtree.test_workingtree.test_merge_revert	567	self.assertFileEqual('a test\n', 'b1/a')
5784.1.3 by Martin Pool Switch away from using failUnlessExists and failIfExists	568	self.assertPathExists('b1/b.~1~')
	569	self.assertPathDoesNotExist('b1/c')
	570	self.assertPathDoesNotExist('b1/a.~1~')
	571	self.assertPathExists('b1/d')
1534.7.200 by Aaron Bentley Merge from mainline	572
1587.1.10 by Robert Collins update updates working tree and branch together.	573	def test_update_updates_bound_branch_no_local_commits(self):
	574	# doing an update in a tree updates the branch its bound to too.
	575	master_tree = self.make_branch_and_tree('master')
	576	tree = self.make_branch_and_tree('tree')
	577	try:
	578	tree.branch.bind(master_tree.branch)
	579	except errors.UpgradeRequired:
	580	# legacy branches cannot bind
	581	return
	582	master_tree.commit('foo', rev_id='foo', allow_pointless=True)
	583	tree.update()
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	584	self.assertEqual(['foo'], tree.get_parent_ids())
1587.1.10 by Robert Collins update updates working tree and branch together.	585	self.assertEqual('foo', tree.branch.last_revision())
1587.1.11 by Robert Collins Local commits appear to be working properly.	586
	587	def test_update_turns_local_commit_into_merge(self):
	588	# doing an update with a few local commits and no master commits
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	589	# makes pending-merges.
1587.1.13 by Robert Collins Explain why update pivots more clearly in the relevant test.	590	# this is done so that 'bzr update; bzr revert' will always produce
	591	# an exact copy of the 'logical branch' - the referenced branch for
	592	# a checkout, and the master for a bound branch.
	593	# its possible that we should instead have 'bzr update' when there
	594	# is nothing new on the master leave the current commits intact and
	595	# alter 'revert' to revert to the master always. But for now, its
	596	# good.
1587.1.11 by Robert Collins Local commits appear to be working properly.	597	master_tree = self.make_branch_and_tree('master')
1927.2.1 by Robert Collins Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.	598	master_tip = master_tree.commit('first master commit')
1587.1.11 by Robert Collins Local commits appear to be working properly.	599	tree = self.make_branch_and_tree('tree')
	600	try:
	601	tree.branch.bind(master_tree.branch)
	602	except errors.UpgradeRequired:
	603	# legacy branches cannot bind
	604	return
1927.2.1 by Robert Collins Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.	605	# sync with master
	606	tree.update()
	607	# work locally
1587.1.11 by Robert Collins Local commits appear to be working properly.	608	tree.commit('foo', rev_id='foo', allow_pointless=True, local=True)
	609	tree.commit('bar', rev_id='bar', allow_pointless=True, local=True)
1927.2.1 by Robert Collins Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.	610	# sync with master prepatory to committing
1587.1.11 by Robert Collins Local commits appear to be working properly.	611	tree.update()
1927.2.1 by Robert Collins Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.	612	# which should have pivoted the local tip into a merge
	613	self.assertEqual([master_tip, 'bar'], tree.get_parent_ids())
1908.7.6 by Robert Collins Deprecate WorkingTree.last_revision.	614	# and the local branch history should match the masters now.
	615	self.assertEqual(master_tree.branch.revision_history(),
	616	tree.branch.revision_history())
1587.1.11 by Robert Collins Local commits appear to be working properly.	617
4916.1.7 by Martin Pool Add per_workingtree test you can update to arbitrary revisions	618	def test_update_takes_revision_parameter(self):
	619	wt = self.make_branch_and_tree('wt')
	620	self.build_tree_contents([('wt/a', 'old content')])
	621	wt.add(['a'])
	622	rev1 = wt.commit('first master commit')
	623	self.build_tree_contents([('wt/a', 'new content')])
	624	rev2 = wt.commit('second master commit')
5243.1.2 by Martin Point launchpad links in comments at production server rather than edge	625	# https://bugs.launchpad.net/bzr/+bug/45719/comments/20
4916.1.7 by Martin Pool Add per_workingtree test you can update to arbitrary revisions	626	# when adding 'update -r' we should make sure all wt formats support
	627	# it
	628	conflicts = wt.update(revision=rev1)
	629	self.assertFileEqual('old content', 'wt/a')
	630	self.assertEqual([rev1], wt.get_parent_ids())
	631
2255.2.156 by Martin Pool Merge WorkingTree implementation back from trunk	632	def test_merge_modified_detects_corruption(self):
	633	# FIXME: This doesn't really test that it works; also this is not
	634	# implementation-independent. mbp 20070226
1558.3.3 by Aaron Bentley Fix error handling for merge_modified	635	tree = self.make_branch_and_tree('master')
3407.2.7 by Martin Pool Deprecate LockableFiles.put_utf8 and put_bytes.	636	tree._transport.put_bytes('merge-hashes', 'asdfasdf')
1558.3.3 by Aaron Bentley Fix error handling for merge_modified	637	self.assertRaises(errors.MergeModifiedFormatError, tree.merge_modified)
1534.10.8 by Aaron Bentley Implemented conflict_lines in terms of old system on WorkingTree	638
2298.1.1 by Martin Pool Add test for merge_modified	639	def test_merge_modified(self):
	640	# merge_modified stores a map from file id to hash
	641	tree = self.make_branch_and_tree('tree')
	642	d = {'file-id': osutils.sha_string('hello')}
	643	self.build_tree_contents([('tree/somefile', 'hello')])
	644	tree.lock_write()
	645	try:
	646	tree.add(['somefile'], ['file-id'])
	647	tree.set_merge_modified(d)
	648	mm = tree.merge_modified()
	649	self.assertEquals(mm, d)
	650	finally:
	651	tree.unlock()
	652	mm = tree.merge_modified()
	653	self.assertEquals(mm, d)
	654
1534.10.22 by Aaron Bentley Got ConflictList implemented	655	def test_conflicts(self):
1534.10.8 by Aaron Bentley Implemented conflict_lines in terms of old system on WorkingTree	656	from bzrlib.tests.test_conflicts import example_conflicts
	657	tree = self.make_branch_and_tree('master')
	658	try:
1534.10.22 by Aaron Bentley Got ConflictList implemented	659	tree.set_conflicts(example_conflicts)
1534.10.8 by Aaron Bentley Implemented conflict_lines in terms of old system on WorkingTree	660	except UnsupportedOperation:
1534.10.22 by Aaron Bentley Got ConflictList implemented	661	raise TestSkipped('set_conflicts not supported')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	662
1534.10.8 by Aaron Bentley Implemented conflict_lines in terms of old system on WorkingTree	663	tree2 = WorkingTree.open('master')
1534.10.22 by Aaron Bentley Got ConflictList implemented	664	self.assertEqual(tree2.conflicts(), example_conflicts)
3407.2.7 by Martin Pool Deprecate LockableFiles.put_utf8 and put_bytes.	665	tree2._transport.put_bytes('conflicts', '')
	666	self.assertRaises(errors.ConflictFormatError,
1955.3.14 by John Arbash Meinel Correctly fix the workingtree put() test fixes	667	tree2.conflicts)
3407.2.7 by Martin Pool Deprecate LockableFiles.put_utf8 and put_bytes.	668	tree2._transport.put_bytes('conflicts', 'a')
	669	self.assertRaises(errors.ConflictFormatError,
1955.3.14 by John Arbash Meinel Correctly fix the workingtree put() test fixes	670	tree2.conflicts)
1534.10.12 by Aaron Bentley Merge produces new conflicts	671
1534.10.12 by Aaron Bentley Merge produces new conflicts	672	def make_merge_conflicts(self):
2255.2.32 by Robert Collins Make test_clear_merge_conflicts pass for dirstate. This involved working	673	from bzrlib.merge import merge_inner
1534.10.12 by Aaron Bentley Merge produces new conflicts	674	tree = self.make_branch_and_tree('mine')
1534.10.12 by Aaron Bentley Merge produces new conflicts	675	file('mine/bloo', 'wb').write('one')
1534.10.14 by Aaron Bentley Made revert clear conflicts	676	file('mine/blo', 'wb').write('on')
2255.2.32 by Robert Collins Make test_clear_merge_conflicts pass for dirstate. This involved working	677	tree.add(['bloo', 'blo'])
1534.10.12 by Aaron Bentley Merge produces new conflicts	678	tree.commit("blah", allow_pointless=False)
2255.5.3 by John Arbash Meinel XXX Workaround the DirStateRevisionTree bug until we get a proper fix, tests pass again	679	base = tree.branch.repository.revision_tree(tree.last_revision())
1773.4.1 by Martin Pool Add pyflakes makefile target; fix many warnings	680	bzrdir.BzrDir.open("mine").sprout("other")
1534.10.12 by Aaron Bentley Merge produces new conflicts	681	file('other/bloo', 'wb').write('two')
	682	othertree = WorkingTree.open('other')
	683	othertree.commit('blah', allow_pointless=False)
	684	file('mine/bloo', 'wb').write('three')
	685	tree.commit("blah", allow_pointless=False)
	686	merge_inner(tree.branch, othertree, base, this_tree=tree)
	687	return tree
	688
	689	def test_merge_conflicts(self):
	690	tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley Got ConflictList implemented	691	self.assertEqual(len(tree.conflicts()), 1)
1534.10.12 by Aaron Bentley Merge produces new conflicts	692
	693	def test_clear_merge_conflicts(self):
	694	tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley Got ConflictList implemented	695	self.assertEqual(len(tree.conflicts()), 1)
1534.10.12 by Aaron Bentley Merge produces new conflicts	696	try:
1534.10.22 by Aaron Bentley Got ConflictList implemented	697	tree.set_conflicts(ConflictList())
1534.10.12 by Aaron Bentley Merge produces new conflicts	698	except UnsupportedOperation:
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	699	raise TestSkipped('unsupported operation')
1534.10.22 by Aaron Bentley Got ConflictList implemented	700	self.assertEqual(tree.conflicts(), ConflictList())
1534.10.14 by Aaron Bentley Made revert clear conflicts	701
1551.7.11 by Aaron Bentley Add WorkingTree.add_conflicts	702	def test_add_conflicts(self):
	703	tree = self.make_branch_and_tree('tree')
	704	try:
	705	tree.add_conflicts([TextConflict('path_a')])
	706	except UnsupportedOperation:
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	707	raise TestSkipped('unsupported operation')
1551.7.13 by Aaron Bentley Switched from actual, expected to expected, actual, for John.	708	self.assertEqual(ConflictList([TextConflict('path_a')]),
	709	tree.conflicts())
1551.7.11 by Aaron Bentley Add WorkingTree.add_conflicts	710	tree.add_conflicts([TextConflict('path_a')])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	711	self.assertEqual(ConflictList([TextConflict('path_a')]),
1551.7.13 by Aaron Bentley Switched from actual, expected to expected, actual, for John.	712	tree.conflicts())
1551.7.11 by Aaron Bentley Add WorkingTree.add_conflicts	713	tree.add_conflicts([ContentsConflict('path_a')])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	714	self.assertEqual(ConflictList([ContentsConflict('path_a'),
1551.7.13 by Aaron Bentley Switched from actual, expected to expected, actual, for John.	715	TextConflict('path_a')]),
	716	tree.conflicts())
1551.7.11 by Aaron Bentley Add WorkingTree.add_conflicts	717	tree.add_conflicts([TextConflict('path_b')])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	718	self.assertEqual(ConflictList([ContentsConflict('path_a'),
1551.7.11 by Aaron Bentley Add WorkingTree.add_conflicts	719	TextConflict('path_a'),
1551.7.13 by Aaron Bentley Switched from actual, expected to expected, actual, for John.	720	TextConflict('path_b')]),
	721	tree.conflicts())
1551.7.11 by Aaron Bentley Add WorkingTree.add_conflicts	722
1534.10.14 by Aaron Bentley Made revert clear conflicts	723	def test_revert_clear_conflicts(self):
1534.10.14 by Aaron Bentley Made revert clear conflicts	724	tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley Got ConflictList implemented	725	self.assertEqual(len(tree.conflicts()), 1)
1534.10.14 by Aaron Bentley Made revert clear conflicts	726	tree.revert(["blo"])
1534.10.22 by Aaron Bentley Got ConflictList implemented	727	self.assertEqual(len(tree.conflicts()), 1)
1534.10.14 by Aaron Bentley Made revert clear conflicts	728	tree.revert(["bloo"])
1534.10.22 by Aaron Bentley Got ConflictList implemented	729	self.assertEqual(len(tree.conflicts()), 0)
1534.10.14 by Aaron Bentley Made revert clear conflicts	730
	731	def test_revert_clear_conflicts2(self):
	732	tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley Got ConflictList implemented	733	self.assertEqual(len(tree.conflicts()), 1)
2748.3.2 by Aaron Bentley Fix revert, remove-tree, and various tests to use None for 'no files specified'	734	tree.revert()
1534.10.22 by Aaron Bentley Got ConflictList implemented	735	self.assertEqual(len(tree.conflicts()), 0)
1624.3.22 by Olaf Conradi Merge bzr.dev	736
1624.3.19 by Olaf Conradi New call get_format_description to give a user-friendly description of a	737	def test_format_description(self):
	738	tree = self.make_branch_and_tree('tree')
	739	text = tree._format.get_format_description()
5784.1.1 by Martin Pool Stop using failIf, failUnless, etc	740	self.assertTrue(len(text))
1681.1.1 by Robert Collins Make WorkingTree.branch a read only property. (Robert Collins)	741
	742	def test_branch_attribute_is_not_settable(self):
	743	# the branch attribute is an aspect of the working tree, not a
	744	# configurable attribute
	745	tree = self.make_branch_and_tree('tree')
	746	def set_branch():
	747	tree.branch = tree.branch
	748	self.assertRaises(AttributeError, set_branch)
	749
1713.3.1 by Robert Collins Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule.	750	def test_list_files_versioned_before_ignored(self):
	751	"""A versioned file matching an ignore rule should not be ignored."""
	752	tree = self.make_branch_and_tree('.')
	753	self.build_tree(['foo.pyc'])
	754	# ensure that foo.pyc is ignored
	755	self.build_tree_contents([('.bzrignore', 'foo.pyc')])
	756	tree.add('foo.pyc', 'anid')
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	757	tree.lock_read()
1713.3.1 by Robert Collins Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule.	758	files = sorted(list(tree.list_files()))
2255.2.52 by Robert Collins Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.	759	tree.unlock()
1713.3.1 by Robert Collins Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule.	760	self.assertEqual((u'.bzrignore', '?', 'file', None), files[0][:-1])
	761	self.assertEqual((u'foo.pyc', 'V', 'file', 'anid'), files[1][:-1])
	762	self.assertEqual(2, len(files))
1711.8.2 by John Arbash Meinel Test that WorkingTree locks Branch before self, and unlocks self before Branch	763
1830.3.7 by John Arbash Meinel Check that WorkingTree.add does the right thing.	764	def test_non_normalized_add_accessible(self):
	765	try:
	766	self.build_tree([u'a\u030a'])
	767	except UnicodeError:
	768	raise TestSkipped('Filesystem does not support unicode filenames')
	769	tree = self.make_branch_and_tree('.')
	770	orig = osutils.normalized_filename
	771	osutils.normalized_filename = osutils._accessible_normalized_filename
	772	try:
	773	tree.add([u'a\u030a'])
2255.2.58 by Robert Collins Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used.	774	tree.lock_read()
1907.1.3 by Aaron Bentley Fixed unicode test cases	775	self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	776	[(path, ie.kind) for path,ie in
5807.1.2 by Jelmer Vernooij Skip some inventory-specific tests for non-inventory working trees.	777	tree.iter_entries_by_dir()])
2255.2.58 by Robert Collins Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used.	778	tree.unlock()
1830.3.7 by John Arbash Meinel Check that WorkingTree.add does the right thing.	779	finally:
	780	osutils.normalized_filename = orig
	781
	782	def test_non_normalized_add_inaccessible(self):
	783	try:
	784	self.build_tree([u'a\u030a'])
	785	except UnicodeError:
	786	raise TestSkipped('Filesystem does not support unicode filenames')
	787	tree = self.make_branch_and_tree('.')
	788	orig = osutils.normalized_filename
	789	osutils.normalized_filename = osutils._inaccessible_normalized_filename
	790	try:
	791	self.assertRaises(errors.InvalidNormalization,
	792	tree.add, [u'a\u030a'])
	793	finally:
	794	osutils.normalized_filename = orig
2123.3.9 by Steffen Eichenberg added tests for deprecated API workingtree.move	795
1852.15.14 by Robert Collins test that WorkingTree._write_inventory works as expected by the current code.	796	def test__write_inventory(self):
	797	# The private interface _write_inventory is currently used by transform.
	798	tree = self.make_branch_and_tree('.')
5807.1.2 by Jelmer Vernooij Skip some inventory-specific tests for non-inventory working trees.	799	if not isinstance(tree, InventoryWorkingTree):
	800	raise TestNotApplicable("_write_inventory does not exist on "
	801	"non-inventory working trees")
1852.15.14 by Robert Collins test that WorkingTree._write_inventory works as expected by the current code.	802	# if we write write an inventory then do a walkdirs we should get back
	803	# missing entries, and actual, and unknowns as appropriate.
	804	self.build_tree(['present', 'unknown'])
2946.3.3 by John Arbash Meinel Prefer tree.get_root_id() as more explicit than tree.path2id('')	805	inventory = Inventory(tree.get_root_id())
1852.15.14 by Robert Collins test that WorkingTree._write_inventory works as expected by the current code.	806	inventory.add_path('missing', 'file', 'missing-id')
	807	inventory.add_path('present', 'file', 'present-id')
2255.2.28 by Robert Collins TestWorkingTree.test__write_inventory needs to lock the tree before calling _write_inventory for dirstate.	808	# there is no point in being able to write an inventory to an unlocked
	809	# tree object - its a low level api not a convenience api.
	810	tree.lock_write()
1852.15.14 by Robert Collins test that WorkingTree._write_inventory works as expected by the current code.	811	tree._write_inventory(inventory)
2255.2.28 by Robert Collins TestWorkingTree.test__write_inventory needs to lock the tree before calling _write_inventory for dirstate.	812	tree.unlock()
1852.15.14 by Robert Collins test that WorkingTree._write_inventory works as expected by the current code.	813	tree.lock_read()
	814	try:
	815	present_stat = os.lstat('present')
	816	unknown_stat = os.lstat('unknown')
	817	expected_results = [
2946.3.3 by John Arbash Meinel Prefer tree.get_root_id() as more explicit than tree.path2id('')	818	(('', tree.get_root_id()),
1852.15.14 by Robert Collins test that WorkingTree._write_inventory works as expected by the current code.	819	[('missing', 'missing', 'unknown', None, 'missing-id', 'file'),
	820	('present', 'present', 'file', present_stat, 'present-id', 'file'),
	821	('unknown', 'unknown', 'file', unknown_stat, None, None),
	822	]
	823	)]
	824	self.assertEqual(expected_results, list(tree.walkdirs()))
	825	finally:
	826	tree.unlock()
2255.7.56 by Robert Collins Document behaviour of tree.path2id("path/").	827
	828	def test_path2id(self):
2255.7.62 by Robert Collins Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.	829	# smoke test for path2id
2255.7.56 by Robert Collins Document behaviour of tree.path2id("path/").	830	tree = self.make_branch_and_tree('.')
	831	self.build_tree(['foo'])
	832	tree.add(['foo'], ['foo-id'])
	833	self.assertEqual('foo-id', tree.path2id('foo'))
	834	# the next assertion is for backwards compatability with WorkingTree3,
	835	# though its probably a bad idea, it makes things work. Perhaps
	836	# it should raise a deprecation warning?
	837	self.assertEqual('foo-id', tree.path2id('foo/'))
2255.7.62 by Robert Collins Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.	838
	839	def test_filter_unversioned_files(self):
	840	# smoke test for filter_unversioned_files
	841	tree = self.make_branch_and_tree('.')
	842	paths = ['here-and-versioned', 'here-and-not-versioned',
	843	'not-here-and-versioned', 'not-here-and-not-versioned']
	844	tree.add(['here-and-versioned', 'not-here-and-versioned'],
	845	kinds=['file', 'file'])
	846	self.build_tree(['here-and-versioned', 'here-and-not-versioned'])
	847	tree.lock_read()
	848	self.addCleanup(tree.unlock)
	849	self.assertEqual(
	850	set(['not-here-and-not-versioned', 'here-and-not-versioned']),
	851	tree.filter_unversioned_files(paths))
2255.2.200 by Martin Pool Add simple test for WorkingTree.kind	852
	853	def test_detect_real_kind(self):
	854	# working trees report the real kind of the file on disk, not the kind
	855	# they had when they were first added
	856	# create one file of every interesting type
	857	tree = self.make_branch_and_tree('.')
4100.2.2 by Aaron Bentley Remove locking decorator	858	tree.lock_write()
4100.2.2 by Aaron Bentley Remove locking decorator	859	self.addCleanup(tree.unlock)
2255.2.200 by Martin Pool Add simple test for WorkingTree.kind	860	self.build_tree(['file', 'directory/'])
	861	names = ['file', 'directory']
	862	if has_symlinks():
	863	os.symlink('target', 'symlink')
	864	names.append('symlink')
	865	tree.add(names, [n + '-id' for n in names])
	866	# now when we first look, we should see everything with the same kind
	867	# with which they were initially added
	868	for n in names:
	869	actual_kind = tree.kind(n + '-id')
	870	self.assertEqual(n, actual_kind)
	871	# move them around so the names no longer correspond to the types
	872	os.rename(names[0], 'tmp')
	873	for i in range(1, len(names)):
	874	os.rename(names[i], names[i-1])
	875	os.rename('tmp', names[-1])
2255.2.202 by Martin Pool WorkingTree_4.kind should report tree-references if they're	876	# now look and expect to see the correct types again
	877	for i in range(len(names)):
	878	actual_kind = tree.kind(names[i-1] + '-id')
	879	expected_kind = names[i]
	880	self.assertEqual(expected_kind, actual_kind)
2499.3.1 by Aaron Bentley Fix Workingtree4.get_file_sha1 on missing files	881
3146.8.4 by Aaron Bentley Eliminate direct use of inventory from transform application	882	def test_stored_kind_with_missing(self):
	883	tree = self.make_branch_and_tree('tree')
	884	tree.lock_write()
	885	self.addCleanup(tree.unlock)
	886	self.build_tree(['tree/a', 'tree/b/'])
	887	tree.add(['a', 'b'], ['a-id', 'b-id'])
	888	os.unlink('tree/a')
	889	os.rmdir('tree/b')
	890	self.assertEqual('file', tree.stored_kind('a-id'))
	891	self.assertEqual('directory', tree.stored_kind('b-id'))
	892
2499.3.1 by Aaron Bentley Fix Workingtree4.get_file_sha1 on missing files	893	def test_missing_file_sha1(self):
	894	"""If a file is missing, its sha1 should be reported as None."""
	895	tree = self.make_branch_and_tree('.')
	896	tree.lock_write()
	897	self.addCleanup(tree.unlock)
	898	self.build_tree(['file'])
	899	tree.add('file', 'file-id')
	900	tree.commit('file added')
	901	os.unlink('file')
	902	self.assertIs(None, tree.get_file_sha1('file-id'))
1551.15.56 by Aaron Bentley Raise NoSuchId when get_file_sha1 is invoked with a baed file id	903
	904	def test_no_file_sha1(self):
	905	"""If a file is not present, get_file_sha1 should raise NoSuchId"""
	906	tree = self.make_branch_and_tree('.')
	907	tree.lock_write()
	908	self.addCleanup(tree.unlock)
	909	self.assertRaises(errors.NoSuchId, tree.get_file_sha1, 'file-id')
	910	self.build_tree(['file'])
	911	tree.add('file', 'file-id')
	912	tree.commit('foo')
	913	tree.remove('file')
	914	self.assertRaises(errors.NoSuchId, tree.get_file_sha1, 'file-id')
3034.4.5 by Aaron Bentley Add workingtree test for case_insensitive var	915
	916	def test_case_sensitive(self):
	917	"""If filesystem is case-sensitive, tree should report this.
	918
	919	We check case-sensitivity by creating a file with a lowercase name,
	920	then testing whether it exists with an uppercase name.
	921	"""
3034.4.9 by Alexander Belchenko skip test_workingtree.TestWorkingTree.test_case_sensitive for WT2	922	self.build_tree(['filename'])
3034.4.5 by Aaron Bentley Add workingtree test for case_insensitive var	923	if os.path.exists('FILENAME'):
	924	case_sensitive = False
	925	else:
	926	case_sensitive = True
	927	tree = self.make_branch_and_tree('test')
	928	self.assertEqual(case_sensitive, tree.case_sensitive)
5632.1.1 by John Arbash Meinel Make case_sensitive_filename an attribute of the format.	929	# now we cheat, and make a file that matches the case-sensitive name
	930	t = tree.bzrdir.get_workingtree_transport(None)
	931	try:
	932	content = tree._format.get_format_string()
	933	except NotImplementedError:
	934	# All-in-one formats didn't have a separate format string.
	935	content = tree.bzrdir._format.get_format_string()
	936	t.put_bytes(tree._format.case_sensitive_filename, content)
	937	tree = tree.bzrdir.open_workingtree()
	938	self.assertFalse(tree.case_sensitive)
3146.8.2 by Aaron Bentley Introduce iter_all_file_ids, to avoid hitting Inventory for this case	939
3146.8.16 by Aaron Bentley Updates from review	940	def test_all_file_ids_with_missing(self):
3146.8.2 by Aaron Bentley Introduce iter_all_file_ids, to avoid hitting Inventory for this case	941	tree = self.make_branch_and_tree('tree')
	942	tree.lock_write()
	943	self.addCleanup(tree.unlock)
	944	self.build_tree(['tree/a', 'tree/b'])
	945	tree.add(['a', 'b'], ['a-id', 'b-id'])
	946	os.unlink('tree/a')
	947	self.assertEqual(set(['a-id', 'b-id', tree.get_root_id()]),
3146.8.16 by Aaron Bentley Updates from review	948	tree.all_file_ids())
3146.8.19 by Aaron Bentley Merge with bzr.dev	949
3136.1.10 by Aaron Bentley Clean error if filesystem does not support hard-links	950	def test_sprout_hardlink(self):
3619.6.9 by Mark Hammond Move check for os.link to the start of the test	951	real_os_link = getattr(os, 'link', None)
	952	if real_os_link is None:
	953	raise TestNotApplicable("This platform doesn't provide os.link")
3136.1.10 by Aaron Bentley Clean error if filesystem does not support hard-links	954	source = self.make_branch_and_tree('source')
	955	self.build_tree(['source/file'])
	956	source.add('file')
	957	source.commit('added file')
	958	def fake_link(source, target):
	959	raise OSError(errno.EPERM, 'Operation not permitted')
	960	os.link = fake_link
	961	try:
	962	# Hard-link support is optional, so supplying hardlink=True may
	963	# or may not raise an exception. But if it does, it must be
	964	# HardLinkNotSupported
	965	try:
	966	source.bzrdir.sprout('target', accelerator_tree=source,
	967	hardlink=True)
	968	except errors.HardLinkNotSupported:
	969	pass
	970	finally:
	971	os.link = real_os_link
3287.20.3 by John Arbash Meinel Aaron recommended to make this a WT_impl test.	972
	973
4985.3.18 by Vincent Ladeuil Start rewriting the test.	974	class TestWorkingTreeUpdate(TestCaseWithWorkingTree):
	975
	976	def make_diverged_master_branch(self):
	977	"""
	978	B: wt.branch.last_revision()
	979	M: wt.branch.get_master_branch().last_revision()
	980	W: wt.last_revision()
	981
	982
	983	1
	984	\|\
	985	B-2 3
	986	\| \|
	987	4 5-M
	988	\|
	989	W
	990	"""
	991	builder = branchbuilder.BranchBuilder(
	992	self.get_transport(),
	993	format=self.workingtree_format._matchingbzrdir)
	994	builder.start_series()
	995	# mainline
	996	builder.build_snapshot(
	997	'1', None,
	998	[('add', ('', 'root-id', 'directory', '')),
	999	('add', ('file1', 'file1-id', 'file', 'file1 content\n'))])
	1000	# branch
	1001	builder.build_snapshot('2', ['1'], [])
	1002	builder.build_snapshot(
	1003	'4', ['2'],
	1004	[('add', ('file4', 'file4-id', 'file', 'file4 content\n'))])
	1005	# master
	1006	builder.build_snapshot('3', ['1'], [])
	1007	builder.build_snapshot(
	1008	'5', ['3'],
	1009	[('add', ('file5', 'file5-id', 'file', 'file5 content\n'))])
	1010	builder.finish_series()
	1011	return builder, builder._branch.last_revision()
	1012
4985.3.21 by Vincent Ladeuil Final cleanup.	1013	def make_checkout_and_master(self, builder, wt_path, master_path, wt_revid,
	1014	master_revid=None, branch_revid=None):
	1015	"""Build a lightweight checkout and its master branch."""
	1016	if master_revid is None:
	1017	master_revid = wt_revid
	1018	if branch_revid is None:
	1019	branch_revid = master_revid
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1020	final_branch = builder.get_branch()
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1021	# The master branch
4985.3.21 by Vincent Ladeuil Final cleanup.	1022	master = final_branch.bzrdir.sprout(master_path,
	1023	master_revid).open_branch()
	1024	# The checkout
	1025	wt = self.make_branch_and_tree(wt_path)
	1026	wt.pull(final_branch, stop_revision=wt_revid)
	1027	wt.branch.pull(final_branch, stop_revision=branch_revid, overwrite=True)
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1028	try:
4985.3.21 by Vincent Ladeuil Final cleanup.	1029	wt.branch.bind(master)
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1030	except errors.UpgradeRequired:
4985.3.21 by Vincent Ladeuil Final cleanup.	1031	raise TestNotApplicable(
	1032	"Can't bind %s" % wt.branch._format.__class__)
	1033	return wt, master
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1034
	1035	def test_update_remove_commit(self):
	1036	"""Update should remove revisions when the branch has removed
	1037	some commits.
	1038
	1039	We want to revert 4, so that strating with the
	1040	make_diverged_master_branch() graph the final result should be
	1041	equivalent to:
	1042
	1043	1
	1044	\|\
	1045	3 2
	1046	\| \|\
	1047	MB-5 \| 4
	1048	\|/
	1049	W
	1050
	1051	And the changes in 4 have been removed from the WT.
	1052	"""
	1053	builder, tip = self.make_diverged_master_branch()
4985.3.21 by Vincent Ladeuil Final cleanup.	1054	wt, master = self.make_checkout_and_master(
	1055	builder, 'checkout', 'master', '4',
	1056	master_revid=tip, branch_revid='2')
4985.3.19 by Vincent Ladeuil Make the test more precise.	1057	# First update the branch
4985.3.19 by Vincent Ladeuil Make the test more precise.	1058	old_tip = wt.branch.update()
4985.3.21 by Vincent Ladeuil Final cleanup.	1059	self.assertEqual('2', old_tip)
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1060	# No conflicts should occur
4985.3.21 by Vincent Ladeuil Final cleanup.	1061	self.assertEqual(0, wt.update(old_tip=old_tip))
4985.3.19 by Vincent Ladeuil Make the test more precise.	1062	# We are in sync with the master
4985.3.19 by Vincent Ladeuil Make the test more precise.	1063	self.assertEqual(tip, wt.branch.last_revision())
4985.3.20 by Vincent Ladeuil Remove the blackbox test and fix typo.	1064	# We have the right parents ready to be committed
4985.3.19 by Vincent Ladeuil Make the test more precise.	1065	self.assertEqual(['5', '2'], wt.get_parent_ids())
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1066
4985.3.21 by Vincent Ladeuil Final cleanup.	1067	def test_update_revision(self):
	1068	builder, tip = self.make_diverged_master_branch()
	1069	wt, master = self.make_checkout_and_master(
	1070	builder, 'checkout', 'master', '4',
	1071	master_revid=tip, branch_revid='2')
	1072	self.assertEqual(0, wt.update(revision='1'))
	1073	self.assertEqual('1', wt.last_revision())
	1074	self.assertEqual(tip, wt.branch.last_revision())
5784.1.3 by Martin Pool Switch away from using failUnlessExists and failIfExists	1075	self.assertPathExists('checkout/file1')
	1076	self.assertPathDoesNotExist('checkout/file4')
	1077	self.assertPathDoesNotExist('checkout/file5')
4985.3.21 by Vincent Ladeuil Final cleanup.	1078
4985.3.18 by Vincent Ladeuil Start rewriting the test.	1079
3287.20.3 by John Arbash Meinel Aaron recommended to make this a WT_impl test.	1080	class TestIllegalPaths(TestCaseWithWorkingTree):
	1081
	1082	def test_bad_fs_path(self):
3638.3.14 by Vincent Ladeuil Make test_bad_fs_path not applicable on OSX.	1083	if osutils.normalizes_filenames():
	1084	# You can't create an illegal filename on OSX.
	1085	raise tests.TestNotApplicable('OSX normalizes filenames')
3287.20.3 by John Arbash Meinel Aaron recommended to make this a WT_impl test.	1086	self.requireFeature(tests.UTF8Filesystem)
	1087	# We require a UTF8 filesystem, because otherwise we would need to get
	1088	# tricky to figure out how to create an illegal filename.
	1089	# \xb5 is an illegal path because it should be \xc2\xb5 for UTF-8
	1090	tree = self.make_branch_and_tree('tree')
	1091	self.build_tree(['tree/subdir/'])
	1092	tree.add('subdir')
	1093
	1094	f = open('tree/subdir/m\xb5', 'wb')
	1095	try:
	1096	f.write('trivial\n')
	1097	finally:
	1098	f.close()
	1099
	1100	tree.lock_read()
	1101	self.addCleanup(tree.unlock)
	1102	basis = tree.basis_tree()
	1103	basis.lock_read()
	1104	self.addCleanup(basis.unlock)
	1105
	1106	e = self.assertListRaises(errors.BadFilenameEncoding,
	1107	tree.iter_changes, tree.basis_tree(),
	1108	want_unversioned=True)
	1109	# We should display the relative path
	1110	self.assertEqual('subdir/m\xb5', e.filename)
	1111	self.assertEqual(osutils._fs_enc, e.fs_encoding)
5158.6.5 by Martin Pool Implement ControlComponent on WorkingTree	1112
	1113
	1114	class TestControlComponent(TestCaseWithWorkingTree):
	1115	"""WorkingTree implementations adequately implement ControlComponent."""
	1116
	1117	def test_urls(self):
	1118	wt = self.make_branch_and_tree('wt')
	1119	self.assertIsInstance(wt.user_url, str)
	1120	self.assertEqual(wt.user_url, wt.user_transport.base)
	1121	# for all current bzrdir implementations the user dir must be
	1122	# above the control dir but we might need to relax that?
	1123	self.assertEqual(wt.control_url.find(wt.user_url), 0)
	1124	self.assertEqual(wt.control_url, wt.control_transport.base)