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

: (revision 5521)

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