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

: (revision 7397)

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