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

: (revision 7322)

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	)
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	35	from ..bundle.apply_bundle import install_bundle, merge_bundle
	36	from ..bundle.bundle_data import BundleTree
	37	from ..bundle.serializer import write_bundle, read_bundle, v09, v4
	38	from ..bundle.serializer.v08 import BundleSerializerV08
	39	from ..bundle.serializer.v09 import BundleSerializerV09
	40	from ..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	)
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	46	from ..transform import TreeTransform
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)
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.	514	old.lock_read()
	515	new.lock_read()
	516	try:
	517	# Check that there aren't any inventory level changes
	518	delta = new.changes_from(old)
	519	self.assertFalse(delta.has_changed(),
	520	'Revision %s not copied correctly.'
	521	% (ancestor,))
	522
	523	# Now check that the file contents are all correct
6825.5.1 by Jelmer Vernooĳ Implement Tree.all_versioned_paths.	524	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.	525	try:
6825.5.1 by Jelmer Vernooĳ Implement Tree.all_versioned_paths.	526	old_file = old.get_file(path)
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	527	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.	528	continue
6809.4.21 by Jelmer Vernooĳ Fix long lines.	529	self.assertEqual(
7143.15.2 by Jelmer Vernooĳ Run autopep8.	530	old_file.read(), new.get_file(path).read())
3350.6.4 by Robert Collins First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.	531	finally:
	532	new.unlock()
	533	old.unlock()
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	534	if not _mod_revision.is_null(rev_id):
6165.4.19 by Jelmer Vernooij Avoid all iter_reverse_revision_history calls.	535	tree.branch.generate_revision_history(rev_id)
1185.82.44 by Aaron Bentley Switch to merge_changeset in test suite	536	tree.update()
1852.10.3 by Robert Collins Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.	537	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.	538	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.	539	'Working tree has modifications: %s' % delta)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	540	return tree
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	541
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	542	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.	543	"""Get the base revision, apply the changes, and make
	544	sure everything matches the builtin branch.
	545	"""
1185.82.17 by Aaron Bentley More API updates	546	to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
3146.4.11 by Aaron Bentley Fix lock errors in bundle tests	547	to_tree.lock_write()
	548	try:
	549	self._valid_apply_bundle(base_rev_id, info, to_tree)
	550	finally:
	551	to_tree.unlock()
	552
	553	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	554	original_parents = to_tree.get_parent_ids()
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	555	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.	556	original_parents = to_tree.get_parent_ids()
1185.82.41 by Aaron Bentley More work on installing changesets	557	self.assertIs(repository.has_revision(base_rev_id), True)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	558	for rev in info.real_revisions:
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	559	self.assertTrue(not repository.has_revision(rev.revision_id),
	560	'Revision {%s} present before applying bundle'
	561	% rev.revision_id)
4241.14.13 by Vincent Ladeuil Some more cleanup.	562	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.	563
	564	for rev in info.real_revisions:
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	565	self.assertTrue(repository.has_revision(rev.revision_id),
	566	'Missing revision {%s} after applying bundle'
	567	% rev.revision_id)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	568
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	569	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.	570	# 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.	571
1908.6.4 by Robert Collins Update to replaced parent checking api bzrlib/merge.py	572	self.assertEqual(original_parents + [info.target],
6614.1.1 by Vincent Ladeuil Fix assert_ being deprecated by using assertTrue.	573	to_tree.get_parent_ids())
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	574
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	575	rev = info.real_revisions[-1]
1185.82.17 by Aaron Bentley More API updates	576	base_tree = self.b1.repository.revision_tree(rev.revision_id)
1185.82.17 by Aaron Bentley More API updates	577	to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	578
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	579	# 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.	580	# we might also check the working tree.
	581
	582	base_files = list(base_tree.list_files())
	583	to_files = list(to_tree.list_files())
	584	self.assertEqual(len(base_files), len(to_files))
1185.82.66 by Aaron Bentley Handle new executable files	585	for base_file, to_file in zip(base_files, to_files):
1185.82.66 by Aaron Bentley Handle new executable files	586	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.	587
7143.19.5 by Jelmer Vernooĳ Undo removal of kind.	588	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.	589	# Check that the meta information is the same
7143.16.21 by Jelmer Vernooĳ Fix regressions.	590	self.assertEqual(
7143.16.21 by Jelmer Vernooĳ Fix regressions.	591	base_tree.get_file_size(path),
7143.19.5 by Jelmer Vernooĳ Undo removal of kind.	592	to_tree.get_file_size(to_tree.id2path(entry.file_id)))
7143.16.21 by Jelmer Vernooĳ Fix regressions.	593	self.assertEqual(
7143.19.5 by Jelmer Vernooĳ Undo removal of kind.	594	base_tree.get_file_sha1(path, entry.file_id),
7143.19.5 by Jelmer Vernooĳ Undo removal of kind.	595	to_tree.get_file_sha1(to_tree.id2path(entry.file_id)))
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	596	# Check that the contents are the same
	597	# This is pretty expensive
	598	# self.assertEqual(base_tree.get_file(fileid).read(),
	599	# 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.	600
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	601	def test_bundle(self):
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	602	self.tree1 = self.make_branch_and_tree('b1')
1185.82.14 by Aaron Bentley API updates	603	self.b1 = self.tree1.branch
0.5.78 by John Arbash Meinel Working on test cases, starting with the empty project issues.	604
6855.3.1 by Jelmer Vernooĳ Several more fixes.	605	self.build_tree_contents([('b1/one', b'one\n')])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	606	self.tree1.add('one', b'one-id')
	607	self.tree1.set_root_id(b'root-id')
	608	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.	609
6973.7.8 by Jelmer Vernooĳ Fix more tests.	610	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.	611
	612	# Make sure we can handle files with spaces, tabs, other
	613	# bogus characters
0.5.82 by John Arbash Meinel Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids	614	self.build_tree([
7143.15.2 by Jelmer Vernooĳ Run autopep8.	615	'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.	616	])
6855.3.1 by Jelmer Vernooĳ Several more fixes.	617	self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
6855.3.1 by Jelmer Vernooĳ Several more fixes.	618	('b1/dir/nolastnewline.txt', b'bloop')])
1185.82.66 by Aaron Bentley Handle new executable files	619	tt = TreeTransform(self.tree1)
6973.7.10 by Jelmer Vernooĳ More fixes.	620	tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], b'exe-1', True)
1185.82.66 by Aaron Bentley Handle new executable files	621	tt.apply()
2520.4.84 by Aaron Bentley Fix heisenbug record-rewriting test	622	# have to fix length of file-id so that we can predictably rewrite
	623	# a (length-prefixed) record containing it later.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	624	self.tree1.add('with space.txt', b'withspace-id')
1185.82.14 by Aaron Bentley API updates	625	self.tree1.add([
7143.15.2 by Jelmer Vernooĳ Run autopep8.	626	'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.	627	])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	628	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.	629
6973.7.8 by Jelmer Vernooĳ Fix more tests.	630	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.	631
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	632	# Check a rollup bundle
6973.7.10 by Jelmer Vernooĳ More fixes.	633	bundle = self.get_valid_bundle(b'null:', b'a@cset-0-2')
0.5.84 by John Arbash Meinel (broken) problem with removes.	634
0.5.84 by John Arbash Meinel (broken) problem with removes.	635	# Now delete entries
1185.82.21 by Aaron Bentley Stop using deprecated function	636	self.tree1.remove(
7143.15.2 by Jelmer Vernooĳ Run autopep8.	637	['sub/sub/nonempty.txt', 'sub/sub/emptyfile.txt', 'sub/sub'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	638	])
1185.82.68 by Aaron Bentley Handle execute bit on modified files	639	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	640	trans_id = tt.trans_id_tree_path('executable')
1185.82.68 by Aaron Bentley Handle execute bit on modified files	641	tt.set_executability(False, trans_id)
	642	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	643	self.tree1.commit('removed', rev_id=b'a@cset-0-3')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	644
6973.7.8 by Jelmer Vernooĳ Fix more tests.	645	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.	646	self.assertRaises((errors.TestamentMismatch,
7143.15.2 by Jelmer Vernooĳ Run autopep8.	647	errors.VersionedFileInvalidChecksum,
	648	errors.BadBundle), self.get_invalid_bundle,
	649	b'a@cset-0-2', b'a@cset-0-3')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	650	# Check a rollup bundle
6973.7.8 by Jelmer Vernooĳ Fix more tests.	651	bundle = self.get_valid_bundle(b'null:', b'a@cset-0-3')
0.5.84 by John Arbash Meinel (broken) problem with removes.	652
0.5.84 by John Arbash Meinel (broken) problem with removes.	653	# Now move the directory
1185.82.19 by Aaron Bentley More API updates	654	self.tree1.rename_one('dir', 'sub/dir')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	655	self.tree1.commit('rename dir', rev_id=b'a@cset-0-4')
0.5.84 by John Arbash Meinel (broken) problem with removes.	656
6973.7.8 by Jelmer Vernooĳ Fix more tests.	657	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	658	# Check a rollup bundle
6973.7.8 by Jelmer Vernooĳ Fix more tests.	659	bundle = self.get_valid_bundle(b'null:', b'a@cset-0-4')
0.5.84 by John Arbash Meinel (broken) problem with removes.	660
0.5.87 by John Arbash Meinel Handling international characters, added more test cases.	661	# Modified files
7143.15.2 by Jelmer Vernooĳ Run autopep8.	662	with open('b1/sub/dir/WithCaps.txt', 'ab') as f:
	663	f.write(b'\nAdding some text\n')
	664	with open('b1/sub/dir/ pre space', 'ab') as f:
	665	f.write(
	666	b'\r\nAdding some\r\nDOS format lines\r\n')
	667	with open('b1/sub/dir/nolastnewline.txt', 'ab') as f:
	668	f.write(b'\n')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	669	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.	670	'sub/ start space')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	671	self.tree1.commit('Modified files', rev_id=b'a@cset-0-5')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	672	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.	673
1185.82.70 by Aaron Bentley Handle renamed files better	674	self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
	675	self.tree1.rename_one('with space.txt', 'WithCaps.txt')
	676	self.tree1.rename_one('temp', 'with space.txt')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	677	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.	678	verbose=False)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	679	bundle = self.get_valid_bundle(b'a@cset-0-5', b'a@cset-0-6')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	680	other = self.get_checkout(b'a@cset-0-5')
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	681	tree1_inv = get_inventory_text(self.tree1.branch.repository,
6973.7.8 by Jelmer Vernooĳ Fix more tests.	682	b'a@cset-0-5')
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	683	tree2_inv = get_inventory_text(other.branch.repository,
6973.7.8 by Jelmer Vernooĳ Fix more tests.	684	b'a@cset-0-5')
1910.2.54 by Aaron Bentley Implement testament format 3 strict	685	self.assertEqualDiff(tree1_inv, tree2_inv)
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	686	other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	687	other.commit('rename file', rev_id=b'a@cset-0-6b')
1551.15.72 by Aaron Bentley remove builtins._merge_helper	688	self.tree1.merge_from_branch(other.branch)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	689	self.tree1.commit(u'Merge', rev_id=b'a@cset-0-7',
1185.82.70 by Aaron Bentley Handle renamed files better	690	verbose=False)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	691	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	692
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	693	def _test_symlink_bundle(self, link_name, link_target, new_link_target):
6973.7.8 by Jelmer Vernooĳ Fix more tests.	694	link_id = b'link-1'
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	695
5967.12.1 by Martin Pool Move all test features into bzrlib.tests.features	696	self.requireFeature(features.SymlinkFeature)
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	697	self.tree1 = self.make_branch_and_tree('b1')
1185.82.87 by Aaron Bentley Got symlink adding working	698	self.b1 = self.tree1.branch
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	699
1185.82.87 by Aaron Bentley Got symlink adding working	700	tt = TreeTransform(self.tree1)
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	701	tt.new_symlink(link_name, tt.root, link_target, link_id)
1185.82.87 by Aaron Bentley Got symlink adding working	702	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	703	self.tree1.commit('add symlink', rev_id=b'l@cset-0-1')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	704	bundle = self.get_valid_bundle(b'null:', b'l@cset-0-1')
6809.1.1 by Martin Apply 2to3 ws_comma fixer	705	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.	706	# Not all bundle formats supports revision_tree
6973.7.8 by Jelmer Vernooĳ Fix more tests.	707	bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-1')
7143.15.2 by Jelmer Vernooĳ Run autopep8.	708	self.assertEqual(
7143.15.2 by Jelmer Vernooĳ Run autopep8.	709	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.	710
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	711	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	712	trans_id = tt.trans_id_tree_path(link_name)
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	713	tt.adjust_path('link2', tt.root, trans_id)
	714	tt.delete_contents(trans_id)
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	715	tt.create_symlink(new_link_target, trans_id)
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	716	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	717	self.tree1.commit('rename and change symlink', rev_id=b'l@cset-0-2')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	718	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	719	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.	720	# Not all bundle formats supports revision_tree
6973.7.8 by Jelmer Vernooĳ Fix more tests.	721	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.	722	self.assertEqual(new_link_target,
6809.4.7 by Jelmer Vernooĳ Swap arguments for get_symlink_target and kind/stored_kind.	723	bund_tree.get_symlink_target('link2'))
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	724
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	725	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	726	trans_id = tt.trans_id_tree_path('link2')
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	727	tt.delete_contents(trans_id)
	728	tt.create_symlink('jupiter', trans_id)
	729	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	730	self.tree1.commit('just change symlink target', rev_id=b'l@cset-0-3')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	731	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.	732
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	733	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	734	trans_id = tt.trans_id_tree_path('link2')
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	735	tt.delete_contents(trans_id)
	736	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	737	self.tree1.commit('Delete symlink', rev_id=b'l@cset-0-4')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	738	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.	739
	740	def test_symlink_bundle(self):
	741	self._test_symlink_bundle('link', 'bar/foo', 'mars')
	742
	743	def test_unicode_symlink_bundle(self):
5967.12.1 by Martin Pool Move all test features into bzrlib.tests.features	744	self.requireFeature(features.UnicodeFilenameFeature)
4241.14.12 by Vincent Ladeuil Far too many modifications for a single commit, need to restart.	745	self._test_symlink_bundle(u'\N{Euro Sign}link',
	746	u'bar/\N{Euro Sign}foo',
	747	u'mars\N{Euro Sign}')
1185.82.96 by Aaron Bentley Got first binary test passing	748
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	749	def test_binary_bundle(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	750	self.tree1 = self.make_branch_and_tree('b1')
1185.82.96 by Aaron Bentley Got first binary test passing	751	self.b1 = self.tree1.branch
1185.82.96 by Aaron Bentley Got first binary test passing	752	tt = TreeTransform(self.tree1)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	753
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	754	# Add
7143.15.2 by Jelmer Vernooĳ Run autopep8.	755	tt.new_file('file', tt.root, [
7143.15.2 by Jelmer Vernooĳ Run autopep8.	756	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.	757	tt.new_file('file2', tt.root, [b'\x01\n\x02\r\x03\n\x04\r\xff'],
7143.15.2 by Jelmer Vernooĳ Run autopep8.	758	b'binary-2')
1185.82.96 by Aaron Bentley Got first binary test passing	759	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	760	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.	761	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.	762
	763	# Delete
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	764	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	765	trans_id = tt.trans_id_tree_path('file')
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	766	tt.delete_contents(trans_id)
	767	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	768	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.	769	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.	770
	771	# Rename & modify
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	772	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	773	trans_id = tt.trans_id_tree_path('file2')
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	774	tt.adjust_path('file3', tt.root, trans_id)
	775	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	776	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	777	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	778	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.	779	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.	780
	781	# Modify
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	782	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	783	trans_id = tt.trans_id_tree_path('file3')
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	784	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	785	tt.create_file([b'\x00file\rcontents'], trans_id)
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	786	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	787	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.	788	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	789
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	790	# Rollup
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	791	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.	792
1185.82.115 by Aaron Bentley Add test for last-changed special cases	793	def test_last_modified(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	794	self.tree1 = self.make_branch_and_tree('b1')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	795	self.b1 = self.tree1.branch
	796	tt = TreeTransform(self.tree1)
6973.7.10 by Jelmer Vernooĳ More fixes.	797	tt.new_file('file', tt.root, [b'file'], b'file')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	798	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	799	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	800
	801	tt = TreeTransform(self.tree1)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	802	trans_id = tt.trans_id_tree_path('file')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	803	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	804	tt.create_file([b'file2'], trans_id)
1185.82.115 by Aaron Bentley Add test for last-changed special cases	805	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	806	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	807
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	808	other = self.get_checkout(b'a@lmod-0-1')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	809	tt = TreeTransform(other)
6885.1.1 by Jelmer Vernooĳ Get rid of TreeTransform.trans_id_tree_file_id.	810	trans_id = tt.trans_id_tree_path('file2')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	811	tt.delete_contents(trans_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	812	tt.create_file([b'file2'], trans_id)
1185.82.115 by Aaron Bentley Add test for last-changed special cases	813	tt.apply()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	814	other.commit('modify text in another tree', rev_id=b'a@lmod-0-2b')
1551.15.72 by Aaron Bentley remove builtins._merge_helper	815	self.tree1.merge_from_branch(other.branch)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	816	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	817	verbose=False)
6855.4.1 by Jelmer Vernooĳ Yet more bees.	818	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.	819	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	820
	821	def test_hide_history(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	822	self.tree1 = self.make_branch_and_tree('b1')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	823	self.b1 = self.tree1.branch
	824
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'one\n')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	827	self.tree1.add('one')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	828	self.tree1.commit('add file', rev_id=b'a@cset-0-1')
7143.15.2 by Jelmer Vernooĳ Run autopep8.	829	with open('b1/one', 'wb') as f:
7143.15.2 by Jelmer Vernooĳ Run autopep8.	830	f.write(b'two\n')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	831	self.tree1.commit('modify', rev_id=b'a@cset-0-2')
7143.15.2 by Jelmer Vernooĳ Run autopep8.	832	with open('b1/one', 'wb') as f:
7143.15.2 by Jelmer Vernooĳ Run autopep8.	833	f.write(b'three\n')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	834	self.tree1.commit('modify', rev_id=b'a@cset-0-3')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	835	bundle_file = BytesIO()
6973.7.10 by Jelmer Vernooĳ More fixes.	836	rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-3',
	837	b'a@cset-0-1', bundle_file, format=self.format)
	838	self.assertNotContainsRe(bundle_file.getvalue(), b'\btwo\b')
	839	self.assertContainsRe(self.get_raw(bundle_file), b'one')
	840	self.assertContainsRe(self.get_raw(bundle_file), b'three')
2520.4.32 by Aaron Bentley Fix test case	841
2520.4.75 by Aaron Bentley Fix traceback on empty bundles.	842	def test_bundle_same_basis(self):
	843	"""Ensure using the basis as the target doesn't cause an error"""
	844	self.tree1 = self.make_branch_and_tree('b1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	845	self.tree1.commit('add file', rev_id=b'a@cset-0-1')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	846	bundle_file = BytesIO()
6973.7.10 by Jelmer Vernooĳ More fixes.	847	rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-1',
6973.7.10 by Jelmer Vernooĳ More fixes.	848	b'a@cset-0-1', bundle_file)
2520.4.75 by Aaron Bentley Fix traceback on empty bundles.	849
2520.4.32 by Aaron Bentley Fix test case	850	@staticmethod
	851	def get_raw(bundle_file):
	852	return bundle_file.getvalue()
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	853
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	854	def test_unicode_bundle(self):
5967.12.1 by Martin Pool Move all test features into bzrlib.tests.features	855	self.requireFeature(features.UnicodeFilenameFeature)
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	856	# Handle international characters
	857	os.mkdir('b1')
4241.14.13 by Vincent Ladeuil Some more cleanup.	858	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.	859
	860	self.tree1 = self.make_branch_and_tree('b1')
	861	self.b1 = self.tree1.branch
	862
	863	f.write((u'A file\n'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	864	u'With international man of mystery\n'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	865	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.	866	f.close()
	867
6855.4.1 by Jelmer Vernooĳ Yet more bees.	868	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	869	self.tree1.commit(u'i18n commit from William Dod\xe9',
6855.4.1 by Jelmer Vernooĳ Yet more bees.	870	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.	871
	872	# Add
6973.7.10 by Jelmer Vernooĳ More fixes.	873	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.	874
	875	# Modified
3638.3.18 by Vincent Ladeuil Fixed as per jam's review.	876	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.	877	f.write(u'Modified \xb5\n'.encode('utf8'))
	878	f.close()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	879	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.	880
6973.7.10 by Jelmer Vernooĳ More fixes.	881	bundle = self.get_valid_bundle(b'i18n-1', b'i18n-2')
3638.3.16 by Vincent Ladeuil Remove XFAIL from test_unicode_bundle.	882
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	883	# Renamed
3638.3.18 by Vincent Ladeuil Fixed as per jam's review.	884	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.	885	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.	886	committer=u'Erik B\xe5gfors')
	887
6973.7.10 by Jelmer Vernooĳ More fixes.	888	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.	889
	890	# Removed
3638.3.18 by Vincent Ladeuil Fixed as per jam's review.	891	self.tree1.remove([u'B\N{Euro Sign}gfors'])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	892	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.	893
6973.7.10 by Jelmer Vernooĳ More fixes.	894	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.	895
	896	# Rollup
6973.7.10 by Jelmer Vernooĳ More fixes.	897	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.	898
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	899	def test_whitespace_bundle(self):
	900	if sys.platform in ('win32', 'cygwin'):
4241.14.13 by Vincent Ladeuil Some more cleanup.	901	raise tests.TestSkipped('Windows doesn\'t support filenames'
4241.14.13 by Vincent Ladeuil Some more cleanup.	902	' with tabs or trailing spaces')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	903	self.tree1 = self.make_branch_and_tree('b1')
	904	self.b1 = self.tree1.branch
	905
	906	self.build_tree(['b1/trailing space '])
	907	self.tree1.add(['trailing space '])
	908	# TODO: jam 20060701 Check for handling files with '\t' characters
	909	# once we actually support them
	910
	911	# Added
6855.4.1 by Jelmer Vernooĳ Yet more bees.	912	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.	913
6973.7.10 by Jelmer Vernooĳ More fixes.	914	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.	915
	916	# Modified
7143.15.2 by Jelmer Vernooĳ Run autopep8.	917	with open('b1/trailing space ', 'ab') as f:
7143.15.2 by Jelmer Vernooĳ Run autopep8.	918	f.write(b'add some text\n')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	919	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.	920
6973.7.10 by Jelmer Vernooĳ More fixes.	921	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.	922
	923	# Renamed
	924	self.tree1.rename_one('trailing space ', ' start and end space ')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	925	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.	926
6973.7.10 by Jelmer Vernooĳ More fixes.	927	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.	928
	929	# Removed
	930	self.tree1.remove([' start and end space '])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	931	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.	932
6973.7.10 by Jelmer Vernooĳ More fixes.	933	bundle = self.get_valid_bundle(b'white-3', b'white-4')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	934
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	935	# Now test a complet roll-up
6973.7.10 by Jelmer Vernooĳ More fixes.	936	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.	937
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	938	def test_alt_timezone_bundle(self):
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	939	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	940	self.b1 = self.tree1.branch
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	941	builder = treebuilder.TreeBuilder()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	942
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	943	self.tree1.lock_write()
	944	builder.start_tree(self.tree1)
	945	builder.build(['newfile'])
	946	builder.finish_tree()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	947
	948	# Asia/Colombo offset = 5 hours 30 minutes
6855.4.1 by Jelmer Vernooĳ Yet more bees.	949	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	950	timezone=19800, timestamp=1152544886.0)
	951
6973.7.10 by Jelmer Vernooĳ More fixes.	952	bundle = self.get_valid_bundle(b'null:', b'tz-1')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	953
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	954	rev = bundle.revisions[0]
	955	self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
	956	self.assertEqual(19800, rev.timezone)
	957	self.assertEqual(1152544886.0, rev.timestamp)
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	958	self.tree1.unlock()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	959
1910.2.1 by Aaron Bentley Ensure root entry always has a revision	960	def test_bundle_root_id(self):
	961	self.tree1 = self.make_branch_and_tree('b1')
	962	self.b1 = self.tree1.branch
6855.4.1 by Jelmer Vernooĳ Yet more bees.	963	self.tree1.commit('message', rev_id=b'revid1')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	964	bundle = self.get_valid_bundle(b'null:', b'revid1')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	965	tree = self.get_bundle_tree(bundle, b'revid1')
7141.7.1 by Jelmer Vernooĳ Get rid of file_ids in most of Tree.	966	root_revision = tree.get_file_revision(u'')
6973.7.10 by Jelmer Vernooĳ More fixes.	967	self.assertEqual(b'revid1', root_revision)
1910.2.1 by Aaron Bentley Ensure root entry always has a revision	968
1551.14.9 by Aaron Bentley rename get_target_revision to install_revisions	969	def test_install_revisions(self):
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	970	self.tree1 = self.make_branch_and_tree('b1')
	971	self.b1 = self.tree1.branch
6855.4.1 by Jelmer Vernooĳ Yet more bees.	972	self.tree1.commit('message', rev_id=b'rev2a')
6973.5.2 by Jelmer Vernooĳ Add more bees.	973	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'	974	branch2 = self.make_branch('b2')
6973.5.2 by Jelmer Vernooĳ Add more bees.	975	self.assertFalse(branch2.repository.has_revision(b'rev2a'))
1551.14.9 by Aaron Bentley rename get_target_revision to install_revisions	976	target_revision = bundle.install_revisions(branch2.repository)
6973.5.2 by Jelmer Vernooĳ Add more bees.	977	self.assertTrue(branch2.repository.has_revision(b'rev2a'))
6973.5.2 by Jelmer Vernooĳ Add more bees.	978	self.assertEqual(b'rev2a', target_revision)
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	979
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	980	def test_bundle_empty_property(self):
	981	"""Test serializing revision properties with an empty value."""
	982	tree = self.make_branch_and_memory_tree('tree')
	983	tree.lock_write()
	984	self.addCleanup(tree.unlock)
6973.5.2 by Jelmer Vernooĳ Add more bees.	985	tree.add([''], [b'TREE_ROOT'])
7143.15.2 by Jelmer Vernooĳ Run autopep8.	986	tree.commit('One', revprops={u'one': 'two',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	987	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'.	988	self.b1 = tree.branch
6973.5.2 by Jelmer Vernooĳ Add more bees.	989	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	990	bundle = read_bundle(bundle_sio)
	991	revision_info = bundle.revisions[0]
6973.5.2 by Jelmer Vernooĳ Add more bees.	992	self.assertEqual(b'rev1', revision_info.revision_id)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	993	rev = revision_info.as_revision()
7143.15.2 by Jelmer Vernooĳ Run autopep8.	994	self.assertEqual({'branch-nick': 'tree', 'empty': '', 'one': 'two'},
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	995	rev.properties)
	996
	997	def test_bundle_sorted_properties(self):
	998	"""For stability the writer should write properties in sorted order."""
	999	tree = self.make_branch_and_memory_tree('tree')
	1000	tree.lock_write()
	1001	self.addCleanup(tree.unlock)
	1002
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1003	tree.add([''], [b'TREE_ROOT'])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1004	tree.commit('One', rev_id=b'rev1',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1005	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	1006	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1007	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1008	bundle = read_bundle(bundle_sio)
	1009	revision_info = bundle.revisions[0]
6973.7.10 by Jelmer Vernooĳ More fixes.	1010	self.assertEqual(b'rev1', revision_info.revision_id)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1011	rev = revision_info.as_revision()
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1012	self.assertEqual({'branch-nick': 'tree', 'a': '4', 'b': '3', 'c': '2',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1013	'd': '1'}, rev.properties)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1014
	1015	def test_bundle_unicode_properties(self):
	1016	"""We should be able to round trip a non-ascii property."""
	1017	tree = self.make_branch_and_memory_tree('tree')
	1018	tree.lock_write()
	1019	self.addCleanup(tree.unlock)
	1020
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1021	tree.add([''], [b'TREE_ROOT'])
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1022	# Revisions themselves do not require anything about revision property
	1023	# keys, other than that they are a basestring, and do not contain
	1024	# whitespace.
	1025	# However, Testaments assert than they are str(), and thus should not
	1026	# be Unicode.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1027	tree.commit('One', rev_id=b'rev1',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1028	revprops={u'omega': u'\u03a9', u'alpha': u'\u03b1'})
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1029	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1030	bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1031	bundle = read_bundle(bundle_sio)
	1032	revision_info = bundle.revisions[0]
6973.7.10 by Jelmer Vernooĳ More fixes.	1033	self.assertEqual(b'rev1', revision_info.revision_id)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1034	rev = revision_info.as_revision()
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1035	self.assertEqual({'branch-nick': 'tree', 'omega': u'\u03a9',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1036	'alpha': u'\u03b1'}, rev.properties)
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1037
2520.4.43 by Aaron Bentley Fix test suite	1038	def test_bundle_with_ghosts(self):
	1039	tree = self.make_branch_and_tree('tree')
	1040	self.b1 = tree.branch
6855.3.1 by Jelmer Vernooĳ Several more fixes.	1041	self.build_tree_contents([('tree/file', b'content1')])
2520.4.43 by Aaron Bentley Fix test suite	1042	tree.add(['file'])
2520.4.43 by Aaron Bentley Fix test suite	1043	tree.commit('rev1')
6855.3.1 by Jelmer Vernooĳ Several more fixes.	1044	self.build_tree_contents([('tree/file', b'content2')])
	1045	tree.add_parent_tree_id(b'ghost')
	1046	tree.commit('rev2', rev_id=b'rev2')
	1047	bundle = self.get_valid_bundle(b'null:', b'rev2')
2520.4.43 by Aaron Bentley Fix test suite	1048
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1049	def make_simple_tree(self, format=None):
	1050	tree = self.make_branch_and_tree('b1', format=format)
	1051	self.b1 = tree.branch
	1052	self.build_tree(['b1/file'])
	1053	tree.add('file')
	1054	return tree
	1055
	1056	def test_across_serializers(self):
	1057	tree = self.make_simple_tree('knit')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1058	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1059	tree.commit('hello', rev_id=b'rev2')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1060	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1061	repo = self.make_repository('repo', format='dirstate-with-subtree')
	1062	bundle.install_revisions(repo)
6973.7.10 by Jelmer Vernooĳ More fixes.	1063	inv_text = repo._get_inventory_xml(b'rev2')
	1064	self.assertNotContainsRe(inv_text, b'format="5"')
	1065	self.assertContainsRe(inv_text, b'format="7"')
2520.4.99 by Aaron Bentley Test conversion across models	1066
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1067	def make_repo_with_installed_revisions(self):
	1068	tree = self.make_simple_tree('knit')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1069	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1070	tree.commit('hello', rev_id=b'rev2')
6973.5.2 by Jelmer Vernooĳ Add more bees.	1071	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	1072	repo = self.make_repository('repo', format='dirstate-with-subtree')
	1073	bundle.install_revisions(repo)
	1074	return repo
	1075
2520.4.99 by Aaron Bentley Test conversion across models	1076	def test_across_models(self):
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1077	repo = self.make_repo_with_installed_revisions()
6973.5.2 by Jelmer Vernooĳ Add more bees.	1078	inv = repo.get_inventory(b'rev2')
6973.5.2 by Jelmer Vernooĳ Add more bees.	1079	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.	1080	root_id = inv.root.file_id
	1081	repo.lock_read()
	1082	self.addCleanup(repo.unlock)
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1083	self.assertEqual({(root_id, b'rev1'): (),
	1084	(root_id, b'rev2'): ((root_id, b'rev1'),)},
	1085	repo.texts.get_parent_map([(root_id, b'rev1'), (root_id, b'rev2')]))
2520.4.99 by Aaron Bentley Test conversion across models	1086
3380.1.8 by Aaron Bentley Test that the stored inventory hash is correct when bundles are used	1087	def test_inv_hash_across_serializers(self):
	1088	repo = self.make_repo_with_installed_revisions()
6973.5.2 by Jelmer Vernooĳ Add more bees.	1089	recorded_inv_sha1 = repo.get_revision(b'rev2').inventory_sha1
6973.5.2 by Jelmer Vernooĳ Add more bees.	1090	xml = repo._get_inventory_xml(b'rev2')
4241.14.13 by Vincent Ladeuil Some more cleanup.	1091	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	1092
2520.4.99 by Aaron Bentley Test conversion across models	1093	def test_across_models_incompatible(self):
2520.4.99 by Aaron Bentley Test conversion across models	1094	tree = self.make_simple_tree('dirstate-with-subtree')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1095	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1096	tree.commit('hello', rev_id=b'rev2')
2520.4.99 by Aaron Bentley Test conversion across models	1097	try:
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1098	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
2520.4.99 by Aaron Bentley Test conversion across models	1099	except errors.IncompatibleBundleFormat:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1100	raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
2520.4.99 by Aaron Bentley Test conversion across models	1101	repo = self.make_repository('repo', format='knit')
	1102	bundle.install_revisions(repo)
	1103
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1104	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
2520.4.99 by Aaron Bentley Test conversion across models	1105	self.assertRaises(errors.IncompatibleRevision,
2520.4.99 by Aaron Bentley Test conversion across models	1106	bundle.install_revisions, repo)
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1107
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1108	def test_get_merge_request(self):
	1109	tree = self.make_simple_tree()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1110	tree.commit('hello', rev_id=b'rev1')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1111	tree.commit('hello', rev_id=b'rev2')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1112	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1113	result = bundle.get_merge_request(tree.branch.repository)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1114	self.assertEqual((None, b'rev1', 'inapplicable'), result)
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1115
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1116	def test_with_subtree(self):
	1117	tree = self.make_branch_and_tree('tree',
	1118	format='dirstate-with-subtree')
	1119	self.b1 = tree.branch
	1120	subtree = self.make_branch_and_tree('tree/subtree',
	1121	format='dirstate-with-subtree')
	1122	tree.add('subtree')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1123	tree.commit('hello', rev_id=b'rev1')
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1124	try:
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1125	bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1126	except errors.IncompatibleBundleFormat:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1127	raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1128	if isinstance(bundle, v09.BundleInfo09):
4241.14.13 by Vincent Ladeuil Some more cleanup.	1129	raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1130	repo = self.make_repository('repo', format='knit')
	1131	self.assertRaises(errors.IncompatibleRevision,
	1132	bundle.install_revisions, repo)
	1133	repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
	1134	bundle.install_revisions(repo2)
	1135
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1136	def test_revision_id_with_slash(self):
	1137	self.tree1 = self.make_branch_and_tree('tree')
	1138	self.b1 = self.tree1.branch
	1139	try:
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1140	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	1141	except ValueError:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1142	raise tests.TestSkipped(
4241.14.13 by Vincent Ladeuil Some more cleanup.	1143	"Repository doesn't support revision ids with slashes")
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1144	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	1145
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1146	def test_skip_file(self):
	1147	"""Make sure we don't accidentally write to the wrong versionedfile"""
	1148	self.tree1 = self.make_branch_and_tree('tree')
	1149	self.b1 = self.tree1.branch
	1150	# rev1 is not present in bundle, done by fetch
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1151	self.build_tree_contents([('tree/file2', b'contents1')])
	1152	self.tree1.add('file2', b'file2-id')
	1153	self.tree1.commit('rev1', rev_id=b'reva')
	1154	self.build_tree_contents([('tree/file3', b'contents2')])
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1155	# rev2 is present in bundle, and done by fetch
	1156	# having file1 in the bunle causes file1's versionedfile to be opened.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1157	self.tree1.add('file3', b'file3-id')
7058.3.5 by Jelmer Vernooĳ Fix flappy skip_file test.	1158	rev2 = self.tree1.commit('rev2')
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1159	# 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.	1160	target = self.tree1.controldir.sprout('target').open_workingtree()
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1161	self.build_tree_contents([('tree/file2', b'contents3')])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1162	self.tree1.commit('rev3', rev_id=b'rev3')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1163	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	1164	if getattr(bundle, 'get_bundle_reader', None) is None:
4241.14.13 by Vincent Ladeuil Some more cleanup.	1165	raise tests.TestSkipped('Bundle format cannot provide reader')
7058.3.5 by Jelmer Vernooĳ Fix flappy skip_file test.	1166	file_ids = set(
	1167	(f, r) for b, m, k, r, f in bundle.get_bundle_reader().iter_records()
	1168	if f is not None)
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1169	self.assertEqual(
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1170	{(b'file2-id', b'rev3'), (b'file3-id', rev2)}, file_ids)
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1171	bundle.install_revisions(target.branch.repository)
	1172
2520.4.43 by Aaron Bentley Fix test suite	1173
4241.14.13 by Vincent Ladeuil Some more cleanup.	1174	class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1175
	1176	format = '0.8'
	1177
	1178	def test_bundle_empty_property(self):
	1179	"""Test serializing revision properties with an empty value."""
	1180	tree = self.make_branch_and_memory_tree('tree')
	1181	tree.lock_write()
	1182	self.addCleanup(tree.unlock)
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1183	tree.add([''], [b'TREE_ROOT'])
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1184	tree.commit('One', revprops={u'one': 'two',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1185	u'empty': ''}, rev_id=b'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1186	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1187	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'.	1188	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1189	b'# properties:\n'
	1190	b'# branch-nick: tree\n'
	1191	b'# empty: \n'
	1192	b'# one: two\n'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1193	)
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1194	bundle = read_bundle(bundle_sio)
	1195	revision_info = bundle.revisions[0]
7045.2.14 by Jelmer Vernooĳ Fix some bundle tests.:	1196	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'.	1197	rev = revision_info.as_revision()
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1198	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'.	1199	rev.properties)
	1200
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1201	def get_bundle_tree(self, bundle, revision_id):
	1202	repository = self.make_repository('repo')
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1203	return bundle.revision_tree(repository, b'revid1')
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1204
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1205	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.	1206	"""Test serializing revision properties with an empty value.
	1207
	1208	Older readers had a bug when reading an empty property.
	1209	They assumed that all keys ended in ': \n'. However they would write an
	1210	empty value as ':\n'. This tests make sure that all newer bzr versions
	1211	can handle th second form.
	1212	"""
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1213	tree = self.make_branch_and_memory_tree('tree')
	1214	tree.lock_write()
	1215	self.addCleanup(tree.unlock)
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1216	tree.add([''], [b'TREE_ROOT'])
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1217	tree.commit('One', revprops={u'one': 'two',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1218	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'.	1219	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1220	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'.	1221	txt = bundle_sio.getvalue()
6973.7.10 by Jelmer Vernooĳ More fixes.	1222	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.	1223	# Create a new bundle, which strips the trailing space after empty
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1224	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'.	1225
	1226	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1227	b'# properties:\n'
	1228	b'# branch-nick: tree\n'
	1229	b'# empty:\n'
	1230	b'# one: two\n'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1231	)
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1232	bundle = read_bundle(bundle_sio)
	1233	revision_info = bundle.revisions[0]
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	1234	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'.	1235	rev = revision_info.as_revision()
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1236	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'.	1237	rev.properties)
	1238
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1239	def test_bundle_sorted_properties(self):
	1240	"""For stability the writer should write properties in sorted order."""
	1241	tree = self.make_branch_and_memory_tree('tree')
	1242	tree.lock_write()
	1243	self.addCleanup(tree.unlock)
	1244
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1245	tree.add([''], [b'TREE_ROOT'])
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1246	tree.commit('One', rev_id=b'rev1',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1247	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.	1248	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1249	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.	1250	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1251	b'# properties:\n'
	1252	b'# a: 4\n'
	1253	b'# b: 3\n'
	1254	b'# branch-nick: tree\n'
	1255	b'# c: 2\n'
	1256	b'# d: 1\n'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1257	)
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1258	bundle = read_bundle(bundle_sio)
	1259	revision_info = bundle.revisions[0]
7031.1.1 by Jelmer Vernooĳ Fix breezy.tests.test_diff.	1260	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.	1261	rev = revision_info.as_revision()
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1262	self.assertEqual({'branch-nick': 'tree', 'a': '4', 'b': '3', 'c': '2',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1263	'd': '1'}, rev.properties)
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1264
	1265	def test_bundle_unicode_properties(self):
	1266	"""We should be able to round trip a non-ascii property."""
	1267	tree = self.make_branch_and_memory_tree('tree')
	1268	tree.lock_write()
	1269	self.addCleanup(tree.unlock)
	1270
6963.2.18 by Jelmer Vernooĳ Add bees to some of bp.weave_fmt.	1271	tree.add([''], [b'TREE_ROOT'])
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1272	# Revisions themselves do not require anything about revision property
	1273	# keys, other than that they are a basestring, and do not contain
	1274	# whitespace.
	1275	# However, Testaments assert than they are str(), and thus should not
	1276	# be Unicode.
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1277	tree.commit('One', rev_id=b'rev1',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1278	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.	1279	self.b1 = tree.branch
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1280	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.	1281	self.assertContainsRe(bundle_sio.getvalue(),
6973.7.10 by Jelmer Vernooĳ More fixes.	1282	b'# properties:\n'
	1283	b'# alpha: \xce\xb1\n'
	1284	b'# branch-nick: tree\n'
	1285	b'# omega: \xce\xa9\n'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1286	)
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1287	bundle = read_bundle(bundle_sio)
	1288	revision_info = bundle.revisions[0]
6973.7.10 by Jelmer Vernooĳ More fixes.	1289	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.	1290	rev = revision_info.as_revision()
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1291	self.assertEqual({'branch-nick': 'tree', 'omega': u'\u03a9',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1292	'alpha': u'\u03b1'}, rev.properties)
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1293
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1294
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1295	class V09BundleKnit2Tester(V08BundleTester):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	1296
	1297	format = '0.9'
	1298
	1299	def bzrdir_format(self):
	1300	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	1301	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	1302	return format
	1303
	1304
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1305	class V09BundleKnit1Tester(V08BundleTester):
	1306
	1307	format = '0.9'
	1308
	1309	def bzrdir_format(self):
	1310	format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	1311	format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1312	return format
	1313
	1314
4241.14.13 by Vincent Ladeuil Some more cleanup.	1315	class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1316
2520.4.136 by Aaron Bentley Fix format strings	1317	format = '4'
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1318
	1319	def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
	1320	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1321	Make sure that the text generated is valid, and that it
	1322	can be applied against the base, and generate the same information.
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1323
	1324	:return: The in-memory bundle
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1325	"""
	1326	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
	1327
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1328	# This should also validate the generated bundle
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1329	bundle = read_bundle(bundle_txt)
	1330	repository = self.b1.repository
	1331	for bundle_rev in bundle.real_revisions:
	1332	# These really should have already been checked when we read the
	1333	# bundle, since it computes the sha1 hash for the revision, which
	1334	# only will match if everything is okay, but lets be explicit about
	1335	# it
	1336	branch_rev = repository.get_revision(bundle_rev.revision_id)
	1337	for a in ('inventory_sha1', 'revision_id', 'parent_ids',
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1338	'timestamp', 'timezone', 'message', 'committer',
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1339	'parent_ids', 'properties'):
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1340	self.assertEqual(getattr(branch_rev, a),
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1341	getattr(bundle_rev, a))
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1342	self.assertEqual(len(branch_rev.parent_ids),
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1343	len(bundle_rev.parent_ids))
2520.4.29 by Aaron Bentley Reactivate some testing, fix topo_iter	1344	self.assertEqual(set(rev_ids),
6619.3.12 by Jelmer Vernooĳ Use 2to3 set_literal fixer.	1345	{r.revision_id for r in bundle.real_revisions})
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1346	self.valid_apply_bundle(base_rev_id, bundle,
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1347	checkout_dir=checkout_dir)
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1348
	1349	return bundle
	1350
2520.4.34 by Aaron Bentley Add signature support	1351	def get_invalid_bundle(self, base_rev_id, rev_id):
	1352	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1353	Munge the text so that it's invalid.
	1354
	1355	:return: The in-memory bundle
	1356	"""
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	1357	from ..bundle import serializer
2520.4.34 by Aaron Bentley Add signature support	1358	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	1359	new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
6973.7.10 by Jelmer Vernooĳ More fixes.	1360	new_text = new_text.replace(b'<file file_id="exe-1"',
	1361	b'<file executable="y" file_id="exe-1"')
	1362	new_text = new_text.replace(b'B260', b'B275')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1363	bundle_txt = BytesIO()
2520.4.136 by Aaron Bentley Fix format strings	1364	bundle_txt.write(serializer._get_bundle_header('4'))
6973.7.5 by Jelmer Vernooĳ s/file/open.	1365	bundle_txt.write(b'\n')
6973.7.10 by Jelmer Vernooĳ More fixes.	1366	bundle_txt.write(bz2.compress(new_text))
2520.4.34 by Aaron Bentley Add signature support	1367	bundle_txt.seek(0)
	1368	bundle = read_bundle(bundle_txt)
	1369	self.valid_apply_bundle(base_rev_id, bundle)
	1370	return bundle
	1371
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1372	def create_bundle_text(self, base_rev_id, rev_id):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1373	bundle_txt = BytesIO()
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1374	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	1375	bundle_txt, format=self.format)
	1376	bundle_txt.seek(0)
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	1377	self.assertEqual(bundle_txt.readline(),
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1378	b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1379	self.assertEqual(bundle_txt.readline(), b'#\n')
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1380	rev = self.b1.repository.get_revision(rev_id)
	1381	bundle_txt.seek(0)
	1382	return bundle_txt, rev_ids
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1383
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1384	def get_bundle_tree(self, bundle, revision_id):
	1385	repository = self.make_repository('repo')
	1386	bundle.install_revisions(repository)
	1387	return repository.revision_tree(revision_id)
	1388
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1389	def test_creation(self):
	1390	tree = self.make_branch_and_tree('tree')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1391	self.build_tree_contents([('tree/file', b'contents1\nstatic\n')])
6973.5.2 by Jelmer Vernooĳ Add more bees.	1392	tree.add('file', b'fileid-2')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1393	tree.commit('added file', rev_id=b'rev1')
	1394	self.build_tree_contents([('tree/file', b'contents2\nstatic\n')])
	1395	tree.commit('changed file', rev_id=b'rev2')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1396	s = BytesIO()
2520.4.72 by Aaron Bentley Rename format to 4alpha	1397	serializer = BundleSerializerV4('1.0')
7029.2.2 by Jelmer Vernooĳ Fix two tests.	1398	with tree.lock_read():
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1399	serializer.write_bundle(
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1400	tree.branch.repository, b'rev2', b'null:', s)
2520.4.5 by Aaron Bentley Start work on reading mpbundles	1401	s.seek(0)
2520.4.6 by Aaron Bentley Get installation started	1402	tree2 = self.make_branch_and_tree('target')
	1403	target_repo = tree2.branch.repository
	1404	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.	1405	target_repo.lock_read()
	1406	self.addCleanup(target_repo.unlock)
4202.1.1 by John Arbash Meinel Update Repository.iter_files_bytes() to return an iterable of bytestrings.	1407	# Turn the 'iterators_of_bytes' back into simple strings for comparison
6973.7.10 by Jelmer Vernooĳ More fixes.	1408	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.	1409	in target_repo.iter_files_bytes(
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1410	[(b'fileid-2', b'rev1', '1'),
	1411	(b'fileid-2', b'rev2', '2')]))
	1412	self.assertEqual({'1': b'contents1\nstatic\n',
	1413	'2': b'contents2\nstatic\n'},
4202.1.1 by John Arbash Meinel Update Repository.iter_files_bytes() to return an iterable of bytestrings.	1414	repo_texts)
6973.5.2 by Jelmer Vernooĳ Add more bees.	1415	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.	1416	inventory_vf = target_repo.inventories
	1417	# If the inventory store has a graph, it must match the revision graph.
	1418	self.assertSubset(
6973.5.2 by Jelmer Vernooĳ Add more bees.	1419	[inventory_vf.get_parent_map([(b'rev2',)])[(b'rev2',)]],
6973.5.2 by Jelmer Vernooĳ Add more bees.	1420	[None, ((b'rev1',),)])
2520.4.10 by Aaron Bentley Enable installation of revisions	1421	self.assertEqual('changed file',
6973.5.2 by Jelmer Vernooĳ Add more bees.	1422	target_repo.get_revision(b'rev2').message)
2520.4.6 by Aaron Bentley Get installation started	1423
2520.4.32 by Aaron Bentley Fix test case	1424	@staticmethod
	1425	def get_raw(bundle_file):
	1426	bundle_file.seek(0)
2520.4.70 by Aaron Bentley Yank patch-handling functionality	1427	line = bundle_file.readline()
	1428	line = bundle_file.readline()
2520.4.32 by Aaron Bentley Fix test case	1429	lines = bundle_file.readlines()
6973.7.10 by Jelmer Vernooĳ More fixes.	1430	return bz2.decompress(b''.join(lines))
2520.4.32 by Aaron Bentley Fix test case	1431
2520.4.34 by Aaron Bentley Add signature support	1432	def test_copy_signatures(self):
2520.4.34 by Aaron Bentley Add signature support	1433	tree_a = self.make_branch_and_tree('tree_a')
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1434	import breezy.gpg
	1435	import breezy.commit as commit
	1436	oldstrategy = breezy.gpg.GPGStrategy
2520.4.34 by Aaron Bentley Add signature support	1437	branch = tree_a.branch
2520.4.34 by Aaron Bentley Add signature support	1438	repo_a = branch.repository
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1439	tree_a.commit("base", allow_pointless=True, rev_id=b'A')
6973.7.10 by Jelmer Vernooĳ More fixes.	1440	self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
2520.4.34 by Aaron Bentley Add signature support	1441	try:
7206.4.1 by Jelmer Vernooĳ Move breezy.testament to breezy.bzr.testament.	1442	from ..bzr.testament import Testament
2520.4.34 by Aaron Bentley Add signature support	1443	# monkey patch gpg signing mechanism
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1444	breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
6393.1.1 by Vincent Ladeuil Provides MemoryStack to simplify configuration setup in tests	1445	new_config = test_commit.MustSignConfig()
6351.3.3 by Jelmer Vernooij Convert more stuff to use config stacks.	1446	commit.Commit(config_stack=new_config).commit(message="base",
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1447	allow_pointless=True,
	1448	rev_id=b'B',
	1449	working_tree=tree_a)
	1450
2520.4.34 by Aaron Bentley Add signature support	1451	def sign(text):
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1452	return breezy.gpg.LoopbackGPGStrategy(None).sign(text)
6973.7.10 by Jelmer Vernooĳ More fixes.	1453	self.assertTrue(repo_a.has_signature_for_revision_id(b'B'))
2520.4.34 by Aaron Bentley Add signature support	1454	finally:
6622.1.34 by Jelmer Vernooĳ Rename brzlib => breezy.	1455	breezy.gpg.GPGStrategy = oldstrategy
2520.4.34 by Aaron Bentley Add signature support	1456	tree_b = self.make_branch_and_tree('tree_b')
2520.4.34 by Aaron Bentley Add signature support	1457	repo_b = tree_b.branch.repository
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1458	s = BytesIO()
2520.4.136 by Aaron Bentley Fix format strings	1459	serializer = BundleSerializerV4('4')
7029.2.2 by Jelmer Vernooĳ Fix two tests.	1460	with tree_a.lock_read():
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1461	serializer.write_bundle(
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1462	tree_a.branch.repository, b'B', b'null:', s)
2520.4.34 by Aaron Bentley Add signature support	1463	s.seek(0)
2520.4.34 by Aaron Bentley Add signature support	1464	install_bundle(repo_b, serializer.read(s))
6973.7.10 by Jelmer Vernooĳ More fixes.	1465	self.assertTrue(repo_b.has_signature_for_revision_id(b'B'))
	1466	self.assertEqual(repo_b.get_signature_text(b'B'),
	1467	repo_a.get_signature_text(b'B'))
2520.4.100 by Aaron Bentley Fix repeat signature installs	1468	s.seek(0)
	1469	# ensure repeat installs are harmless
	1470	install_bundle(repo_b, serializer.read(s))
2520.4.34 by Aaron Bentley Add signature support	1471
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1472
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1473	class V4_2aBundleTester(V4BundleTester):
	1474
	1475	def bzrdir_format(self):
	1476	return '2a'
	1477
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	1478	def get_invalid_bundle(self, base_rev_id, rev_id):
	1479	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1480	Munge the text so that it's invalid.
	1481
	1482	:return: The in-memory bundle
	1483	"""
6624 by Jelmer Vernooĳ Merge Python3 porting work ('py3 pokes')	1484	from ..bundle import serializer
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	1485	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	1486	new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
4543.2.9 by John Arbash Meinel Down to 2 failing tests.	1487	# 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.	1488	# file. Make sure the text replacement actually works correctly.
6973.7.10 by Jelmer Vernooĳ More fixes.	1489	self.assertContainsRe(new_text, b'(?m)B244\n\ni 1\n<inventory')
	1490	new_text = new_text.replace(b'<file file_id="exe-1"',
	1491	b'<file executable="y" file_id="exe-1"')
	1492	new_text = new_text.replace(b'B244', b'B259')
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1493	bundle_txt = BytesIO()
4543.2.8 by John Arbash Meinel Add a custom get_invalid_bundle and allow BadBundle to be	1494	bundle_txt.write(serializer._get_bundle_header('4'))
6973.7.5 by Jelmer Vernooĳ s/file/open.	1495	bundle_txt.write(b'\n')
6973.7.10 by Jelmer Vernooĳ More fixes.	1496	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	1497	bundle_txt.seek(0)
	1498	bundle = read_bundle(bundle_txt)
	1499	self.valid_apply_bundle(base_rev_id, bundle)
	1500	return bundle
	1501
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1502	def make_merged_branch(self):
4543.2.6 by John Arbash Meinel redefinning self.bzrdir_format() automatically sets the default format.	1503	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.	1504	builder.start_series()
6816.2.1 by Jelmer Vernooĳ Migrate some build_snapshot code over to having revision_id as keyword argument.	1505	builder.build_snapshot(None, [
6973.7.10 by Jelmer Vernooĳ More fixes.	1506	('add', ('', b'root-id', 'directory', None)),
6973.7.10 by Jelmer Vernooĳ More fixes.	1507	('add', ('file', b'file-id', 'file', b'original content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1508	], revision_id=b'a@cset-0-1')
6973.7.10 by Jelmer Vernooĳ More fixes.	1509	builder.build_snapshot([b'a@cset-0-1'], [
6973.7.10 by Jelmer Vernooĳ More fixes.	1510	('modify', ('file', b'new-content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1511	], revision_id=b'a@cset-0-2a')
6973.7.10 by Jelmer Vernooĳ More fixes.	1512	builder.build_snapshot([b'a@cset-0-1'], [
6973.7.10 by Jelmer Vernooĳ More fixes.	1513	('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1514	], revision_id=b'a@cset-0-2b')
6973.7.10 by Jelmer Vernooĳ More fixes.	1515	builder.build_snapshot([b'a@cset-0-2a', b'a@cset-0-2b'], [
6973.7.10 by Jelmer Vernooĳ More fixes.	1516	('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
6973.5.2 by Jelmer Vernooĳ Add more bees.	1517	], 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.	1518	builder.finish_series()
	1519	self.b1 = builder.get_branch()
	1520	self.b1.lock_read()
	1521	self.addCleanup(self.b1.unlock)
	1522
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1523	def make_bundle_just_inventories(self, base_revision_id,
	1524	target_revision_id,
	1525	revision_ids):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1526	sio = BytesIO()
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1527	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.	1528	self.b1.repository, sio)
	1529	writer.bundle.begin()
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1530	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.	1531	writer.bundle.end()
	1532	sio.seek(0)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1533	return sio
	1534
	1535	def test_single_inventory_multiple_parents_as_xml(self):
	1536	self.make_merged_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1537	sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
6973.7.10 by Jelmer Vernooĳ More fixes.	1538	[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.	1539	reader = v4.BundleReader(sio, stream_input=False)
	1540	records = list(reader.iter_records())
	1541	self.assertEqual(1, len(records))
	1542	(bytes, metadata, repo_kind, revision_id,
	1543	file_id) = records[0]
	1544	self.assertIs(None, file_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	1545	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.	1546	self.assertEqual('inventory', repo_kind)
6973.7.10 by Jelmer Vernooĳ More fixes.	1547	self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
	1548	b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
	1549	b'storage_kind': b'mpdiff',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1550	}, metadata)
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1551	# We should have an mpdiff that takes some lines from both parents.
	1552	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1553	b'i 1\n'
	1554	b'<inventory format="10" revision_id="a@cset-0-3">\n'
	1555	b'\n'
	1556	b'c 0 1 1 2\n'
	1557	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.	1558
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1559	def test_single_inv_no_parents_as_xml(self):
	1560	self.make_merged_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1561	sio = self.make_bundle_just_inventories(b'null:', b'a@cset-0-1',
6973.7.10 by Jelmer Vernooĳ More fixes.	1562	[b'a@cset-0-1'])
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1563	reader = v4.BundleReader(sio, stream_input=False)
	1564	records = list(reader.iter_records())
	1565	self.assertEqual(1, len(records))
	1566	(bytes, metadata, repo_kind, revision_id,
	1567	file_id) = records[0]
	1568	self.assertIs(None, file_id)
6973.7.10 by Jelmer Vernooĳ More fixes.	1569	self.assertEqual(b'a@cset-0-1', revision_id)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1570	self.assertEqual('inventory', repo_kind)
6973.7.10 by Jelmer Vernooĳ More fixes.	1571	self.assertEqual({b'parents': [],
	1572	b'sha1': b'a13f42b142d544aac9b085c42595d304150e31a2',
	1573	b'storage_kind': b'mpdiff',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1574	}, metadata)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1575	# We should have an mpdiff that takes some lines from both parents.
	1576	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1577	b'i 4\n'
	1578	b'<inventory format="10" revision_id="a@cset-0-1">\n'
	1579	b'<directory file_id="root-id" name=""'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1580	b' revision="a@cset-0-1" />\n'
6973.7.10 by Jelmer Vernooĳ More fixes.	1581	b'<file file_id="file-id" name="file" parent_id="root-id"'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1582	b' revision="a@cset-0-1"'
	1583	b' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
	1584	b' text_size="17" />\n'
6973.7.10 by Jelmer Vernooĳ More fixes.	1585	b'</inventory>\n'
6973.7.10 by Jelmer Vernooĳ More fixes.	1586	b'\n', bytes)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1587
	1588	def test_multiple_inventories_as_xml(self):
	1589	self.make_merged_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1590	sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1591	[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.	1592	reader = v4.BundleReader(sio, stream_input=False)
	1593	records = list(reader.iter_records())
	1594	self.assertEqual(3, len(records))
	1595	revision_ids = [rev_id for b, m, k, rev_id, f in records]
6973.7.10 by Jelmer Vernooĳ More fixes.	1596	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.	1597	revision_ids)
	1598	metadata_2a = records[0][1]
6973.7.10 by Jelmer Vernooĳ More fixes.	1599	self.assertEqual({b'parents': [b'a@cset-0-1'],
	1600	b'sha1': b'1e105886d62d510763e22885eec733b66f5f09bf',
	1601	b'storage_kind': b'mpdiff',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1602	}, metadata_2a)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1603	metadata_2b = records[1][1]
6973.7.10 by Jelmer Vernooĳ More fixes.	1604	self.assertEqual({b'parents': [b'a@cset-0-1'],
	1605	b'sha1': b'f03f12574bdb5ed2204c28636c98a8547544ccd8',
	1606	b'storage_kind': b'mpdiff',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1607	}, metadata_2b)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1608	metadata_3 = records[2][1]
6973.7.10 by Jelmer Vernooĳ More fixes.	1609	self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
	1610	b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
	1611	b'storage_kind': b'mpdiff',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1612	}, metadata_3)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1613	bytes_2a = records[0][0]
	1614	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1615	b'i 1\n'
	1616	b'<inventory format="10" revision_id="a@cset-0-2a">\n'
	1617	b'\n'
	1618	b'c 0 1 1 1\n'
	1619	b'i 1\n'
	1620	b'<file file_id="file-id" name="file" parent_id="root-id"'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1621	b' revision="a@cset-0-2a"'
	1622	b' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
	1623	b' text_size="12" />\n'
6973.7.10 by Jelmer Vernooĳ More fixes.	1624	b'\n'
6973.7.10 by Jelmer Vernooĳ More fixes.	1625	b'c 0 3 3 1\n', bytes_2a)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1626	bytes_2b = records[1][0]
	1627	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1628	b'i 1\n'
	1629	b'<inventory format="10" revision_id="a@cset-0-2b">\n'
	1630	b'\n'
	1631	b'c 0 1 1 2\n'
	1632	b'i 1\n'
	1633	b'<file file_id="file2-id" name="other-file" parent_id="root-id"'
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1634	b' revision="a@cset-0-2b"'
	1635	b' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
	1636	b' text_size="14" />\n'
6973.7.10 by Jelmer Vernooĳ More fixes.	1637	b'\n'
6973.7.10 by Jelmer Vernooĳ More fixes.	1638	b'c 0 3 4 1\n', bytes_2b)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1639	bytes_3 = records[2][0]
	1640	self.assertEqualDiff(
6973.7.10 by Jelmer Vernooĳ More fixes.	1641	b'i 1\n'
	1642	b'<inventory format="10" revision_id="a@cset-0-3">\n'
	1643	b'\n'
	1644	b'c 0 1 1 2\n'
	1645	b'c 1 3 3 2\n', bytes_3)
4543.2.7 by John Arbash Meinel It turns out CHKSerializer was inheriting from xml5	1646
	1647	def test_creating_bundle_preserves_chk_pages(self):
	1648	self.make_merged_branch()
6653.6.1 by Jelmer Vernooĳ Rename a number of attributes from bzrdir to controldir.	1649	target = self.b1.controldir.sprout('target',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1650	revision_id=b'a@cset-0-2a').open_branch()
6973.7.10 by Jelmer Vernooĳ More fixes.	1651	bundle_txt, rev_ids = self.create_bundle_text(b'a@cset-0-2a',
6973.7.10 by Jelmer Vernooĳ More fixes.	1652	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.	1653	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	1654	bundle = read_bundle(bundle_txt)
	1655	target.lock_write()
	1656	self.addCleanup(target.unlock)
	1657	install_bundle(target.repository, bundle)
7018.3.10 by Jelmer Vernooĳ Consistent return values in PreviewTree.list_files.	1658	inv1 = next(self.b1.repository.inventories.get_record_stream([
	1659	(b'a@cset-0-3',)], 'unordered',
	1660	True)).get_bytes_as('fulltext')
	1661	inv2 = next(target.repository.inventories.get_record_stream([
	1662	(b'a@cset-0-3',)], 'unordered',
	1663	True)).get_bytes_as('fulltext')
4543.2.7 by John Arbash Meinel It turns out CHKSerializer was inheriting from xml5	1664	self.assertEqualDiff(inv1, inv2)
4543.2.5 by John Arbash Meinel Fix issues with keys/ids and ghost handling.	1665
4543.2.4 by John Arbash Meinel Start working on code that will use Repository._serializer.write_inventory_to_strig.	1666
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1667	class MungedBundleTester(object):
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1668
	1669	def build_test_bundle(self):
	1670	wt = self.make_branch_and_tree('b1')
	1671
	1672	self.build_tree(['b1/one'])
	1673	wt.add('one')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1674	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	1675	self.build_tree(['b1/two'])
	1676	wt.add('two')
6855.4.1 by Jelmer Vernooĳ Yet more bees.	1677	wt.commit('add two', rev_id=b'a@cset-0-2',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1678	revprops={u'branch-nick': 'test'})
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1679
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1680	bundle_txt = BytesIO()
6973.7.10 by Jelmer Vernooĳ More fixes.	1681	rev_ids = write_bundle(wt.branch.repository, b'a@cset-0-2',
	1682	b'a@cset-0-1', bundle_txt, self.format)
	1683	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	1684	bundle_txt.seek(0, 0)
	1685	return bundle_txt
	1686
	1687	def check_valid(self, bundle):
	1688	"""Check that after whatever munging, the final object is valid."""
6973.7.10 by Jelmer Vernooĳ More fixes.	1689	self.assertEqual([b'a@cset-0-2'],
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1690	[r.revision_id for r in bundle.real_revisions])
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1691
	1692	def test_extra_whitespace(self):
	1693	bundle_txt = self.build_test_bundle()
	1694
	1695	# Seek to the end of the file
	1696	# Adding one extra newline used to give us
	1697	# TypeError: float() argument must be a string or a number
	1698	bundle_txt.seek(0, 2)
6973.7.5 by Jelmer Vernooĳ s/file/open.	1699	bundle_txt.write(b'\n')
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1700	bundle_txt.seek(0)
	1701
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1702	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1703	self.check_valid(bundle)
	1704
	1705	def test_extra_whitespace_2(self):
	1706	bundle_txt = self.build_test_bundle()
	1707
	1708	# Seek to the end of the file
	1709	# Adding two extra newlines used to give us
	1710	# MalformedPatches: The first line of all patches should be ...
	1711	bundle_txt.seek(0, 2)
6973.7.5 by Jelmer Vernooĳ s/file/open.	1712	bundle_txt.write(b'\n\n')
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1713	bundle_txt.seek(0)
	1714
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1715	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1716	self.check_valid(bundle)
	1717
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1718
4241.14.13 by Vincent Ladeuil Some more cleanup.	1719	class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1720
	1721	format = '0.9'
	1722
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1723	def test_missing_trailing_whitespace(self):
	1724	bundle_txt = self.build_test_bundle()
	1725
	1726	# Remove a trailing newline, it shouldn't kill the parser
	1727	raw = bundle_txt.getvalue()
	1728	# The contents of the bundle don't have to be this, but this
	1729	# test is concerned with the exact case where the serializer
	1730	# creates a blank line at the end, and fails if that
	1731	# line is stripped
6973.7.10 by Jelmer Vernooĳ More fixes.	1732	self.assertEqual(b'\n\n', raw[-2:])
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1733	bundle_txt = BytesIO(raw[:-1])
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1734
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1735	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1736	self.check_valid(bundle)
1793.3.14 by John Arbash Meinel Actually fix the bug with missing trailing newline bug #49182	1737
1793.3.16 by John Arbash Meinel Add tests to ensure that we gracefully handle opening and trailing non-bundle text.	1738	def test_opening_text(self):
	1739	bundle_txt = self.build_test_bundle()
	1740
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1741	bundle_txt = BytesIO(
	1742	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.	1743
	1744	bundle = read_bundle(bundle_txt)
	1745	self.check_valid(bundle)
	1746
	1747	def test_trailing_text(self):
	1748	bundle_txt = self.build_test_bundle()
	1749
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1750	bundle_txt = BytesIO(
	1751	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.	1752
	1753	bundle = read_bundle(bundle_txt)
	1754	self.check_valid(bundle)
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1755
	1756
4241.14.13 by Vincent Ladeuil Some more cleanup.	1757	class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1758
2520.4.136 by Aaron Bentley Fix format strings	1759	format = '4'
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1760
	1761
4241.14.13 by Vincent Ladeuil Some more cleanup.	1762	class TestBundleWriterReader(tests.TestCase):
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1763
	1764	def test_roundtrip_record(self):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1765	fileobj = BytesIO()
2520.4.72 by Aaron Bentley Rename format to 4alpha	1766	writer = v4.BundleWriter(fileobj)
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1767	writer.begin()
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1768	writer.add_info_record({b'foo': b'bar'})
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1769	writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1770	b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1771	writer.end()
	1772	fileobj.seek(0)
2520.4.148 by Aaron Bentley Updates from review	1773	reader = v4.BundleReader(fileobj, stream_input=True)
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1774	record_iter = reader.iter_records()
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1775	record = next(record_iter)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1776	self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1777	'info', None, None), record)
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1778	record = next(record_iter)
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1779	self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1780	b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1781	record)
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1782
	1783	def test_roundtrip_record_memory_hungry(self):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1784	fileobj = BytesIO()
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1785	writer = v4.BundleWriter(fileobj)
	1786	writer.begin()
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1787	writer.add_info_record({b'foo': b'bar'})
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1788	writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1789	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	1790	writer.end()
	1791	fileobj.seek(0)
2520.4.148 by Aaron Bentley Updates from review	1792	reader = v4.BundleReader(fileobj, stream_input=False)
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1793	record_iter = reader.iter_records()
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1794	record = next(record_iter)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1795	self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1796	'info', None, None), record)
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1797	record = next(record_iter)
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1798	self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1799	b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1800	record)
2520.4.95 by Aaron Bentley Add support for header/info records	1801
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1802	def test_encode_name(self):
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1803	self.assertEqual(b'revision/rev1',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1804	v4.BundleWriter.encode_name('revision', b'rev1'))
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1805	self.assertEqual(b'file/rev//1/file-id-1',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1806	v4.BundleWriter.encode_name('file', b'rev/1', b'file-id-1'))
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1807	self.assertEqual(b'info',
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1808	v4.BundleWriter.encode_name('info', None, None))
2520.4.95 by Aaron Bentley Add support for header/info records	1809
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1810	def test_decode_name(self):
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1811	self.assertEqual(('revision', b'rev1', None),
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1812	v4.BundleReader.decode_name(b'revision/rev1'))
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1813	self.assertEqual(('file', b'rev/1', b'file-id-1'),
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1814	v4.BundleReader.decode_name(b'file/rev//1/file-id-1'))
2520.4.95 by Aaron Bentley Add support for header/info records	1815	self.assertEqual(('info', None, None),
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1816	v4.BundleReader.decode_name(b'info'))
2520.4.131 by Aaron Bentley Raise BadBundle for records with wrong number of names	1817
	1818	def test_too_many_names(self):
6621.22.2 by Martin Use BytesIO or StringIO from bzrlib.sixish	1819	fileobj = BytesIO()
2520.4.131 by Aaron Bentley Raise BadBundle for records with wrong number of names	1820	writer = v4.BundleWriter(fileobj)
	1821	writer.begin()
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1822	writer.add_info_record({b'foo': b'bar'})
7065.3.11 by Jelmer Vernooĳ Fix bundle tests.	1823	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	1824	writer.end()
	1825	fileobj.seek(0)
	1826	record_iter = v4.BundleReader(fileobj).iter_records()
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1827	record = next(record_iter)
6973.7.8 by Jelmer Vernooĳ Fix more tests.	1828	self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
7143.15.2 by Jelmer Vernooĳ Run autopep8.	1829	'info', None, None), record)
6634.2.1 by Martin Apply 2to3 next fixer and make compatible	1830	self.assertRaises(errors.BadBundle, next, record_iter)