/brz/remove-bazaar : contents of breezy/tests/test

: (revision 7141.7.3)

To get this branch, use:

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

6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	1	# Copyright (C) 2005-2013, 2016 Canonical Ltd
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	2	#
1185.82.7 by John Arbash Meinel Adding patches.py into bzrlib, including the tests into the test suite.	3	# This program is free software; you can redistribute it and/or modify
	4	# it under the terms of the GNU General Public License as published by
	5	# the Free Software Foundation; either version 2 of the License, or
	6	# (at your option) any later version.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	7	#
1185.82.7 by John Arbash Meinel Adding patches.py into bzrlib, including the tests into the test suite.	8	# This program is distributed in the hope that it will be useful,
	9	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	# GNU General Public License for more details.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	12	#
1185.82.7 by John Arbash Meinel Adding patches.py into bzrlib, including the tests into the test suite.	13	# You should have received a copy of the GNU General Public License
	14	# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob update FSF mailing address	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	16
6973.7.10 by Jelmer Vernooĳ More fixes.	17	import bz2
6973.7.10 by Jelmer Vernooĳ More fixes.	18	from io import BytesIO
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	19	import os
6621.25.1 by Martin Adapt to SocketServer module name change	20	try:
	21	import socketserver
	22	except ImportError:
	23	import SocketServer as socketserver
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	24	import sys
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	25
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	26	from .. import (
4241.14.13 by Vincent Ladeuil Some more cleanup.	27	diff,
1996.3.20 by John Arbash Meinel [merge] bzr.dev 2063	28	errors,
4241.14.13 by Vincent Ladeuil Some more cleanup.	29	merge,
3638.3.2 by Vincent Ladeuil Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.	30	osutils,
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	31	revision as _mod_revision,
4241.14.13 by Vincent Ladeuil Some more cleanup.	32	tests,
1910.2.64 by Aaron Bentley Changes from review	33	treebuilder,
1910.2.64 by Aaron Bentley Changes from review	34	)
6670.4.1 by Jelmer Vernooij Update imports.	35	from ..bzr import (
	36	bzrdir,
	37	inventory,
	38	)
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	39	from ..bundle import read_mergeable_from_url
	40	from ..bundle.apply_bundle import install_bundle, merge_bundle
	41	from ..bundle.bundle_data import BundleTree
	42	from ..directory_service import directories
	43	from ..bundle.serializer import write_bundle, read_bundle, v09, v4
	44	from ..bundle.serializer.v08 import BundleSerializerV08
	45	from ..bundle.serializer.v09 import BundleSerializerV09
	46	from ..bundle.serializer.v4 import BundleSerializerV4
6670.4.5 by Jelmer Vernooij Move breezy.repofmt contents to breezy.bzr.	47	from ..bzr import knitrepo
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	48	from . import (
6206.1.9 by Vincent Ladeuil Simpler fix for test_smart_server_connection_reset re-using more of the existing test server infrastructure.	49	features,
	50	test_commit,
3251.4.11 by Aaron Bentley Fix wrong local lookups	51	test_read_bundle,
6206.1.9 by Vincent Ladeuil Simpler fix for test_smart_server_connection_reset re-using more of the existing test server infrastructure.	52	test_server,
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	53	)
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	54	from ..transform import TreeTransform
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	55
1185.82.90 by Aaron Bentley Reorganized test suite	56
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	57	def get_text(vf, key):
	58	"""Get the fulltext for a given revision id that is present in the vf"""
	59	stream = vf.get_record_stream([key], 'unordered', True)
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	60	record = next(stream)
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	61	return record.get_bytes_as('fulltext')
	62
	63
	64	def get_inventory_text(repo, revision_id):
	65	"""Get the fulltext for the inventory at revision id"""
7141.7.3 by Jelmer Vernooĳ Fix some bundle tests.	66	with repo.lock_read():
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	67	return get_text(repo.inventories, (revision_id,))
	68
	69
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	70	class MockTree(object):
5837.2.5 by Jelmer Vernooij Fix two warnings.	71
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	72	def __init__(self):
6670.4.3 by Jelmer Vernooij Fix more imports.	73	from ..bzr.inventory import InventoryDirectory, ROOT_ID
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	74	object.__init__(self)
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	75	self.paths = {ROOT_ID: ""}
	76	self.ids = {"": ROOT_ID}
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	77	self.contents = {}
1731.1.4 by Aaron Bentley merge from bzr.dev	78	self.root = InventoryDirectory(ROOT_ID, '', None)
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	79
	80	inventory = property(lambda x:x)
6405.2.9 by Jelmer Vernooij More test fixes.	81	root_inventory = property(lambda x:x)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	82
6405.2.10 by Jelmer Vernooij Fix more tests.	83	def get_root_id(self):
	84	return self.root.file_id
	85
5837.2.5 by Jelmer Vernooij Fix two warnings.	86	def all_file_ids(self):
5837.2.5 by Jelmer Vernooij Fix two warnings.	87	return set(self.paths.keys())
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	88
6825.5.1 by Jelmer Vernooĳ Implement Tree.all_versioned_paths.	89	def all_versioned_paths(self):
	90	return set(self.paths.values())
	91
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	92	def is_executable(self, path):
6445.2.6 by Jelmer Vernooij Review feedback.	93	# Not all the files are executable.
6405.2.9 by Jelmer Vernooij More test fixes.	94	return False
6405.2.9 by Jelmer Vernooij More test fixes.	95
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	96	def __getitem__(self, file_id):
	97	if file_id == self.root.file_id:
	98	return self.root
	99	else:
	100	return self.make_entry(file_id, self.paths[file_id])
	101
7141.7.3 by Jelmer Vernooĳ Fix some bundle tests.	102	def get_entry_by_path(self, path):
	103	return self[self.path2id(path)]
	104
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	105	def parent_id(self, file_id):
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	106	parent_dir = os.path.dirname(self.paths[file_id])
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	107	if parent_dir == "":
	108	return None
	109	return self.ids[parent_dir]
	110
	111	def iter_entries(self):
6656.1.1 by Martin Apply 2to3 dict fixer and clean up resulting mess using view helpers	112	for path, file_id in self.ids.items():
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	113	yield path, self[file_id]
	114
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	115	def kind(self, path):
	116	if path in self.contents:
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	117	kind = 'file'
	118	else:
	119	kind = 'directory'
	120	return kind
	121
	122	def make_entry(self, file_id, path):
6809.1.1 by Martin Apply 2to3 ws_comma fixer	123	from ..bzr.inventory import (InventoryFile, InventoryDirectory,
6468.2.8 by Jelmer Vernooij Fix remaining test.	124	InventoryLink)
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	125	if not isinstance(file_id, bytes):
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	126	raise TypeError(file_id)
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	127	name = os.path.basename(path)
7141.7.3 by Jelmer Vernooĳ Fix some bundle tests.	128	kind = self.kind(path)
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	129	parent_id = self.parent_id(file_id)
7141.7.3 by Jelmer Vernooĳ Fix some bundle tests.	130	text_sha_1, text_size = self.contents_stats(path)
0.5.119 by John Arbash Meinel Recreated the factory. We really need InventoryEntry.create()	131	if kind == 'directory':
	132	ie = InventoryDirectory(file_id, name, parent_id)
	133	elif kind == 'file':
	134	ie = InventoryFile(file_id, name, parent_id)
5365.2.2 by Andrew Bennetts Fix test failures for bundles and upgrades.	135	ie.text_sha1 = text_sha_1
	136	ie.text_size = text_size
0.5.119 by John Arbash Meinel Recreated the factory. We really need InventoryEntry.create()	137	elif kind == 'symlink':
	138	ie = InventoryLink(file_id, name, parent_id)
	139	else:
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	140	raise errors.BzrError('unknown kind %r' % kind)
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	141	return ie
	142
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	143	def add_dir(self, file_id, path):
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	144	if not isinstance(file_id, bytes):
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	145	raise TypeError(file_id)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	146	self.paths[file_id] = path
	147	self.ids[path] = file_id
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	148
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	149	def add_file(self, file_id, path, contents):
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	150	if not isinstance(file_id, bytes):
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	151	raise TypeError(file_id)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	152	self.add_dir(file_id, path)
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	153	self.contents[path] = contents
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	154
	155	def path2id(self, path):
	156	return self.ids.get(path)
	157
	158	def id2path(self, file_id):
	159	return self.paths.get(file_id)
	160
	161	def has_id(self, file_id):
	162	return self.id2path(file_id) is not None
	163
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	164	def get_file(self, path):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	165	result = BytesIO()
6809.4.9 by Jelmer Vernooĳ Fix some more tests.	166	try:
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	167	result.write(self.contents[path])
6809.4.9 by Jelmer Vernooĳ Fix some more tests.	168	except KeyError:
6809.4.9 by Jelmer Vernooĳ Fix some more tests.	169	raise errors.NoSuchFile(path)
6809.1.1 by Martin Apply 2to3 ws_comma fixer	170	result.seek(0, 0)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	171	return result
	172
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	173	def get_file_revision(self, path):
	174	return self.inventory.get_entry_by_path(path).revision
5793.2.6 by Jelmer Vernooij Add MockTree.get_file_revision.	175
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	176	def get_file_size(self, path):
7141.7.2 by Jelmer Vernooĳ Fix more tests.	177	return self.inventory.get_entry_by_path(path).text_size
6468.2.8 by Jelmer Vernooij Fix remaining test.	178
6809.4.5 by Jelmer Vernooĳ Swap arguments for get_file_*.	179	def get_file_sha1(self, path, file_id=None):
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	180	return self.inventory.get_entry_by_path(path).text_sha1
6468.2.8 by Jelmer Vernooij Fix remaining test.	181
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	182	def contents_stats(self, path):
	183	if path not in self.contents:
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	184	return None, None
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	185	text_sha1 = osutils.sha_file(self.get_file(path))
	186	return text_sha1, len(self.contents[path])
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	187
	188
4241.14.13 by Vincent Ladeuil Some more cleanup.	189	class BTreeTester(tests.TestCase):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	190	"""A simple unittest tester for the BundleTree class."""
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	191
	192	def make_tree_1(self):
	193	mtree = MockTree()
6855.4.5 by Jelmer Vernooĳ Fix more bees, use with rather than try/finally for some files.	194	mtree.add_dir(b"a", "grandparent")
	195	mtree.add_dir(b"b", "grandparent/parent")
6973.7.10 by Jelmer Vernooĳ More fixes.	196	mtree.add_file(b"c", "grandparent/parent/file", b"Hello\n")
6855.4.5 by Jelmer Vernooĳ Fix more bees, use with rather than try/finally for some files.	197	mtree.add_dir(b"d", "grandparent/alt_parent")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	198	return BundleTree(mtree, ''), mtree
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	199
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	200	def test_renames(self):
	201	"""Ensure that file renames have the proper effect on children"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	202	btree = self.make_tree_1()[0]
	203	self.assertEqual(btree.old_path("grandparent"), "grandparent")
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	204	self.assertEqual(btree.old_path("grandparent/parent"),
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	205	"grandparent/parent")
	206	self.assertEqual(btree.old_path("grandparent/parent/file"),
	207	"grandparent/parent/file")
	208
6855.4.1 by Jelmer Vernooĳ Yet more bees.	209	self.assertEqual(btree.id2path(b"a"), "grandparent")
	210	self.assertEqual(btree.id2path(b"b"), "grandparent/parent")
	211	self.assertEqual(btree.id2path(b"c"), "grandparent/parent/file")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	212
6855.4.1 by Jelmer Vernooĳ Yet more bees.	213	self.assertEqual(btree.path2id("grandparent"), b"a")
	214	self.assertEqual(btree.path2id("grandparent/parent"), b"b")
	215	self.assertEqual(btree.path2id("grandparent/parent/file"), b"c")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	216
6852.3.1 by Jelmer Vernooĳ add Tree.is_versioned.	217	self.assertIs(btree.path2id("grandparent2"), None)
	218	self.assertIs(btree.path2id("grandparent2/parent"), None)
	219	self.assertIs(btree.path2id("grandparent2/parent/file"), None)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	220
	221	btree.note_rename("grandparent", "grandparent2")
6852.3.1 by Jelmer Vernooĳ add Tree.is_versioned.	222	self.assertIs(btree.old_path("grandparent"), None)
	223	self.assertIs(btree.old_path("grandparent/parent"), None)
	224	self.assertIs(btree.old_path("grandparent/parent/file"), None)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	225
6855.4.1 by Jelmer Vernooĳ Yet more bees.	226	self.assertEqual(btree.id2path(b"a"), "grandparent2")
	227	self.assertEqual(btree.id2path(b"b"), "grandparent2/parent")
	228	self.assertEqual(btree.id2path(b"c"), "grandparent2/parent/file")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	229
6855.4.1 by Jelmer Vernooĳ Yet more bees.	230	self.assertEqual(btree.path2id("grandparent2"), b"a")
	231	self.assertEqual(btree.path2id("grandparent2/parent"), b"b")
	232	self.assertEqual(btree.path2id("grandparent2/parent/file"), b"c")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	233
3376.2.4 by Martin Pool Remove every assert statement from bzrlib!	234	self.assertTrue(btree.path2id("grandparent") is None)
	235	self.assertTrue(btree.path2id("grandparent/parent") is None)
	236	self.assertTrue(btree.path2id("grandparent/parent/file") is None)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	237
	238	btree.note_rename("grandparent/parent", "grandparent2/parent2")
6855.4.1 by Jelmer Vernooĳ Yet more bees.	239	self.assertEqual(btree.id2path(b"a"), "grandparent2")
	240	self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
	241	self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	242
6855.4.1 by Jelmer Vernooĳ Yet more bees.	243	self.assertEqual(btree.path2id("grandparent2"), b"a")
	244	self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
	245	self.assertEqual(btree.path2id("grandparent2/parent2/file"), b"c")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	246
3376.2.4 by Martin Pool Remove every assert statement from bzrlib!	247	self.assertTrue(btree.path2id("grandparent2/parent") is None)
	248	self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	249
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	250	btree.note_rename("grandparent/parent/file",
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	251	"grandparent2/parent2/file2")
6855.4.1 by Jelmer Vernooĳ Yet more bees.	252	self.assertEqual(btree.id2path(b"a"), "grandparent2")
	253	self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
	254	self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file2")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	255
6855.4.1 by Jelmer Vernooĳ Yet more bees.	256	self.assertEqual(btree.path2id("grandparent2"), b"a")
	257	self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
	258	self.assertEqual(btree.path2id("grandparent2/parent2/file2"), b"c")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	259
3376.2.4 by Martin Pool Remove every assert statement from bzrlib!	260	self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	261
	262	def test_moves(self):
	263	"""Ensure that file moves have the proper effect on children"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	264	btree = self.make_tree_1()[0]
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	265	btree.note_rename("grandparent/parent/file",
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	266	"grandparent/alt_parent/file")
6855.4.1 by Jelmer Vernooĳ Yet more bees.	267	self.assertEqual(btree.id2path(b"c"), "grandparent/alt_parent/file")
6855.4.1 by Jelmer Vernooĳ Yet more bees.	268	self.assertEqual(btree.path2id("grandparent/alt_parent/file"), b"c")
3376.2.4 by Martin Pool Remove every assert statement from bzrlib!	269	self.assertTrue(btree.path2id("grandparent/parent/file") is None)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	270
	271	def unified_diff(self, old, new):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	272	out = BytesIO()
7045.2.14 by Jelmer Vernooĳ Fix some bundle tests.:	273	diff.internal_diff("old", old, "new", new, out)
6809.1.1 by Martin Apply 2to3 ws_comma fixer	274	out.seek(0, 0)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	275	return out.read()
	276
	277	def make_tree_2(self):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	278	btree = self.make_tree_1()[0]
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	279	btree.note_rename("grandparent/parent/file",
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	280	"grandparent/alt_parent/file")
6855.4.1 by Jelmer Vernooĳ Yet more bees.	281	self.assertTrue(btree.id2path(b"e") is None)
6973.7.10 by Jelmer Vernooĳ More fixes.	282	self.assertFalse(btree.is_versioned("grandparent/parent/file"))
6973.7.10 by Jelmer Vernooĳ More fixes.	283	btree.note_id(b"e", "grandparent/parent/file")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	284	return btree
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	285
	286	def test_adds(self):
	287	"""File/inventory adds"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	288	btree = self.make_tree_2()
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	289	add_patch = self.unified_diff([], [b"Extra cheese\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	290	btree.note_patch("grandparent/parent/file", add_patch)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	291	btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	292	btree.note_target('grandparent/parent/symlink', 'venus')
	293	self.adds_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	294
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	295	def adds_test(self, btree):
6855.4.1 by Jelmer Vernooĳ Yet more bees.	296	self.assertEqual(btree.id2path(b"e"), "grandparent/parent/file")
6855.4.1 by Jelmer Vernooĳ Yet more bees.	297	self.assertEqual(btree.path2id("grandparent/parent/file"), b"e")
6973.7.10 by Jelmer Vernooĳ More fixes.	298	with btree.get_file("grandparent/parent/file") as f:
6973.7.10 by Jelmer Vernooĳ More fixes.	299	self.assertEqual(f.read(), b"Extra cheese\n")
6809.4.7 by Jelmer Vernooĳ Swap arguments for get_symlink_target and kind/stored_kind.	300	self.assertEqual(
	301	btree.get_symlink_target('grandparent/parent/symlink'), 'venus')
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	302
	303	def test_adds2(self):
	304	"""File/inventory adds, with patch-compatibile renames"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	305	btree = self.make_tree_2()
	306	btree.contents_by_id = False
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	307	add_patch = self.unified_diff([b"Hello\n"], [b"Extra cheese\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	308	btree.note_patch("grandparent/parent/file", add_patch)
6973.7.10 by Jelmer Vernooĳ More fixes.	309	btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	310	btree.note_target('grandparent/parent/symlink', 'venus')
	311	self.adds_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	312
	313	def make_tree_3(self):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	314	btree, mtree = self.make_tree_1()
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	315	mtree.add_file(b"e", "grandparent/parent/topping", b"Anchovies\n")
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	316	btree.note_rename("grandparent/parent/file",
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	317	"grandparent/alt_parent/file")
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	318	btree.note_rename("grandparent/parent/topping",
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	319	"grandparent/alt_parent/stopping")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	320	return btree
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	321
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	322	def get_file_test(self, btree):
6973.7.10 by Jelmer Vernooĳ More fixes.	323	with btree.get_file(btree.id2path(b"e")) as f:
	324	self.assertEqual(f.read(), b"Lemon\n")
	325	with btree.get_file(btree.id2path(b"c")) as f:
	326	self.assertEqual(f.read(), b"Hello\n")
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	327
	328	def test_get_file(self):
	329	"""Get file contents"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	330	btree = self.make_tree_3()
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	331	mod_patch = self.unified_diff([b"Anchovies\n"], [b"Lemon\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	332	btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
	333	self.get_file_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	334
	335	def test_get_file2(self):
6809.4.7 by Jelmer Vernooĳ Swap arguments for get_symlink_target and kind/stored_kind.	336	"""Get file contents, with patch-compatible renames"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	337	btree = self.make_tree_3()
	338	btree.contents_by_id = False
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	339	mod_patch = self.unified_diff([], [b"Lemon\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	340	btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	341	mod_patch = self.unified_diff([], [b"Hello\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	342	btree.note_patch("grandparent/alt_parent/file", mod_patch)
	343	self.get_file_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	344
	345	def test_delete(self):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	346	"Deletion by bundle"
	347	btree = self.make_tree_1()[0]
6973.7.10 by Jelmer Vernooĳ More fixes.	348	with btree.get_file(btree.id2path(b"c")) as f:
6973.7.10 by Jelmer Vernooĳ More fixes.	349	self.assertEqual(f.read(), b"Hello\n")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	350	btree.note_deletion("grandparent/parent/file")
6855.4.1 by Jelmer Vernooĳ Yet more bees.	351	self.assertTrue(btree.id2path(b"c") is None)
6852.3.1 by Jelmer Vernooĳ add Tree.is_versioned.	352	self.assertFalse(btree.is_versioned("grandparent/parent/file"))
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	353
	354	def sorted_ids(self, tree):
6619.3.18 by Jelmer Vernooĳ Run 2to3 idioms fixer.	355	ids = sorted(tree.all_file_ids())
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	356	return ids
	357
	358	def test_iteration(self):
	359	"""Ensure that iteration through ids works properly"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	360	btree = self.make_tree_1()[0]
1852.6.3 by Robert Collins Make iter(Tree) consistent for all tree types.	361	self.assertEqual(self.sorted_ids(btree),
6973.7.10 by Jelmer Vernooĳ More fixes.	362	[inventory.ROOT_ID, b'a', b'b', b'c', b'd'])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	363	btree.note_deletion("grandparent/parent/file")
6973.7.10 by Jelmer Vernooĳ More fixes.	364	btree.note_id(b"e", "grandparent/alt_parent/fool", kind="directory")
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	365	btree.note_last_changed("grandparent/alt_parent/fool",
1185.82.95 by Aaron Bentley Restore path-orientation of ChangesetTree	366	"revisionidiguess")
1852.6.3 by Robert Collins Make iter(Tree) consistent for all tree types.	367	self.assertEqual(self.sorted_ids(btree),
6973.7.10 by Jelmer Vernooĳ More fixes.	368	[inventory.ROOT_ID, b'a', b'b', b'd', b'e'])
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	369
1185.82.7 by John Arbash Meinel Adding patches.py into bzrlib, including the tests into the test suite.	370
4241.14.13 by Vincent Ladeuil Some more cleanup.	371	class BundleTester1(tests.TestCaseWithTransport):
1910.2.49 by Aaron Bentley Ensure that 0.8 bundles aren't used with KnitRepository2	372
	373	def test_mismatched_bundle(self):
	374	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	375	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.49 by Aaron Bentley Ensure that 0.8 bundles aren't used with KnitRepository2	376	serializer = BundleSerializerV08('0.8')
	377	b = self.make_branch('.', format=format)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	378	self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	379	b.repository, [], {}, BytesIO())
1910.2.49 by Aaron Bentley Ensure that 0.8 bundles aren't used with KnitRepository2	380
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	381	def test_matched_bundle(self):
2067.3.1 by Martin Pool Clean up BzrNewError, other exception classes and users.	382	"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	383	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	384	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	385	serializer = BundleSerializerV09('0.9')
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	386	b = self.make_branch('.', format=format)
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	387	serializer.write(b.repository, [], {}, BytesIO())
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	388
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	389	def test_mismatched_model(self):
	390	"""Try copying a bundle from knit2 to knit1"""
	391	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	392	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	393	source = self.make_branch_and_tree('source', format=format)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	394	source.commit('one', rev_id=b'one-id')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	395	source.commit('two', rev_id=b'two-id')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	396	text = BytesIO()
6973.7.10 by Jelmer Vernooĳ More fixes.	397	write_bundle(source.branch.repository, b'two-id', b'null:', text,
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	398	format='0.9')
	399	text.seek(0)
	400
	401	format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	402	format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	403	target = self.make_branch('target', format=format)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	404	self.assertRaises(errors.IncompatibleRevision, install_bundle,
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	405	target.repository, read_bundle(text))
	406
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	407
2520.4.43 by Aaron Bentley Fix test suite	408	class BundleTester(object):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	409
	410	def bzrdir_format(self):
	411	format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	412	format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	413	return format
	414
	415	def make_branch_and_tree(self, path, format=None):
	416	if format is None:
	417	format = self.bzrdir_format()
4241.14.13 by Vincent Ladeuil Some more cleanup.	418	return tests.TestCaseWithTransport.make_branch_and_tree(
4241.14.13 by Vincent Ladeuil Some more cleanup.	419	self, path, format)
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	420
	421	def make_branch(self, path, format=None):
	422	if format is None:
	423	format = self.bzrdir_format()
4241.14.13 by Vincent Ladeuil Some more cleanup.	424	return tests.TestCaseWithTransport.make_branch(self, path, format)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	425
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	426	def create_bundle_text(self, base_rev_id, rev_id):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	427	bundle_txt = BytesIO()
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	428	rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	429	bundle_txt, format=self.format)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	430	bundle_txt.seek(0)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	431	self.assertEqual(bundle_txt.readline(),
6973.7.10 by Jelmer Vernooĳ More fixes.	432	b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
6973.7.10 by Jelmer Vernooĳ More fixes.	433	self.assertEqual(bundle_txt.readline(), b'#\n')
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	434
1185.82.14 by Aaron Bentley API updates	435	rev = self.b1.repository.get_revision(rev_id)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	436	self.assertEqual(bundle_txt.readline().decode('utf-8'),
	437	u'# message:\n')
	438	bundle_txt.seek(0)
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	439	return bundle_txt, rev_ids
	440
	441	def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
	442	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	443	Make sure that the text generated is valid, and that it
	444	can be applied against the base, and generate the same information.
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	445
	446	:return: The in-memory bundle
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	447	"""
	448	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
	449
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	450	# This should also validate the generated bundle
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	451	bundle = read_bundle(bundle_txt)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	452	repository = self.b1.repository
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	453	for bundle_rev in bundle.real_revisions:
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	454	# These really should have already been checked when we read the
	455	# bundle, since it computes the sha1 hash for the revision, which
	456	# only will match if everything is okay, but lets be explicit about
	457	# it
	458	branch_rev = repository.get_revision(bundle_rev.revision_id)
1185.82.33 by Aaron Bentley Strengthen tests	459	for a in ('inventory_sha1', 'revision_id', 'parent_ids',
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	460	'timestamp', 'timezone', 'message', 'committer',
1185.82.33 by Aaron Bentley Strengthen tests	461	'parent_ids', 'properties'):
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	462	self.assertEqual(getattr(branch_rev, a),
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	463	getattr(bundle_rev, a))
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	464	self.assertEqual(len(branch_rev.parent_ids),
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	465	len(bundle_rev.parent_ids))
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	466	self.assertEqual(rev_ids,
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	467	[r.revision_id for r in bundle.real_revisions])
7029.2.1 by Jelmer Vernooĳ don't make assumptions about the order in which revision ids are returned by write_bundle.	468	self.valid_apply_bundle(base_rev_id, bundle, checkout_dir=checkout_dir)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	469
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	470	return bundle
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	471
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	472	def get_invalid_bundle(self, base_rev_id, rev_id):
	473	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1185.82.118 by Aaron Bentley Ensure that StrictTestament handles execute bit differences	474	Munge the text so that it's invalid.
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	475
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	476	:return: The in-memory bundle
1185.82.118 by Aaron Bentley Ensure that StrictTestament handles execute bit differences	477	"""
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	478	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	479	new_text = bundle_txt.getvalue().replace(b'executable:no',
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	480	b'executable:yes')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	481	bundle_txt = BytesIO(new_text)
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	482	bundle = read_bundle(bundle_txt)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	483	self.valid_apply_bundle(base_rev_id, bundle)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	484	return bundle
1185.82.118 by Aaron Bentley Ensure that StrictTestament handles execute bit differences	485
1185.82.139 by Aaron Bentley Raise NotABundle when a non-bundle is supplied	486	def test_non_bundle(self):
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	487	self.assertRaises(errors.NotABundle,
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	488	read_bundle, BytesIO(b'#!/bin/sh\n'))
1185.82.139 by Aaron Bentley Raise NotABundle when a non-bundle is supplied	489
1793.2.7 by Aaron Bentley Fix reporting of malformed, (especially, crlf) bundles	490	def test_malformed(self):
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	491	self.assertRaises(errors.BadBundle, read_bundle,
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	492	BytesIO(b'# Bazaar revision bundle v'))
1793.2.7 by Aaron Bentley Fix reporting of malformed, (especially, crlf) bundles	493
	494	def test_crlf_bundle(self):
1793.2.9 by Aaron Bentley Don't use assertNotRaises-- instead, catch BadBundle and pass	495	try:
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	496	read_bundle(BytesIO(b'# Bazaar revision bundle v0.8\r\n'))
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	497	except errors.BadBundle:
1793.2.9 by Aaron Bentley Don't use assertNotRaises-- instead, catch BadBundle and pass	498	# It is currently permitted for bundles with crlf line endings to
	499	# make read_bundle raise a BadBundle, but this should be fixed.
1793.2.10 by Aaron Bentley Whitespace/comment fix	500	# Anything else, especially NotABundle, is an error.
1793.2.9 by Aaron Bentley Don't use assertNotRaises-- instead, catch BadBundle and pass	501	pass
	502
0.5.88 by John Arbash Meinel Fixed a bug in the rename code, added more tests.	503	def get_checkout(self, rev_id, checkout_dir=None):
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	504	"""Get a new tree, with the specified revision in it.
	505	"""
	506
0.5.88 by John Arbash Meinel Fixed a bug in the rename code, added more tests.	507	if checkout_dir is None:
3638.3.2 by Vincent Ladeuil Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.	508	checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
0.5.89 by John Arbash Meinel Updating for explicitly defined directories.	509	else:
	510	if not os.path.exists(checkout_dir):
	511	os.mkdir(checkout_dir)
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	512	tree = self.make_branch_and_tree(checkout_dir)
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	513	s = BytesIO()
6973.7.8 by Jelmer Vernooĳ Fix more tests.	514	ancestors = write_bundle(self.b1.repository, rev_id, b'null:', s,
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	515	format=self.format)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	516	s.seek(0)
6973.7.10 by Jelmer Vernooĳ More fixes.	517	self.assertIsInstance(s.getvalue(), bytes)
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	518	install_bundle(tree.branch.repository, read_bundle(s))
1185.82.41 by Aaron Bentley More work on installing changesets	519	for ancestor in ancestors:
	520	old = self.b1.repository.revision_tree(ancestor)
	521	new = tree.branch.repository.revision_tree(ancestor)
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	522	old.lock_read()
	523	new.lock_read()
	524	try:
	525	# Check that there aren't any inventory level changes
	526	delta = new.changes_from(old)
	527	self.assertFalse(delta.has_changed(),
	528	'Revision %s not copied correctly.'
	529	% (ancestor,))
	530
	531	# Now check that the file contents are all correct
6825.5.1 by Jelmer Vernooĳ Implement Tree.all_versioned_paths.	532	for path in old.all_versioned_paths():
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	533	try:
6825.5.1 by Jelmer Vernooĳ Implement Tree.all_versioned_paths.	534	old_file = old.get_file(path)
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	535	except errors.NoSuchFile:
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	536	continue
6809.4.21 by Jelmer Vernooĳ Fix long lines.	537	self.assertEqual(
6825.5.1 by Jelmer Vernooĳ Implement Tree.all_versioned_paths.	538	old_file.read(), new.get_file(path).read())
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	539	finally:
	540	new.unlock()
	541	old.unlock()
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	542	if not _mod_revision.is_null(rev_id):
6165.4.19 by Jelmer Vernooij Avoid all iter_reverse_revision_history calls.	543	tree.branch.generate_revision_history(rev_id)
1185.82.44 by Aaron Bentley Switch to merge_changeset in test suite	544	tree.update()
1852.10.3 by Robert Collins Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.	545	delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	546	self.assertFalse(delta.has_changed(),
2255.10.5 by John Arbash Meinel Fix a small bug when we have a symlink that does not need to be re-read.	547	'Working tree has modifications: %s' % delta)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	548	return tree
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	549
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	550	def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	551	"""Get the base revision, apply the changes, and make
	552	sure everything matches the builtin branch.
	553	"""
1185.82.17 by Aaron Bentley More API updates	554	to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
3146.4.11 by Aaron Bentley Fix lock errors in bundle tests	555	to_tree.lock_write()
	556	try:
	557	self._valid_apply_bundle(base_rev_id, info, to_tree)
	558	finally:
	559	to_tree.unlock()
	560
	561	def _valid_apply_bundle(self, base_rev_id, info, to_tree):
1908.6.4 by Robert Collins Update to replaced parent checking api bzrlib/merge.py	562	original_parents = to_tree.get_parent_ids()
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	563	repository = to_tree.branch.repository
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.	564	original_parents = to_tree.get_parent_ids()
1185.82.41 by Aaron Bentley More work on installing changesets	565	self.assertIs(repository.has_revision(base_rev_id), True)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	566	for rev in info.real_revisions:
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	567	self.assertTrue(not repository.has_revision(rev.revision_id),
	568	'Revision {%s} present before applying bundle'
	569	% rev.revision_id)
4241.14.13 by Vincent Ladeuil Some more cleanup.	570	merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	571
	572	for rev in info.real_revisions:
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	573	self.assertTrue(repository.has_revision(rev.revision_id),
	574	'Missing revision {%s} after applying bundle'
	575	% rev.revision_id)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	576
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	577	self.assertTrue(to_tree.branch.repository.has_revision(info.target))
0.5.117 by John Arbash Meinel Almost there. Just need to track down a few remaining bugs.	578	# Do we also want to verify that all the texts have been added?
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	579
1908.6.4 by Robert Collins Update to replaced parent checking api bzrlib/merge.py	580	self.assertEqual(original_parents + [info.target],
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	581	to_tree.get_parent_ids())
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	582
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	583	rev = info.real_revisions[-1]
1185.82.17 by Aaron Bentley More API updates	584	base_tree = self.b1.repository.revision_tree(rev.revision_id)
1185.82.17 by Aaron Bentley More API updates	585	to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	586
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	587	# TODO: make sure the target tree is identical to base tree
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	588	# we might also check the working tree.
	589
	590	base_files = list(base_tree.list_files())
	591	to_files = list(to_tree.list_files())
	592	self.assertEqual(len(base_files), len(to_files))
1185.82.66 by Aaron Bentley Handle new executable files	593	for base_file, to_file in zip(base_files, to_files):
1185.82.66 by Aaron Bentley Handle new executable files	594	self.assertEqual(base_file, to_file)
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	595
0.5.117 by John Arbash Meinel Almost there. Just need to track down a few remaining bugs.	596	for path, status, kind, fileid, entry in base_files:
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	597	# Check that the meta information is the same
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	598	self.assertEqual(base_tree.get_file_size(path),
6809.4.5 by Jelmer Vernooĳ Swap arguments for get_file_*.	599	to_tree.get_file_size(to_tree.id2path(fileid)))
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	600	self.assertEqual(base_tree.get_file_sha1(path),
6809.4.5 by Jelmer Vernooĳ Swap arguments for get_file_*.	601	to_tree.get_file_sha1(to_tree.id2path(fileid)))
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	602	# Check that the contents are the same
	603	# This is pretty expensive
	604	# self.assertEqual(base_tree.get_file(fileid).read(),
	605	# to_tree.get_file(fileid).read())
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	606
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	607	def test_bundle(self):
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	608	self.tree1 = self.make_branch_and_tree('b1')
1185.82.14 by Aaron Bentley API updates	609	self.b1 = self.tree1.branch
0.5.78 by John Arbash Meinel Working on test cases, starting with the empty project issues.	610
6855.3.1 by Jelmer Vernooĳ Several more fixes.	611	self.build_tree_contents([('b1/one', b'one\n')])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	612	self.tree1.add('one', b'one-id')
	613	self.tree1.set_root_id(b'root-id')
	614	self.tree1.commit('add one', rev_id=b'a@cset-0-1')
0.5.78 by John Arbash Meinel Working on test cases, starting with the empty project issues.	615
6973.7.8 by Jelmer Vernooĳ Fix more tests.	616	bundle = self.get_valid_bundle(b'null:', b'a@cset-0-1')
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	617
	618	# Make sure we can handle files with spaces, tabs, other
	619	# bogus characters
0.5.82 by John Arbash Meinel Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids	620	self.build_tree([
0.5.84 by John Arbash Meinel (broken) problem with removes.	621	'b1/with space.txt'
	622	, 'b1/dir/'
	623	, 'b1/dir/filein subdir.c'
	624	, 'b1/dir/WithCaps.txt'
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	625	, 'b1/dir/ pre space'
0.5.84 by John Arbash Meinel (broken) problem with removes.	626	, 'b1/sub/'
	627	, 'b1/sub/sub/'
	628	, 'b1/sub/sub/nonempty.txt'
0.5.82 by John Arbash Meinel Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids	629	])
6855.3.1 by Jelmer Vernooĳ Several more fixes.	630	self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
6855.3.1 by Jelmer Vernooĳ Several more fixes.	631	('b1/dir/nolastnewline.txt', b'bloop')])
1185.82.66 by Aaron Bentley Handle new executable files	632	tt = TreeTransform(self.tree1)
6973.7.10 by Jelmer Vernooĳ More fixes.	633	tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], b'exe-1', True)
1185.82.66 by Aaron Bentley Handle new executable files	634	tt.apply()
2520.4.84 by Aaron Bentley Fix heisenbug record-rewriting test	635	# have to fix length of file-id so that we can predictably rewrite
	636	# a (length-prefixed) record containing it later.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	637	self.tree1.add('with space.txt', b'withspace-id')
1185.82.14 by Aaron Bentley API updates	638	self.tree1.add([
2520.4.84 by Aaron Bentley Fix heisenbug record-rewriting test	639	'dir'
0.5.84 by John Arbash Meinel (broken) problem with removes.	640	, 'dir/filein subdir.c'
0.5.84 by John Arbash Meinel (broken) problem with removes.	641	, 'dir/WithCaps.txt'
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	642	, 'dir/ pre space'
0.5.94 by Aaron Bentley Switched to native patch application, added tests for terminating newlines	643	, 'dir/nolastnewline.txt'
0.5.84 by John Arbash Meinel (broken) problem with removes.	644	, 'sub'
	645	, 'sub/sub'
	646	, 'sub/sub/nonempty.txt'
	647	, 'sub/sub/emptyfile.txt'
0.5.82 by John Arbash Meinel Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids	648	])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	649	self.tree1.commit('add whitespace', rev_id=b'a@cset-0-2')
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	650
6973.7.8 by Jelmer Vernooĳ Fix more tests.	651	bundle = self.get_valid_bundle(b'a@cset-0-1', b'a@cset-0-2')
0.5.117 by John Arbash Meinel Almost there. Just need to track down a few remaining bugs.	652
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	653	# Check a rollup bundle
6973.7.10 by Jelmer Vernooĳ More fixes.	654	bundle = self.get_valid_bundle(b'null:', b'a@cset-0-2')
0.5.84 by John Arbash Meinel (broken) problem with removes.	655
0.5.84 by John Arbash Meinel (broken) problem with removes.	656	# Now delete entries
1185.82.21 by Aaron Bentley Stop using deprecated function	657	self.tree1.remove(
0.5.118 by John Arbash Meinel Got most of test_changeset to work. Still needs work for Aaron's test code.	658	['sub/sub/nonempty.txt'
0.5.84 by John Arbash Meinel (broken) problem with removes.	659	, 'sub/sub/emptyfile.txt'
0.5.118 by John Arbash Meinel Got most of test_changeset to work. Still needs work for Aaron's test code.	660	, 'sub/sub'
	661	])
1185.82.68 by Aaron Bentley Handle execute bit on modified files	662	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	663	trans_id = tt.trans_id_tree_path('executable')
1185.82.68 by Aaron Bentley Handle execute bit on modified files	664	tt.set_executability(False, trans_id)
	665	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	666	self.tree1.commit('removed', rev_id=b'a@cset-0-3')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	667
6973.7.8 by Jelmer Vernooĳ Fix more tests.	668	bundle = self.get_valid_bundle(b'a@cset-0-2', b'a@cset-0-3')
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	669	self.assertRaises((errors.TestamentMismatch,
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	670	errors.VersionedFileInvalidChecksum,
	671	errors.BadBundle), self.get_invalid_bundle,
6973.7.8 by Jelmer Vernooĳ Fix more tests.	672	b'a@cset-0-2', b'a@cset-0-3')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	673	# Check a rollup bundle
6973.7.8 by Jelmer Vernooĳ Fix more tests.	674	bundle = self.get_valid_bundle(b'null:', b'a@cset-0-3')
0.5.84 by John Arbash Meinel (broken) problem with removes.	675
0.5.84 by John Arbash Meinel (broken) problem with removes.	676	# Now move the directory
1185.82.19 by Aaron Bentley More API updates	677	self.tree1.rename_one('dir', 'sub/dir')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	678	self.tree1.commit('rename dir', rev_id=b'a@cset-0-4')
0.5.84 by John Arbash Meinel (broken) problem with removes.	679
6973.7.8 by Jelmer Vernooĳ Fix more tests.	680	bundle = self.get_valid_bundle(b'a@cset-0-3', b'a@cset-0-4')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	681	# Check a rollup bundle
6973.7.8 by Jelmer Vernooĳ Fix more tests.	682	bundle = self.get_valid_bundle(b'null:', b'a@cset-0-4')
0.5.84 by John Arbash Meinel (broken) problem with removes.	683
0.5.87 by John Arbash Meinel Handling international characters, added more test cases.	684	# Modified files
6973.7.5 by Jelmer Vernooĳ s/file/open.	685	with open('b1/sub/dir/WithCaps.txt', 'ab') as f: f.write(b'\nAdding some text\n')
6437.20.3 by Wouter van Heyst mechanically replace file().write() pattern with a with-keyword version	686	with open('b1/sub/dir/ pre space', 'ab') as f: f.write(
6973.7.5 by Jelmer Vernooĳ s/file/open.	687	b'\r\nAdding some\r\nDOS format lines\r\n')
6973.7.5 by Jelmer Vernooĳ s/file/open.	688	with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write(b'\n')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	689	self.tree1.rename_one('sub/dir/ pre space',
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	690	'sub/ start space')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	691	self.tree1.commit('Modified files', rev_id=b'a@cset-0-5')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	692	bundle = self.get_valid_bundle(b'a@cset-0-4', b'a@cset-0-5')
0.5.87 by John Arbash Meinel Handling international characters, added more test cases.	693
1185.82.70 by Aaron Bentley Handle renamed files better	694	self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
	695	self.tree1.rename_one('with space.txt', 'WithCaps.txt')
	696	self.tree1.rename_one('temp', 'with space.txt')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	697	self.tree1.commit(u'swap filenames', rev_id=b'a@cset-0-6',
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	698	verbose=False)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	699	bundle = self.get_valid_bundle(b'a@cset-0-5', b'a@cset-0-6')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	700	other = self.get_checkout(b'a@cset-0-5')
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	701	tree1_inv = get_inventory_text(self.tree1.branch.repository,
6973.7.8 by Jelmer Vernooĳ Fix more tests.	702	b'a@cset-0-5')
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	703	tree2_inv = get_inventory_text(other.branch.repository,
6973.7.8 by Jelmer Vernooĳ Fix more tests.	704	b'a@cset-0-5')
1910.2.54 by Aaron Bentley Implement testament format 3 strict	705	self.assertEqualDiff(tree1_inv, tree2_inv)
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	706	other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	707	other.commit('rename file', rev_id=b'a@cset-0-6b')
1551.15.72 by Aaron Bentley remove builtins._merge_helper	708	self.tree1.merge_from_branch(other.branch)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	709	self.tree1.commit(u'Merge', rev_id=b'a@cset-0-7',
1185.82.70 by Aaron Bentley Handle renamed files better	710	verbose=False)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	711	bundle = self.get_valid_bundle(b'a@cset-0-6', b'a@cset-0-7')
1185.82.72 by Aaron Bentley Always use leftmost base for changesets	712
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	713	def _test_symlink_bundle(self, link_name, link_target, new_link_target):
6973.7.8 by Jelmer Vernooĳ Fix more tests.	714	link_id = b'link-1'
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	715
5967.12.1 by Martin Pool Move all test features into bzrlib.tests.features	716	self.requireFeature(features.SymlinkFeature)
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	717	self.tree1 = self.make_branch_and_tree('b1')
1185.82.87 by Aaron Bentley Got symlink adding working	718	self.b1 = self.tree1.branch
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	719
1185.82.87 by Aaron Bentley Got symlink adding working	720	tt = TreeTransform(self.tree1)
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	721	tt.new_symlink(link_name, tt.root, link_target, link_id)
1185.82.87 by Aaron Bentley Got symlink adding working	722	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	723	self.tree1.commit('add symlink', rev_id=b'l@cset-0-1')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	724	bundle = self.get_valid_bundle(b'null:', b'l@cset-0-1')
6809.1.1 by Martin Apply 2to3 ws_comma fixer	725	if getattr(bundle, 'revision_tree', None) is not None:
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	726	# Not all bundle formats supports revision_tree
6973.7.8 by Jelmer Vernooĳ Fix more tests.	727	bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-1')
6809.4.7 by Jelmer Vernooĳ Swap arguments for get_symlink_target and kind/stored_kind.	728	self.assertEqual(link_target, bund_tree.get_symlink_target(link_name))
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	729
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	730	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	731	trans_id = tt.trans_id_tree_path(link_name)
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	732	tt.adjust_path('link2', tt.root, trans_id)
	733	tt.delete_contents(trans_id)
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	734	tt.create_symlink(new_link_target, trans_id)
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	735	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	736	self.tree1.commit('rename and change symlink', rev_id=b'l@cset-0-2')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	737	bundle = self.get_valid_bundle(b'l@cset-0-1', b'l@cset-0-2')
6809.1.1 by Martin Apply 2to3 ws_comma fixer	738	if getattr(bundle, 'revision_tree', None) is not None:
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	739	# Not all bundle formats supports revision_tree
6973.7.8 by Jelmer Vernooĳ Fix more tests.	740	bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-2')
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	741	self.assertEqual(new_link_target,
6809.4.7 by Jelmer Vernooĳ Swap arguments for get_symlink_target and kind/stored_kind.	742	bund_tree.get_symlink_target('link2'))
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	743
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	744	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	745	trans_id = tt.trans_id_tree_path('link2')
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	746	tt.delete_contents(trans_id)
	747	tt.create_symlink('jupiter', trans_id)
	748	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	749	self.tree1.commit('just change symlink target', rev_id=b'l@cset-0-3')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	750	bundle = self.get_valid_bundle(b'l@cset-0-2', b'l@cset-0-3')
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	751
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	752	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	753	trans_id = tt.trans_id_tree_path('link2')
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	754	tt.delete_contents(trans_id)
	755	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	756	self.tree1.commit('Delete symlink', rev_id=b'l@cset-0-4')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	757	bundle = self.get_valid_bundle(b'l@cset-0-3', b'l@cset-0-4')
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	758
	759	def test_symlink_bundle(self):
	760	self._test_symlink_bundle('link', 'bar/foo', 'mars')
	761
	762	def test_unicode_symlink_bundle(self):
5967.12.1 by Martin Pool Move all test features into bzrlib.tests.features	763	self.requireFeature(features.UnicodeFilenameFeature)
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	764	self._test_symlink_bundle(u'\N{Euro Sign}link',
	765	u'bar/\N{Euro Sign}foo',
	766	u'mars\N{Euro Sign}')
1185.82.96 by Aaron Bentley Got first binary test passing	767
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	768	def test_binary_bundle(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	769	self.tree1 = self.make_branch_and_tree('b1')
1185.82.96 by Aaron Bentley Got first binary test passing	770	self.b1 = self.tree1.branch
1185.82.96 by Aaron Bentley Got first binary test passing	771	tt = TreeTransform(self.tree1)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	772
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	773	# Add
6973.7.10 by Jelmer Vernooĳ More fixes.	774	tt.new_file('file', tt.root, [b'\x00\n\x00\r\x01\n\x02\r\xff'], b'binary-1')
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	775	tt.new_file('file2', tt.root, [b'\x01\n\x02\r\x03\n\x04\r\xff'],
6973.7.10 by Jelmer Vernooĳ More fixes.	776	b'binary-2')
1185.82.96 by Aaron Bentley Got first binary test passing	777	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	778	self.tree1.commit('add binary', rev_id=b'b@cset-0-1')
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	779	self.get_valid_bundle(b'null:', b'b@cset-0-1')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	780
	781	# Delete
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	782	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	783	trans_id = tt.trans_id_tree_path('file')
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	784	tt.delete_contents(trans_id)
	785	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	786	self.tree1.commit('delete binary', rev_id=b'b@cset-0-2')
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	787	self.get_valid_bundle(b'b@cset-0-1', b'b@cset-0-2')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	788
	789	# Rename & modify
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	790	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	791	trans_id = tt.trans_id_tree_path('file2')
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	792	tt.adjust_path('file3', tt.root, trans_id)
	793	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	794	tt.create_file([b'file\rcontents\x00\n\x00'], trans_id)
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	795	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	796	self.tree1.commit('rename and modify binary', rev_id=b'b@cset-0-3')
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	797	self.get_valid_bundle(b'b@cset-0-2', b'b@cset-0-3')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	798
	799	# Modify
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	800	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	801	trans_id = tt.trans_id_tree_path('file3')
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	802	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	803	tt.create_file([b'\x00file\rcontents'], trans_id)
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	804	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	805	self.tree1.commit('just modify binary', rev_id=b'b@cset-0-4')
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	806	self.get_valid_bundle(b'b@cset-0-3', b'b@cset-0-4')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	807
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	808	# Rollup
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	809	self.get_valid_bundle(b'null:', b'b@cset-0-4')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	810
1185.82.115 by Aaron Bentley Add test for last-changed special cases	811	def test_last_modified(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	812	self.tree1 = self.make_branch_and_tree('b1')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	813	self.b1 = self.tree1.branch
	814	tt = TreeTransform(self.tree1)
6973.7.10 by Jelmer Vernooĳ More fixes.	815	tt.new_file('file', tt.root, [b'file'], b'file')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	816	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	817	self.tree1.commit('create file', rev_id=b'a@lmod-0-1')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	818
	819	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	820	trans_id = tt.trans_id_tree_path('file')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	821	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	822	tt.create_file([b'file2'], trans_id)
1185.82.115 by Aaron Bentley Add test for last-changed special cases	823	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	824	self.tree1.commit('modify text', rev_id=b'a@lmod-0-2a')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	825
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	826	other = self.get_checkout(b'a@lmod-0-1')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	827	tt = TreeTransform(other)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	828	trans_id = tt.trans_id_tree_path('file2')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	829	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	830	tt.create_file([b'file2'], trans_id)
1185.82.115 by Aaron Bentley Add test for last-changed special cases	831	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	832	other.commit('modify text in another tree', rev_id=b'a@lmod-0-2b')
1551.15.72 by Aaron Bentley remove builtins._merge_helper	833	self.tree1.merge_from_branch(other.branch)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	834	self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-3',
1185.82.115 by Aaron Bentley Add test for last-changed special cases	835	verbose=False)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	836	self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-4')
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	837	bundle = self.get_valid_bundle(b'a@lmod-0-2a', b'a@lmod-0-4')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	838
	839	def test_hide_history(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	840	self.tree1 = self.make_branch_and_tree('b1')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	841	self.b1 = self.tree1.branch
	842
6855.4.5 by Jelmer Vernooĳ Fix more bees, use with rather than try/finally for some files.	843	with open('b1/one', 'wb') as f: f.write(b'one\n')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	844	self.tree1.add('one')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	845	self.tree1.commit('add file', rev_id=b'a@cset-0-1')
6855.4.5 by Jelmer Vernooĳ Fix more bees, use with rather than try/finally for some files.	846	with open('b1/one', 'wb') as f: f.write(b'two\n')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	847	self.tree1.commit('modify', rev_id=b'a@cset-0-2')
6855.4.5 by Jelmer Vernooĳ Fix more bees, use with rather than try/finally for some files.	848	with open('b1/one', 'wb') as f: f.write(b'three\n')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	849	self.tree1.commit('modify', rev_id=b'a@cset-0-3')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	850	bundle_file = BytesIO()
6973.7.10 by Jelmer Vernooĳ More fixes.	851	rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-3',
	852	b'a@cset-0-1', bundle_file, format=self.format)
	853	self.assertNotContainsRe(bundle_file.getvalue(), b'\btwo\b')
	854	self.assertContainsRe(self.get_raw(bundle_file), b'one')
	855	self.assertContainsRe(self.get_raw(bundle_file), b'three')
2520.4.32 by Aaron Bentley Fix test case	856
2520.4.75 by Aaron Bentley Fix traceback on empty bundles.	857	def test_bundle_same_basis(self):
	858	"""Ensure using the basis as the target doesn't cause an error"""
	859	self.tree1 = self.make_branch_and_tree('b1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	860	self.tree1.commit('add file', rev_id=b'a@cset-0-1')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	861	bundle_file = BytesIO()
6973.7.10 by Jelmer Vernooĳ More fixes.	862	rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-1',
6973.7.10 by Jelmer Vernooĳ More fixes.	863	b'a@cset-0-1', bundle_file)
2520.4.75 by Aaron Bentley Fix traceback on empty bundles.	864
2520.4.32 by Aaron Bentley Fix test case	865	@staticmethod
	866	def get_raw(bundle_file):
	867	return bundle_file.getvalue()
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	868
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	869	def test_unicode_bundle(self):
5967.12.1 by Martin Pool Move all test features into bzrlib.tests.features	870	self.requireFeature(features.UnicodeFilenameFeature)
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	871	# Handle international characters
	872	os.mkdir('b1')
4241.14.13 by Vincent Ladeuil Some more cleanup.	873	f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	874
	875	self.tree1 = self.make_branch_and_tree('b1')
	876	self.b1 = self.tree1.branch
	877
	878	f.write((u'A file\n'
	879	u'With international man of mystery\n'
	880	u'William Dod\xe9\n').encode('utf-8'))
	881	f.close()
	882
6855.4.1 by Jelmer Vernooĳ Yet more bees.	883	self.tree1.add([u'with Dod\N{Euro Sign}'], [b'withdod-id'])
2386.1.1 by John Arbash Meinel Update test_unicode_bundle, since we know how it fails on Mac OSX	884	self.tree1.commit(u'i18n commit from William Dod\xe9',
6855.4.1 by Jelmer Vernooĳ Yet more bees.	885	rev_id=b'i18n-1', committer=u'William Dod\xe9')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	886
	887	# Add
6973.7.10 by Jelmer Vernooĳ More fixes.	888	bundle = self.get_valid_bundle(b'null:', b'i18n-1')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	889
	890	# Modified
3638.3.18 by Vincent Ladeuil Fixed as per jam's review.	891	f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	892	f.write(u'Modified \xb5\n'.encode('utf8'))
	893	f.close()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	894	self.tree1.commit(u'modified', rev_id=b'i18n-2')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	895
6973.7.10 by Jelmer Vernooĳ More fixes.	896	bundle = self.get_valid_bundle(b'i18n-1', b'i18n-2')
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	897
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	898	# Renamed
3638.3.18 by Vincent Ladeuil Fixed as per jam's review.	899	self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	900	self.tree1.commit(u'renamed, the new i18n man', rev_id=b'i18n-3',
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	901	committer=u'Erik B\xe5gfors')
	902
6973.7.10 by Jelmer Vernooĳ More fixes.	903	bundle = self.get_valid_bundle(b'i18n-2', b'i18n-3')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	904
	905	# Removed
3638.3.18 by Vincent Ladeuil Fixed as per jam's review.	906	self.tree1.remove([u'B\N{Euro Sign}gfors'])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	907	self.tree1.commit(u'removed', rev_id=b'i18n-4')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	908
6973.7.10 by Jelmer Vernooĳ More fixes.	909	bundle = self.get_valid_bundle(b'i18n-3', b'i18n-4')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	910
	911	# Rollup
6973.7.10 by Jelmer Vernooĳ More fixes.	912	bundle = self.get_valid_bundle(b'null:', b'i18n-4')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	913
	914
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	915	def test_whitespace_bundle(self):
	916	if sys.platform in ('win32', 'cygwin'):
4241.14.13 by Vincent Ladeuil Some more cleanup.	917	raise tests.TestSkipped('Windows doesn\'t support filenames'
4241.14.13 by Vincent Ladeuil Some more cleanup.	918	' with tabs or trailing spaces')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	919	self.tree1 = self.make_branch_and_tree('b1')
	920	self.b1 = self.tree1.branch
	921
	922	self.build_tree(['b1/trailing space '])
	923	self.tree1.add(['trailing space '])
	924	# TODO: jam 20060701 Check for handling files with '\t' characters
	925	# once we actually support them
	926
	927	# Added
6855.4.1 by Jelmer Vernooĳ Yet more bees.	928	self.tree1.commit('funky whitespace', rev_id=b'white-1')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	929
6973.7.10 by Jelmer Vernooĳ More fixes.	930	bundle = self.get_valid_bundle(b'null:', b'white-1')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	931
	932	# Modified
6973.7.5 by Jelmer Vernooĳ s/file/open.	933	with open('b1/trailing space ', 'ab') as f: f.write(b'add some text\n')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	934	self.tree1.commit('add text', rev_id=b'white-2')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	935
6973.7.10 by Jelmer Vernooĳ More fixes.	936	bundle = self.get_valid_bundle(b'white-1', b'white-2')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	937
	938	# Renamed
	939	self.tree1.rename_one('trailing space ', ' start and end space ')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	940	self.tree1.commit('rename', rev_id=b'white-3')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	941
6973.7.10 by Jelmer Vernooĳ More fixes.	942	bundle = self.get_valid_bundle(b'white-2', b'white-3')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	943
	944	# Removed
	945	self.tree1.remove([' start and end space '])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	946	self.tree1.commit('removed', rev_id=b'white-4')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	947
6973.7.10 by Jelmer Vernooĳ More fixes.	948	bundle = self.get_valid_bundle(b'white-3', b'white-4')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	949
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	950	# Now test a complet roll-up
6973.7.10 by Jelmer Vernooĳ More fixes.	951	bundle = self.get_valid_bundle(b'null:', b'white-4')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	952
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	953	def test_alt_timezone_bundle(self):
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	954	self.tree1 = self.make_branch_and_memory_tree('b1')
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	955	self.b1 = self.tree1.branch
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	956	builder = treebuilder.TreeBuilder()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	957
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	958	self.tree1.lock_write()
	959	builder.start_tree(self.tree1)
	960	builder.build(['newfile'])
	961	builder.finish_tree()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	962
	963	# Asia/Colombo offset = 5 hours 30 minutes
6855.4.1 by Jelmer Vernooĳ Yet more bees.	964	self.tree1.commit('non-hour offset timezone', rev_id=b'tz-1',
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	965	timezone=19800, timestamp=1152544886.0)
	966
6973.7.10 by Jelmer Vernooĳ More fixes.	967	bundle = self.get_valid_bundle(b'null:', b'tz-1')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	968
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	969	rev = bundle.revisions[0]
	970	self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
	971	self.assertEqual(19800, rev.timezone)
	972	self.assertEqual(1152544886.0, rev.timestamp)
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	973	self.tree1.unlock()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	974
1910.2.1 by Aaron Bentley Ensure root entry always has a revision	975	def test_bundle_root_id(self):
	976	self.tree1 = self.make_branch_and_tree('b1')
	977	self.b1 = self.tree1.branch
6855.4.1 by Jelmer Vernooĳ Yet more bees.	978	self.tree1.commit('message', rev_id=b'revid1')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	979	bundle = self.get_valid_bundle(b'null:', b'revid1')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	980	tree = self.get_bundle_tree(bundle, b'revid1')
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	981	root_revision = tree.get_file_revision(u'')
6973.7.10 by Jelmer Vernooĳ More fixes.	982	self.assertEqual(b'revid1', root_revision)
1910.2.1 by Aaron Bentley Ensure root entry always has a revision	983
1551.14.9 by Aaron Bentley rename get_target_revision to install_revisions	984	def test_install_revisions(self):
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	985	self.tree1 = self.make_branch_and_tree('b1')
	986	self.b1 = self.tree1.branch
6855.4.1 by Jelmer Vernooĳ Yet more bees.	987	self.tree1.commit('message', rev_id=b'rev2a')
6973.5.2 by Jelmer Vernooĳ Add more bees.	988	bundle = self.get_valid_bundle(b'null:', b'rev2a')
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	989	branch2 = self.make_branch('b2')
6973.5.2 by Jelmer Vernooĳ Add more bees.	990	self.assertFalse(branch2.repository.has_revision(b'rev2a'))
1551.14.9 by Aaron Bentley rename get_target_revision to install_revisions	991	target_revision = bundle.install_revisions(branch2.repository)
6973.5.2 by Jelmer Vernooĳ Add more bees.	992	self.assertTrue(branch2.repository.has_revision(b'rev2a'))
6973.5.2 by Jelmer Vernooĳ Add more bees.	993	self.assertEqual(b'rev2a', target_revision)
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	994
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	995	def test_bundle_empty_property(self):
	996	"""Test serializing revision properties with an empty value."""
	997	tree = self.make_branch_and_memory_tree('tree')
	998	tree.lock_write()
	999	self.addCleanup(tree.unlock)
6973.5.2 by Jelmer Vernooĳ Add more bees.	1000	tree.add([''], [b'TREE_ROOT'])
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1001	tree.commit('One', revprops={u'one': 'two', u'empty': ''}, rev_id=b'rev1')
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1002	self.b1 = tree.branch
6973.5.2 by Jelmer Vernooĳ Add more bees.	1003	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1004	bundle = read_bundle(bundle_sio)
	1005	revision_info = bundle.revisions[0]
6973.5.2 by Jelmer Vernooĳ Add more bees.	1006	self.assertEqual(b'rev1', revision_info.revision_id)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1007	rev = revision_info.as_revision()
	1008	self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
	1009	rev.properties)
	1010
	1011	def test_bundle_sorted_properties(self):
	1012	"""For stability the writer should write properties in sorted order."""
	1013	tree = self.make_branch_and_memory_tree('tree')
	1014	tree.lock_write()
	1015	self.addCleanup(tree.unlock)
	1016
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1017	tree.add([''], [b'TREE_ROOT'])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1018	tree.commit('One', rev_id=b'rev1',
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1019	revprops={u'a':'4', u'b':'3', u'c':'2', u'd':'1'})
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1020	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1021	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1022	bundle = read_bundle(bundle_sio)
	1023	revision_info = bundle.revisions[0]
6973.7.10 by Jelmer Vernooĳ More fixes.	1024	self.assertEqual(b'rev1', revision_info.revision_id)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1025	rev = revision_info.as_revision()
	1026	self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
	1027	'd':'1'}, rev.properties)
	1028
	1029	def test_bundle_unicode_properties(self):
	1030	"""We should be able to round trip a non-ascii property."""
	1031	tree = self.make_branch_and_memory_tree('tree')
	1032	tree.lock_write()
	1033	self.addCleanup(tree.unlock)
	1034
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1035	tree.add([''], [b'TREE_ROOT'])
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1036	# Revisions themselves do not require anything about revision property
	1037	# keys, other than that they are a basestring, and do not contain
	1038	# whitespace.
	1039	# However, Testaments assert than they are str(), and thus should not
	1040	# be Unicode.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1041	tree.commit('One', rev_id=b'rev1',
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1042	revprops={u'omega':u'\u03a9', u'alpha':u'\u03b1'})
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1043	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1044	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1045	bundle = read_bundle(bundle_sio)
	1046	revision_info = bundle.revisions[0]
6973.7.10 by Jelmer Vernooĳ More fixes.	1047	self.assertEqual(b'rev1', revision_info.revision_id)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1048	rev = revision_info.as_revision()
	1049	self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
	1050	'alpha':u'\u03b1'}, rev.properties)
	1051
2520.4.43 by Aaron Bentley Fix test suite	1052	def test_bundle_with_ghosts(self):
	1053	tree = self.make_branch_and_tree('tree')
	1054	self.b1 = tree.branch
6855.3.1 by Jelmer Vernooĳ Several more fixes.	1055	self.build_tree_contents([('tree/file', b'content1')])
2520.4.43 by Aaron Bentley Fix test suite	1056	tree.add(['file'])
2520.4.43 by Aaron Bentley Fix test suite	1057	tree.commit('rev1')
6855.3.1 by Jelmer Vernooĳ Several more fixes.	1058	self.build_tree_contents([('tree/file', b'content2')])
	1059	tree.add_parent_tree_id(b'ghost')
	1060	tree.commit('rev2', rev_id=b'rev2')
	1061	bundle = self.get_valid_bundle(b'null:', b'rev2')
2520.4.43 by Aaron Bentley Fix test suite	1062
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1063	def make_simple_tree(self, format=None):
	1064	tree = self.make_branch_and_tree('b1', format=format)
	1065	self.b1 = tree.branch
	1066	self.build_tree(['b1/file'])
	1067	tree.add('file')
	1068	return tree
	1069
	1070	def test_across_serializers(self):
	1071	tree = self.make_simple_tree('knit')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1072	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1073	tree.commit('hello', rev_id=b'rev2')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1074	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1075	repo = self.make_repository('repo', format='dirstate-with-subtree')
	1076	bundle.install_revisions(repo)
6973.7.10 by Jelmer Vernooĳ More fixes.	1077	inv_text = repo._get_inventory_xml(b'rev2')
	1078	self.assertNotContainsRe(inv_text, b'format="5"')
	1079	self.assertContainsRe(inv_text, b'format="7"')
2520.4.99 by Aaron Bentley Test conversion across models	1080
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1081	def make_repo_with_installed_revisions(self):
	1082	tree = self.make_simple_tree('knit')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1083	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1084	tree.commit('hello', rev_id=b'rev2')
6973.5.2 by Jelmer Vernooĳ Add more bees.	1085	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1086	repo = self.make_repository('repo', format='dirstate-with-subtree')
	1087	bundle.install_revisions(repo)
	1088	return repo
	1089
2520.4.99 by Aaron Bentley Test conversion across models	1090	def test_across_models(self):
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1091	repo = self.make_repo_with_installed_revisions()
6973.5.2 by Jelmer Vernooĳ Add more bees.	1092	inv = repo.get_inventory(b'rev2')
6973.5.2 by Jelmer Vernooĳ Add more bees.	1093	self.assertEqual(b'rev2', inv.root.revision)
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	1094	root_id = inv.root.file_id
	1095	repo.lock_read()
	1096	self.addCleanup(repo.unlock)
6973.5.2 by Jelmer Vernooĳ Add more bees.	1097	self.assertEqual({(root_id, b'rev1'):(),
	1098	(root_id, b'rev2'):((root_id, b'rev1'),)},
	1099	repo.texts.get_parent_map([(root_id, b'rev1'), (root_id, b'rev2')]))
2520.4.99 by Aaron Bentley Test conversion across models	1100
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1101	def test_inv_hash_across_serializers(self):
	1102	repo = self.make_repo_with_installed_revisions()
6973.5.2 by Jelmer Vernooĳ Add more bees.	1103	recorded_inv_sha1 = repo.get_revision(b'rev2').inventory_sha1
6973.5.2 by Jelmer Vernooĳ Add more bees.	1104	xml = repo._get_inventory_xml(b'rev2')
4241.14.13 by Vincent Ladeuil Some more cleanup.	1105	self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1106
2520.4.99 by Aaron Bentley Test conversion across models	1107	def test_across_models_incompatible(self):
2520.4.99 by Aaron Bentley Test conversion across models	1108	tree = self.make_simple_tree('dirstate-with-subtree')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1109	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1110	tree.commit('hello', rev_id=b'rev2')
2520.4.99 by Aaron Bentley Test conversion across models	1111	try:
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1112	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
2520.4.99 by Aaron Bentley Test conversion across models	1113	except errors.IncompatibleBundleFormat:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1114	raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
2520.4.99 by Aaron Bentley Test conversion across models	1115	repo = self.make_repository('repo', format='knit')
	1116	bundle.install_revisions(repo)
	1117
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1118	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
2520.4.99 by Aaron Bentley Test conversion across models	1119	self.assertRaises(errors.IncompatibleRevision,
2520.4.99 by Aaron Bentley Test conversion across models	1120	bundle.install_revisions, repo)
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1121
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1122	def test_get_merge_request(self):
	1123	tree = self.make_simple_tree()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1124	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1125	tree.commit('hello', rev_id=b'rev2')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1126	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1127	result = bundle.get_merge_request(tree.branch.repository)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1128	self.assertEqual((None, b'rev1', 'inapplicable'), result)
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1129
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1130	def test_with_subtree(self):
	1131	tree = self.make_branch_and_tree('tree',
	1132	format='dirstate-with-subtree')
	1133	self.b1 = tree.branch
	1134	subtree = self.make_branch_and_tree('tree/subtree',
	1135	format='dirstate-with-subtree')
	1136	tree.add('subtree')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1137	tree.commit('hello', rev_id=b'rev1')
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1138	try:
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1139	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1140	except errors.IncompatibleBundleFormat:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1141	raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1142	if isinstance(bundle, v09.BundleInfo09):
4241.14.13 by Vincent Ladeuil Some more cleanup.	1143	raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1144	repo = self.make_repository('repo', format='knit')
	1145	self.assertRaises(errors.IncompatibleRevision,
	1146	bundle.install_revisions, repo)
	1147	repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
	1148	bundle.install_revisions(repo2)
	1149
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1150	def test_revision_id_with_slash(self):
	1151	self.tree1 = self.make_branch_and_tree('tree')
	1152	self.b1 = self.tree1.branch
	1153	try:
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1154	self.tree1.commit('Revision/id/with/slashes', rev_id=b'rev/id')
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1155	except ValueError:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1156	raise tests.TestSkipped(
4241.14.13 by Vincent Ladeuil Some more cleanup.	1157	"Repository doesn't support revision ids with slashes")
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1158	bundle = self.get_valid_bundle(b'null:', b'rev/id')
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1159
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1160	def test_skip_file(self):
	1161	"""Make sure we don't accidentally write to the wrong versionedfile"""
	1162	self.tree1 = self.make_branch_and_tree('tree')
	1163	self.b1 = self.tree1.branch
	1164	# rev1 is not present in bundle, done by fetch
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1165	self.build_tree_contents([('tree/file2', b'contents1')])
	1166	self.tree1.add('file2', b'file2-id')
	1167	self.tree1.commit('rev1', rev_id=b'reva')
	1168	self.build_tree_contents([('tree/file3', b'contents2')])
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1169	# rev2 is present in bundle, and done by fetch
	1170	# having file1 in the bunle causes file1's versionedfile to be opened.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1171	self.tree1.add('file3', b'file3-id')
7058.3.5 by Jelmer Vernooĳ Fix flappy skip_file test.	1172	rev2 = self.tree1.commit('rev2')
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1173	# Updating file2 should not cause an attempt to add to file1's vf
6653.6.1 by Jelmer Vernooĳ Rename a number of attributes from bzrdir to controldir.	1174	target = self.tree1.controldir.sprout('target').open_workingtree()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1175	self.build_tree_contents([('tree/file2', b'contents3')])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1176	self.tree1.commit('rev3', rev_id=b'rev3')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1177	bundle = self.get_valid_bundle(b'reva', b'rev3')
2520.6.5 by Aaron Bentley Skip for bundle formats that don't provide get_bundle_reader	1178	if getattr(bundle, 'get_bundle_reader', None) is None:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1179	raise tests.TestSkipped('Bundle format cannot provide reader')
7058.3.5 by Jelmer Vernooĳ Fix flappy skip_file test.	1180	file_ids = set(
	1181	(f, r) for b, m, k, r, f in bundle.get_bundle_reader().iter_records()
	1182	if f is not None)
	1183	self.assertEqual({(b'file2-id', b'rev3'), (b'file3-id', rev2)}, file_ids)
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1184	bundle.install_revisions(target.branch.repository)
	1185
2520.4.43 by Aaron Bentley Fix test suite	1186
4241.14.13 by Vincent Ladeuil Some more cleanup.	1187	class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1188
	1189	format = '0.8'
	1190
	1191	def test_bundle_empty_property(self):
	1192	"""Test serializing revision properties with an empty value."""
	1193	tree = self.make_branch_and_memory_tree('tree')
	1194	tree.lock_write()
	1195	self.addCleanup(tree.unlock)
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1196	tree.add([''], [b'TREE_ROOT'])
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1197	tree.commit('One', revprops={u'one':'two', u'empty':''}, rev_id=b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1198	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1199	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1200	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1201	b'# properties:\n'
	1202	b'# branch-nick: tree\n'
	1203	b'# empty: \n'
	1204	b'# one: two\n'
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1205	)
	1206	bundle = read_bundle(bundle_sio)
	1207	revision_info = bundle.revisions[0]
7045.2.14 by Jelmer Vernooĳ Fix some bundle tests.:	1208	self.assertEqual(b'rev1', revision_info.revision_id)
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1209	rev = revision_info.as_revision()
	1210	self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
	1211	rev.properties)
	1212
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1213	def get_bundle_tree(self, bundle, revision_id):
	1214	repository = self.make_repository('repo')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1215	return bundle.revision_tree(repository, b'revid1')
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1216
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1217	def test_bundle_empty_property_alt(self):
2447.1.3 by John Arbash Meinel Change the default serializer to include a trailing whitespace for empty properties.	1218	"""Test serializing revision properties with an empty value.
	1219
	1220	Older readers had a bug when reading an empty property.
	1221	They assumed that all keys ended in ': \n'. However they would write an
	1222	empty value as ':\n'. This tests make sure that all newer bzr versions
	1223	can handle th second form.
	1224	"""
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1225	tree = self.make_branch_and_memory_tree('tree')
	1226	tree.lock_write()
	1227	self.addCleanup(tree.unlock)
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1228	tree.add([''], [b'TREE_ROOT'])
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1229	tree.commit('One', revprops={u'one':'two', u'empty':''}, rev_id=b'rev1')
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1230	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1231	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1232	txt = bundle_sio.getvalue()
6973.7.10 by Jelmer Vernooĳ More fixes.	1233	loc = txt.find(b'# empty: ') + len(b'# empty:')
2447.1.3 by John Arbash Meinel Change the default serializer to include a trailing whitespace for empty properties.	1234	# Create a new bundle, which strips the trailing space after empty
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1235	bundle_sio = BytesIO(txt[:loc] + txt[loc+1:])
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1236
	1237	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1238	b'# properties:\n'
	1239	b'# branch-nick: tree\n'
	1240	b'# empty:\n'
	1241	b'# one: two\n'
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1242	)
	1243	bundle = read_bundle(bundle_sio)
	1244	revision_info = bundle.revisions[0]
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	1245	self.assertEqual(b'rev1', revision_info.revision_id)
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1246	rev = revision_info.as_revision()
	1247	self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
	1248	rev.properties)
	1249
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1250	def test_bundle_sorted_properties(self):
	1251	"""For stability the writer should write properties in sorted order."""
	1252	tree = self.make_branch_and_memory_tree('tree')
	1253	tree.lock_write()
	1254	self.addCleanup(tree.unlock)
	1255
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1256	tree.add([''], [b'TREE_ROOT'])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1257	tree.commit('One', rev_id=b'rev1',
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1258	revprops={u'a':'4', u'b':'3', u'c':'2', u'd':'1'})
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1259	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1260	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1261	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1262	b'# properties:\n'
	1263	b'# a: 4\n'
	1264	b'# b: 3\n'
	1265	b'# branch-nick: tree\n'
	1266	b'# c: 2\n'
	1267	b'# d: 1\n'
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1268	)
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1269	bundle = read_bundle(bundle_sio)
	1270	revision_info = bundle.revisions[0]
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	1271	self.assertEqual(b'rev1', revision_info.revision_id)
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1272	rev = revision_info.as_revision()
	1273	self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
	1274	'd':'1'}, rev.properties)
	1275
	1276	def test_bundle_unicode_properties(self):
	1277	"""We should be able to round trip a non-ascii property."""
	1278	tree = self.make_branch_and_memory_tree('tree')
	1279	tree.lock_write()
	1280	self.addCleanup(tree.unlock)
	1281
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1282	tree.add([''], [b'TREE_ROOT'])
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1283	# Revisions themselves do not require anything about revision property
	1284	# keys, other than that they are a basestring, and do not contain
	1285	# whitespace.
	1286	# However, Testaments assert than they are str(), and thus should not
	1287	# be Unicode.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1288	tree.commit('One', rev_id=b'rev1',
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1289	revprops={u'omega':u'\u03a9', u'alpha':u'\u03b1'})
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1290	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1291	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1292	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1293	b'# properties:\n'
	1294	b'# alpha: \xce\xb1\n'
	1295	b'# branch-nick: tree\n'
	1296	b'# omega: \xce\xa9\n'
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1297	)
	1298	bundle = read_bundle(bundle_sio)
	1299	revision_info = bundle.revisions[0]
6973.7.10 by Jelmer Vernooĳ More fixes.	1300	self.assertEqual(b'rev1', revision_info.revision_id)
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1301	rev = revision_info.as_revision()
	1302	self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
	1303	'alpha':u'\u03b1'}, rev.properties)
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1304
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1305
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1306	class V09BundleKnit2Tester(V08BundleTester):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	1307
	1308	format = '0.9'
	1309
	1310	def bzrdir_format(self):
	1311	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	1312	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	1313	return format
	1314
	1315
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1316	class V09BundleKnit1Tester(V08BundleTester):
	1317
	1318	format = '0.9'
	1319
	1320	def bzrdir_format(self):
	1321	format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	1322	format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1323	return format
	1324
	1325
4241.14.13 by Vincent Ladeuil Some more cleanup.	1326	class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1327
2520.4.136 by Aaron Bentley Fix format strings	1328	format = '4'
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1329
	1330	def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
	1331	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1332	Make sure that the text generated is valid, and that it
	1333	can be applied against the base, and generate the same information.
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1334
	1335	:return: The in-memory bundle
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1336	"""
	1337	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
	1338
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1339	# This should also validate the generated bundle
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1340	bundle = read_bundle(bundle_txt)
	1341	repository = self.b1.repository
	1342	for bundle_rev in bundle.real_revisions:
	1343	# These really should have already been checked when we read the
	1344	# bundle, since it computes the sha1 hash for the revision, which
	1345	# only will match if everything is okay, but lets be explicit about
	1346	# it
	1347	branch_rev = repository.get_revision(bundle_rev.revision_id)
	1348	for a in ('inventory_sha1', 'revision_id', 'parent_ids',
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1349	'timestamp', 'timezone', 'message', 'committer',
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1350	'parent_ids', 'properties'):
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1351	self.assertEqual(getattr(branch_rev, a),
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1352	getattr(bundle_rev, a))
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1353	self.assertEqual(len(branch_rev.parent_ids),
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1354	len(bundle_rev.parent_ids))
2520.4.29 by Aaron Bentley Reactivate some testing, fix topo_iter	1355	self.assertEqual(set(rev_ids),
6619.3.12 by Jelmer Vernooĳ Use 2to3 set_literal fixer.	1356	{r.revision_id for r in bundle.real_revisions})
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1357	self.valid_apply_bundle(base_rev_id, bundle,
	1358	checkout_dir=checkout_dir)
	1359
	1360	return bundle
	1361
2520.4.34 by Aaron Bentley Add signature support	1362	def get_invalid_bundle(self, base_rev_id, rev_id):
	1363	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1364	Munge the text so that it's invalid.
	1365
	1366	:return: The in-memory bundle
	1367	"""
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	1368	from ..bundle import serializer
2520.4.34 by Aaron Bentley Add signature support	1369	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1370	new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
6973.7.10 by Jelmer Vernooĳ More fixes.	1371	new_text = new_text.replace(b'<file file_id="exe-1"',
	1372	b'<file executable="y" file_id="exe-1"')
	1373	new_text = new_text.replace(b'B260', b'B275')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1374	bundle_txt = BytesIO()
2520.4.136 by Aaron Bentley Fix format strings	1375	bundle_txt.write(serializer._get_bundle_header('4'))
6973.7.5 by Jelmer Vernooĳ s/file/open.	1376	bundle_txt.write(b'\n')
6973.7.10 by Jelmer Vernooĳ More fixes.	1377	bundle_txt.write(bz2.compress(new_text))
2520.4.34 by Aaron Bentley Add signature support	1378	bundle_txt.seek(0)
	1379	bundle = read_bundle(bundle_txt)
	1380	self.valid_apply_bundle(base_rev_id, bundle)
	1381	return bundle
	1382
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1383	def create_bundle_text(self, base_rev_id, rev_id):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1384	bundle_txt = BytesIO()
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1385	rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1386	bundle_txt, format=self.format)
	1387	bundle_txt.seek(0)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1388	self.assertEqual(bundle_txt.readline(),
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1389	b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1390	self.assertEqual(bundle_txt.readline(), b'#\n')
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1391	rev = self.b1.repository.get_revision(rev_id)
	1392	bundle_txt.seek(0)
	1393	return bundle_txt, rev_ids
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1394
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1395	def get_bundle_tree(self, bundle, revision_id):
	1396	repository = self.make_repository('repo')
	1397	bundle.install_revisions(repository)
	1398	return repository.revision_tree(revision_id)
	1399
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1400	def test_creation(self):
	1401	tree = self.make_branch_and_tree('tree')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1402	self.build_tree_contents([('tree/file', b'contents1\nstatic\n')])
6973.5.2 by Jelmer Vernooĳ Add more bees.	1403	tree.add('file', b'fileid-2')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1404	tree.commit('added file', rev_id=b'rev1')
	1405	self.build_tree_contents([('tree/file', b'contents2\nstatic\n')])
	1406	tree.commit('changed file', rev_id=b'rev2')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1407	s = BytesIO()
2520.4.72 by Aaron Bentley Rename format to 4alpha	1408	serializer = BundleSerializerV4('1.0')
7029.2.2 by Jelmer Vernooĳ Fix two tests.	1409	with tree.lock_read():
7029.2.2 by Jelmer Vernooĳ Fix two tests.	1410	serializer.write_bundle(tree.branch.repository, b'rev2', b'null:', s)
2520.4.5 by Aaron Bentley Start work on reading mpbundles	1411	s.seek(0)
2520.4.6 by Aaron Bentley Get installation started	1412	tree2 = self.make_branch_and_tree('target')
	1413	target_repo = tree2.branch.repository
	1414	install_bundle(target_repo, serializer.read(s))
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	1415	target_repo.lock_read()
	1416	self.addCleanup(target_repo.unlock)
4202.1.1 by John Arbash Meinel Update Repository.iter_files_bytes() to return an iterable of bytestrings.	1417	# Turn the 'iterators_of_bytes' back into simple strings for comparison
6973.7.10 by Jelmer Vernooĳ More fixes.	1418	repo_texts = dict((i, b''.join(content)) for i, content
4202.1.1 by John Arbash Meinel Update Repository.iter_files_bytes() to return an iterable of bytestrings.	1419	in target_repo.iter_files_bytes(
6973.5.2 by Jelmer Vernooĳ Add more bees.	1420	[(b'fileid-2', b'rev1', '1'),
	1421	(b'fileid-2', b'rev2', '2')]))
	1422	self.assertEqual({'1':b'contents1\nstatic\n',
	1423	'2':b'contents2\nstatic\n'},
4202.1.1 by John Arbash Meinel Update Repository.iter_files_bytes() to return an iterable of bytestrings.	1424	repo_texts)
6973.5.2 by Jelmer Vernooĳ Add more bees.	1425	rtree = target_repo.revision_tree(b'rev2')
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	1426	inventory_vf = target_repo.inventories
	1427	# If the inventory store has a graph, it must match the revision graph.
	1428	self.assertSubset(
6973.5.2 by Jelmer Vernooĳ Add more bees.	1429	[inventory_vf.get_parent_map([(b'rev2',)])[(b'rev2',)]],
6973.5.2 by Jelmer Vernooĳ Add more bees.	1430	[None, ((b'rev1',),)])
2520.4.10 by Aaron Bentley Enable installation of revisions	1431	self.assertEqual('changed file',
6973.5.2 by Jelmer Vernooĳ Add more bees.	1432	target_repo.get_revision(b'rev2').message)
2520.4.6 by Aaron Bentley Get installation started	1433
2520.4.32 by Aaron Bentley Fix test case	1434	@staticmethod
	1435	def get_raw(bundle_file):
	1436	bundle_file.seek(0)
2520.4.70 by Aaron Bentley Yank patch-handling functionality	1437	line = bundle_file.readline()
	1438	line = bundle_file.readline()
2520.4.32 by Aaron Bentley Fix test case	1439	lines = bundle_file.readlines()
6973.7.10 by Jelmer Vernooĳ More fixes.	1440	return bz2.decompress(b''.join(lines))
2520.4.32 by Aaron Bentley Fix test case	1441
2520.4.34 by Aaron Bentley Add signature support	1442	def test_copy_signatures(self):
2520.4.34 by Aaron Bentley Add signature support	1443	tree_a = self.make_branch_and_tree('tree_a')
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1444	import breezy.gpg
	1445	import breezy.commit as commit
	1446	oldstrategy = breezy.gpg.GPGStrategy
2520.4.34 by Aaron Bentley Add signature support	1447	branch = tree_a.branch
2520.4.34 by Aaron Bentley Add signature support	1448	repo_a = branch.repository
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1449	tree_a.commit("base", allow_pointless=True, rev_id=b'A')
6973.7.10 by Jelmer Vernooĳ More fixes.	1450	self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
2520.4.34 by Aaron Bentley Add signature support	1451	try:
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	1452	from ..testament import Testament
2520.4.34 by Aaron Bentley Add signature support	1453	# monkey patch gpg signing mechanism
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1454	breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
6393.1.1 by Vincent Ladeuil Provides MemoryStack to simplify configuration setup in tests	1455	new_config = test_commit.MustSignConfig()
6351.3.3 by Jelmer Vernooij Convert more stuff to use config stacks.	1456	commit.Commit(config_stack=new_config).commit(message="base",
2520.4.34 by Aaron Bentley Add signature support	1457	allow_pointless=True,
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1458	rev_id=b'B',
2520.4.34 by Aaron Bentley Add signature support	1459	working_tree=tree_a)
2520.4.34 by Aaron Bentley Add signature support	1460	def sign(text):
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1461	return breezy.gpg.LoopbackGPGStrategy(None).sign(text)
6973.7.10 by Jelmer Vernooĳ More fixes.	1462	self.assertTrue(repo_a.has_signature_for_revision_id(b'B'))
2520.4.34 by Aaron Bentley Add signature support	1463	finally:
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1464	breezy.gpg.GPGStrategy = oldstrategy
2520.4.34 by Aaron Bentley Add signature support	1465	tree_b = self.make_branch_and_tree('tree_b')
2520.4.34 by Aaron Bentley Add signature support	1466	repo_b = tree_b.branch.repository
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1467	s = BytesIO()
2520.4.136 by Aaron Bentley Fix format strings	1468	serializer = BundleSerializerV4('4')
7029.2.2 by Jelmer Vernooĳ Fix two tests.	1469	with tree_a.lock_read():
7029.2.2 by Jelmer Vernooĳ Fix two tests.	1470	serializer.write_bundle(tree_a.branch.repository, b'B', b'null:', s)
2520.4.34 by Aaron Bentley Add signature support	1471	s.seek(0)
2520.4.34 by Aaron Bentley Add signature support	1472	install_bundle(repo_b, serializer.read(s))
6973.7.10 by Jelmer Vernooĳ More fixes.	1473	self.assertTrue(repo_b.has_signature_for_revision_id(b'B'))
	1474	self.assertEqual(repo_b.get_signature_text(b'B'),
	1475	repo_a.get_signature_text(b'B'))
2520.4.100 by Aaron Bentley Fix repeat signature installs	1476	s.seek(0)
	1477	# ensure repeat installs are harmless
	1478	install_bundle(repo_b, serializer.read(s))
2520.4.34 by Aaron Bentley Add signature support	1479
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1480
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1481	class V4_2aBundleTester(V4BundleTester):
	1482
	1483	def bzrdir_format(self):
	1484	return '2a'
	1485
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	1486	def get_invalid_bundle(self, base_rev_id, rev_id):
	1487	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1488	Munge the text so that it's invalid.
	1489
	1490	:return: The in-memory bundle
	1491	"""
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	1492	from ..bundle import serializer
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	1493	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1494	new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	1495	# We are going to be replacing some text to set the executable bit on a
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	1496	# file. Make sure the text replacement actually works correctly.
6973.7.10 by Jelmer Vernooĳ More fixes.	1497	self.assertContainsRe(new_text, b'(?m)B244\n\ni 1\n<inventory')
	1498	new_text = new_text.replace(b'<file file_id="exe-1"',
	1499	b'<file executable="y" file_id="exe-1"')
	1500	new_text = new_text.replace(b'B244', b'B259')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1501	bundle_txt = BytesIO()
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	1502	bundle_txt.write(serializer._get_bundle_header('4'))
6973.7.5 by Jelmer Vernooĳ s/file/open.	1503	bundle_txt.write(b'\n')
6973.7.10 by Jelmer Vernooĳ More fixes.	1504	bundle_txt.write(bz2.compress(new_text))
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	1505	bundle_txt.seek(0)
	1506	bundle = read_bundle(bundle_txt)
	1507	self.valid_apply_bundle(base_rev_id, bundle)
	1508	return bundle
	1509
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1510	def make_merged_branch(self):
4543.2.6 by John Arbash Meinel redefinning self.bzrdir_format() automatically sets the default format.	1511	builder = self.make_branch_builder('source')
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1512	builder.start_series()
6816.2.1 by Jelmer Vernooĳ Migrate some build_snapshot code over to having revision_id as keyword argument.	1513	builder.build_snapshot(None, [
6973.7.10 by Jelmer Vernooĳ More fixes.	1514	('add', ('', b'root-id', 'directory', None)),
6973.7.10 by Jelmer Vernooĳ More fixes.	1515	('add', ('file', b'file-id', 'file', b'original content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1516	], revision_id=b'a@cset-0-1')
6973.7.10 by Jelmer Vernooĳ More fixes.	1517	builder.build_snapshot([b'a@cset-0-1'], [
6973.7.10 by Jelmer Vernooĳ More fixes.	1518	('modify', ('file', b'new-content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1519	], revision_id=b'a@cset-0-2a')
6973.7.10 by Jelmer Vernooĳ More fixes.	1520	builder.build_snapshot([b'a@cset-0-1'], [
6973.7.10 by Jelmer Vernooĳ More fixes.	1521	('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1522	], revision_id=b'a@cset-0-2b')
6973.7.10 by Jelmer Vernooĳ More fixes.	1523	builder.build_snapshot([b'a@cset-0-2a', b'a@cset-0-2b'], [
6973.7.10 by Jelmer Vernooĳ More fixes.	1524	('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1525	], revision_id=b'a@cset-0-3')
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1526	builder.finish_series()
	1527	self.b1 = builder.get_branch()
	1528	self.b1.lock_read()
	1529	self.addCleanup(self.b1.unlock)
	1530
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1531	def make_bundle_just_inventories(self, base_revision_id,
	1532	target_revision_id,
	1533	revision_ids):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1534	sio = BytesIO()
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1535	writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1536	self.b1.repository, sio)
	1537	writer.bundle.begin()
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1538	writer._add_inventory_mpdiffs_from_serializer(revision_ids)
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1539	writer.bundle.end()
	1540	sio.seek(0)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1541	return sio
	1542
	1543	def test_single_inventory_multiple_parents_as_xml(self):
	1544	self.make_merged_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1545	sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
6973.7.10 by Jelmer Vernooĳ More fixes.	1546	[b'a@cset-0-3'])
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1547	reader = v4.BundleReader(sio, stream_input=False)
	1548	records = list(reader.iter_records())
	1549	self.assertEqual(1, len(records))
	1550	(bytes, metadata, repo_kind, revision_id,
	1551	file_id) = records[0]
	1552	self.assertIs(None, file_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	1553	self.assertEqual(b'a@cset-0-3', revision_id)
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1554	self.assertEqual('inventory', repo_kind)
6973.7.10 by Jelmer Vernooĳ More fixes.	1555	self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
	1556	b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
	1557	b'storage_kind': b'mpdiff',
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1558	}, metadata)
	1559	# We should have an mpdiff that takes some lines from both parents.
	1560	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1561	b'i 1\n'
	1562	b'<inventory format="10" revision_id="a@cset-0-3">\n'
	1563	b'\n'
	1564	b'c 0 1 1 2\n'
	1565	b'c 1 3 3 2\n', bytes)
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1566
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1567	def test_single_inv_no_parents_as_xml(self):
	1568	self.make_merged_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1569	sio = self.make_bundle_just_inventories(b'null:', b'a@cset-0-1',
6973.7.10 by Jelmer Vernooĳ More fixes.	1570	[b'a@cset-0-1'])
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1571	reader = v4.BundleReader(sio, stream_input=False)
	1572	records = list(reader.iter_records())
	1573	self.assertEqual(1, len(records))
	1574	(bytes, metadata, repo_kind, revision_id,
	1575	file_id) = records[0]
	1576	self.assertIs(None, file_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	1577	self.assertEqual(b'a@cset-0-1', revision_id)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1578	self.assertEqual('inventory', repo_kind)
6973.7.10 by Jelmer Vernooĳ More fixes.	1579	self.assertEqual({b'parents': [],
	1580	b'sha1': b'a13f42b142d544aac9b085c42595d304150e31a2',
	1581	b'storage_kind': b'mpdiff',
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1582	}, metadata)
	1583	# We should have an mpdiff that takes some lines from both parents.
	1584	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1585	b'i 4\n'
	1586	b'<inventory format="10" revision_id="a@cset-0-1">\n'
	1587	b'<directory file_id="root-id" name=""'
	1588	b' revision="a@cset-0-1" />\n'
	1589	b'<file file_id="file-id" name="file" parent_id="root-id"'
	1590	b' revision="a@cset-0-1"'
	1591	b' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
	1592	b' text_size="17" />\n'
	1593	b'</inventory>\n'
	1594	b'\n', bytes)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1595
	1596	def test_multiple_inventories_as_xml(self):
	1597	self.make_merged_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1598	sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
6973.7.10 by Jelmer Vernooĳ More fixes.	1599	[b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'])
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1600	reader = v4.BundleReader(sio, stream_input=False)
	1601	records = list(reader.iter_records())
	1602	self.assertEqual(3, len(records))
	1603	revision_ids = [rev_id for b, m, k, rev_id, f in records]
6973.7.10 by Jelmer Vernooĳ More fixes.	1604	self.assertEqual([b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'],
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1605	revision_ids)
	1606	metadata_2a = records[0][1]
6973.7.10 by Jelmer Vernooĳ More fixes.	1607	self.assertEqual({b'parents': [b'a@cset-0-1'],
	1608	b'sha1': b'1e105886d62d510763e22885eec733b66f5f09bf',
	1609	b'storage_kind': b'mpdiff',
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1610	}, metadata_2a)
	1611	metadata_2b = records[1][1]
6973.7.10 by Jelmer Vernooĳ More fixes.	1612	self.assertEqual({b'parents': [b'a@cset-0-1'],
	1613	b'sha1': b'f03f12574bdb5ed2204c28636c98a8547544ccd8',
	1614	b'storage_kind': b'mpdiff',
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1615	}, metadata_2b)
	1616	metadata_3 = records[2][1]
6973.7.10 by Jelmer Vernooĳ More fixes.	1617	self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
	1618	b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
	1619	b'storage_kind': b'mpdiff',
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1620	}, metadata_3)
	1621	bytes_2a = records[0][0]
	1622	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1623	b'i 1\n'
	1624	b'<inventory format="10" revision_id="a@cset-0-2a">\n'
	1625	b'\n'
	1626	b'c 0 1 1 1\n'
	1627	b'i 1\n'
	1628	b'<file file_id="file-id" name="file" parent_id="root-id"'
	1629	b' revision="a@cset-0-2a"'
	1630	b' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
	1631	b' text_size="12" />\n'
	1632	b'\n'
	1633	b'c 0 3 3 1\n', bytes_2a)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1634	bytes_2b = records[1][0]
	1635	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1636	b'i 1\n'
	1637	b'<inventory format="10" revision_id="a@cset-0-2b">\n'
	1638	b'\n'
	1639	b'c 0 1 1 2\n'
	1640	b'i 1\n'
	1641	b'<file file_id="file2-id" name="other-file" parent_id="root-id"'
	1642	b' revision="a@cset-0-2b"'
	1643	b' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
	1644	b' text_size="14" />\n'
	1645	b'\n'
	1646	b'c 0 3 4 1\n', bytes_2b)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1647	bytes_3 = records[2][0]
	1648	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1649	b'i 1\n'
	1650	b'<inventory format="10" revision_id="a@cset-0-3">\n'
	1651	b'\n'
	1652	b'c 0 1 1 2\n'
	1653	b'c 1 3 3 2\n', bytes_3)
4543.2.7 by John Arbash Meinel It turns out CHKSerializer was inheriting from xml5	1654
	1655	def test_creating_bundle_preserves_chk_pages(self):
	1656	self.make_merged_branch()
6653.6.1 by Jelmer Vernooĳ Rename a number of attributes from bzrdir to controldir.	1657	target = self.b1.controldir.sprout('target',
6973.5.2 by Jelmer Vernooĳ Add more bees.	1658	revision_id=b'a@cset-0-2a').open_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1659	bundle_txt, rev_ids = self.create_bundle_text(b'a@cset-0-2a',
6973.7.10 by Jelmer Vernooĳ More fixes.	1660	b'a@cset-0-3')
7029.2.1 by Jelmer Vernooĳ don't make assumptions about the order in which revision ids are returned by write_bundle.	1661	self.assertEqual(set([b'a@cset-0-2b', b'a@cset-0-3']), set(rev_ids))
4543.2.7 by John Arbash Meinel It turns out CHKSerializer was inheriting from xml5	1662	bundle = read_bundle(bundle_txt)
	1663	target.lock_write()
	1664	self.addCleanup(target.unlock)
	1665	install_bundle(target.repository, bundle)
7018.3.10 by Jelmer Vernooĳ Consistent return values in PreviewTree.list_files.	1666	inv1 = next(self.b1.repository.inventories.get_record_stream([
	1667	(b'a@cset-0-3',)], 'unordered',
	1668	True)).get_bytes_as('fulltext')
	1669	inv2 = next(target.repository.inventories.get_record_stream([
	1670	(b'a@cset-0-3',)], 'unordered',
	1671	True)).get_bytes_as('fulltext')
4543.2.7 by John Arbash Meinel It turns out CHKSerializer was inheriting from xml5	1672	self.assertEqualDiff(inv1, inv2)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1673
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1674
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1675	class MungedBundleTester(object):
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1676
	1677	def build_test_bundle(self):
	1678	wt = self.make_branch_and_tree('b1')
	1679
	1680	self.build_tree(['b1/one'])
	1681	wt.add('one')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1682	wt.commit('add one', rev_id=b'a@cset-0-1')
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1683	self.build_tree(['b1/two'])
	1684	wt.add('two')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1685	wt.commit('add two', rev_id=b'a@cset-0-2',
6973.12.5 by Jelmer Vernooĳ Add some u's for revision property names.	1686	revprops={u'branch-nick':'test'})
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1687
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1688	bundle_txt = BytesIO()
6973.7.10 by Jelmer Vernooĳ More fixes.	1689	rev_ids = write_bundle(wt.branch.repository, b'a@cset-0-2',
	1690	b'a@cset-0-1', bundle_txt, self.format)
	1691	self.assertEqual({b'a@cset-0-2'}, set(rev_ids))
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1692	bundle_txt.seek(0, 0)
	1693	return bundle_txt
	1694
	1695	def check_valid(self, bundle):
	1696	"""Check that after whatever munging, the final object is valid."""
6973.7.10 by Jelmer Vernooĳ More fixes.	1697	self.assertEqual([b'a@cset-0-2'],
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1698	[r.revision_id for r in bundle.real_revisions])
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1699
	1700	def test_extra_whitespace(self):
	1701	bundle_txt = self.build_test_bundle()
	1702
	1703	# Seek to the end of the file
	1704	# Adding one extra newline used to give us
	1705	# TypeError: float() argument must be a string or a number
	1706	bundle_txt.seek(0, 2)
6973.7.5 by Jelmer Vernooĳ s/file/open.	1707	bundle_txt.write(b'\n')
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1708	bundle_txt.seek(0)
	1709
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1710	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1711	self.check_valid(bundle)
	1712
	1713	def test_extra_whitespace_2(self):
	1714	bundle_txt = self.build_test_bundle()
	1715
	1716	# Seek to the end of the file
	1717	# Adding two extra newlines used to give us
	1718	# MalformedPatches: The first line of all patches should be ...
	1719	bundle_txt.seek(0, 2)
6973.7.5 by Jelmer Vernooĳ s/file/open.	1720	bundle_txt.write(b'\n\n')
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1721	bundle_txt.seek(0)
	1722
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1723	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1724	self.check_valid(bundle)
	1725
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1726
4241.14.13 by Vincent Ladeuil Some more cleanup.	1727	class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1728
	1729	format = '0.9'
	1730
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1731	def test_missing_trailing_whitespace(self):
	1732	bundle_txt = self.build_test_bundle()
	1733
	1734	# Remove a trailing newline, it shouldn't kill the parser
	1735	raw = bundle_txt.getvalue()
	1736	# The contents of the bundle don't have to be this, but this
	1737	# test is concerned with the exact case where the serializer
	1738	# creates a blank line at the end, and fails if that
	1739	# line is stripped
6973.7.10 by Jelmer Vernooĳ More fixes.	1740	self.assertEqual(b'\n\n', raw[-2:])
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1741	bundle_txt = BytesIO(raw[:-1])
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1742
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1743	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1744	self.check_valid(bundle)
1793.3.14 by John Arbash Meinel Actually fix the bug with missing trailing newline bug #49182	1745
1793.3.16 by John Arbash Meinel Add tests to ensure that we gracefully handle opening and trailing non-bundle text.	1746	def test_opening_text(self):
	1747	bundle_txt = self.build_test_bundle()
	1748
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1749	bundle_txt = BytesIO(
	1750	b"Some random\nemail comments\n" + bundle_txt.getvalue())
1793.3.16 by John Arbash Meinel Add tests to ensure that we gracefully handle opening and trailing non-bundle text.	1751
	1752	bundle = read_bundle(bundle_txt)
	1753	self.check_valid(bundle)
	1754
	1755	def test_trailing_text(self):
	1756	bundle_txt = self.build_test_bundle()
	1757
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1758	bundle_txt = BytesIO(
	1759	bundle_txt.getvalue() + b"Some trailing\nrandom\ntext\n")
1793.3.16 by John Arbash Meinel Add tests to ensure that we gracefully handle opening and trailing non-bundle text.	1760
	1761	bundle = read_bundle(bundle_txt)
	1762	self.check_valid(bundle)
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1763
	1764
4241.14.13 by Vincent Ladeuil Some more cleanup.	1765	class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1766
2520.4.136 by Aaron Bentley Fix format strings	1767	format = '4'
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1768
	1769
4241.14.13 by Vincent Ladeuil Some more cleanup.	1770	class TestBundleWriterReader(tests.TestCase):
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1771
	1772	def test_roundtrip_record(self):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1773	fileobj = BytesIO()
2520.4.72 by Aaron Bentley Rename format to 4alpha	1774	writer = v4.BundleWriter(fileobj)
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1775	writer.begin()
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1776	writer.add_info_record({b'foo': b'bar'})
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1777	writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1778	b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1779	writer.end()
	1780	fileobj.seek(0)
2520.4.148 by Aaron Bentley Updates from review	1781	reader = v4.BundleReader(fileobj, stream_input=True)
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1782	record_iter = reader.iter_records()
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1783	record = next(record_iter)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1784	self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1785	'info', None, None), record)
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1786	record = next(record_iter)
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1787	self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1788	b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1789	record)
	1790
	1791	def test_roundtrip_record_memory_hungry(self):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1792	fileobj = BytesIO()
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1793	writer = v4.BundleWriter(fileobj)
	1794	writer.begin()
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1795	writer.add_info_record({b'foo': b'bar'})
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1796	writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1797	b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1798	writer.end()
	1799	fileobj.seek(0)
2520.4.148 by Aaron Bentley Updates from review	1800	reader = v4.BundleReader(fileobj, stream_input=False)
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1801	record_iter = reader.iter_records()
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1802	record = next(record_iter)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1803	self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
2520.4.95 by Aaron Bentley Add support for header/info records	1804	'info', None, None), record)
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1805	record = next(record_iter)
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1806	self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
6973.7.10 by Jelmer Vernooĳ More fixes.	1807	b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
2520.4.95 by Aaron Bentley Add support for header/info records	1808	record)
	1809
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1810	def test_encode_name(self):
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1811	self.assertEqual(b'revision/rev1',
6973.7.10 by Jelmer Vernooĳ More fixes.	1812	v4.BundleWriter.encode_name('revision', b'rev1'))
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1813	self.assertEqual(b'file/rev//1/file-id-1',
6973.7.10 by Jelmer Vernooĳ More fixes.	1814	v4.BundleWriter.encode_name('file', b'rev/1', b'file-id-1'))
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1815	self.assertEqual(b'info',
2520.4.95 by Aaron Bentley Add support for header/info records	1816	v4.BundleWriter.encode_name('info', None, None))
	1817
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1818	def test_decode_name(self):
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1819	self.assertEqual(('revision', b'rev1', None),
	1820	v4.BundleReader.decode_name(b'revision/rev1'))
	1821	self.assertEqual(('file', b'rev/1', b'file-id-1'),
	1822	v4.BundleReader.decode_name(b'file/rev//1/file-id-1'))
2520.4.95 by Aaron Bentley Add support for header/info records	1823	self.assertEqual(('info', None, None),
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1824	v4.BundleReader.decode_name(b'info'))
2520.4.131 by Aaron Bentley Raise BadBundle for records with wrong number of names	1825
	1826	def test_too_many_names(self):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1827	fileobj = BytesIO()
2520.4.131 by Aaron Bentley Raise BadBundle for records with wrong number of names	1828	writer = v4.BundleWriter(fileobj)
	1829	writer.begin()
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1830	writer.add_info_record({b'foo': b'bar'})
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1831	writer._container.add_bytes_record(b'blah', [(b'two', ), (b'names', )])
2520.4.131 by Aaron Bentley Raise BadBundle for records with wrong number of names	1832	writer.end()
	1833	fileobj.seek(0)
	1834	record_iter = v4.BundleReader(fileobj).iter_records()
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1835	record = next(record_iter)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1836	self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
2520.4.131 by Aaron Bentley Raise BadBundle for records with wrong number of names	1837	'info', None, None), record)
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1838	self.assertRaises(errors.BadBundle, next, record_iter)
3251.4.11 by Aaron Bentley Fix wrong local lookups	1839
3251.4.11 by Aaron Bentley Fix wrong local lookups	1840
4241.14.13 by Vincent Ladeuil Some more cleanup.	1841	class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
3251.4.11 by Aaron Bentley Fix wrong local lookups	1842
	1843	def test_read_mergeable_skips_local(self):
	1844	"""A local bundle named like the URL should not be read.
	1845	"""
	1846	out, wt = test_read_bundle.create_bundle_file(self)
	1847	class FooService(object):
	1848	"""A directory service that always returns source"""
	1849
	1850	def look_up(self, name, url):
	1851	return 'source'
3251.4.12 by Aaron Bentley Updates from review	1852	directories.register('foo:', FooService, 'Testing directory service')
4985.2.1 by Vincent Ladeuil Deploy addAttrCleanup on the whole test suite.	1853	self.addCleanup(directories.remove, 'foo:')
3251.4.11 by Aaron Bentley Fix wrong local lookups	1854	self.build_tree_contents([('./foo:bar', out.getvalue())])
	1855	self.assertRaises(errors.NotABundle, read_mergeable_from_url,
	1856	'foo:bar')
3703.2.1 by Andrew Bennetts Allow ConnectionReset to propagate from read_mergeable_from_url.	1857
4547.2.2 by Andrew Bennetts Add test for read_mergeable_from_transport raising NotABundle when TooManyRedirections happens.	1858	def test_infinite_redirects_are_not_a_bundle(self):
	1859	"""If a URL causes TooManyRedirections then NotABundle is raised.
	1860	"""
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	1861	from .blackbox.test_push import RedirectingMemoryServer
4547.2.2 by Andrew Bennetts Add test for read_mergeable_from_transport raising NotABundle when TooManyRedirections happens.	1862	server = RedirectingMemoryServer()
4659.1.2 by Robert Collins Refactor creation and shutdown of test servers to use a common helper,	1863	self.start_server(server)
4547.2.2 by Andrew Bennetts Add test for read_mergeable_from_transport raising NotABundle when TooManyRedirections happens.	1864	url = server.get_url() + 'infinite-loop'
	1865	self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
	1866
3703.2.1 by Andrew Bennetts Allow ConnectionReset to propagate from read_mergeable_from_url.	1867	def test_smart_server_connection_reset(self):
	1868	"""If a smart server connection fails during the attempt to read a
	1869	bundle, then the ConnectionReset error should be propagated.
	1870	"""
	1871	# Instantiate a server that will provoke a ConnectionReset
6206.1.9 by Vincent Ladeuil Simpler fix for test_smart_server_connection_reset re-using more of the existing test server infrastructure.	1872	sock_server = DisconnectingServer()
4659.1.2 by Robert Collins Refactor creation and shutdown of test servers to use a common helper,	1873	self.start_server(sock_server)
3750.1.3 by Vincent Ladeuil Cleanups.	1874	# We don't really care what the url is since the server will close the
3750.1.3 by Vincent Ladeuil Cleanups.	1875	# connection without interpreting it
3703.2.1 by Andrew Bennetts Allow ConnectionReset to propagate from read_mergeable_from_url.	1876	url = sock_server.get_url()
	1877	self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
6206.1.9 by Vincent Ladeuil Simpler fix for test_smart_server_connection_reset re-using more of the existing test server infrastructure.	1878
	1879
6621.25.1 by Martin Adapt to SocketServer module name change	1880	class DisconnectingHandler(socketserver.BaseRequestHandler):
6206.1.9 by Vincent Ladeuil Simpler fix for test_smart_server_connection_reset re-using more of the existing test server infrastructure.	1881	"""A request handler that immediately closes any connection made to it."""
	1882
	1883	def handle(self):
	1884	self.request.close()
	1885
	1886
	1887	class DisconnectingServer(test_server.TestingTCPServerInAThread):
	1888
	1889	def __init__(self):
	1890	super(DisconnectingServer, self).__init__(
	1891	('127.0.0.1', 0),
	1892	test_server.TestingTCPServer,
	1893	DisconnectingHandler)
	1894
	1895	def get_url(self):
	1896	"""Return the url of the server"""
	1897	return "bzr://%s:%d/" % self.server.server_address