~bzr-pqm/bzr/bzr.dev : contents of bzrlib/tests/test

~bzr-pqm/bzr/bzr.dev : (revision 1551.19.8)

2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	1	# Copyright (C) 2004, 2005, 2006, 2007 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
	15	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	16
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	17	from cStringIO import StringIO
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	18	import os
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	19	import sys
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	20	import tempfile
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	21
1910.2.64 by Aaron Bentley Changes from review	22	from bzrlib import (
1996.3.20 by John Arbash Meinel [merge] bzr.dev 2063	23	bzrdir,
	24	errors,
	25	inventory,
	26	repository,
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	27	revision as _mod_revision,
1910.2.64 by Aaron Bentley Changes from review	28	treebuilder,
1910.2.64 by Aaron Bentley Changes from review	29	)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	30	from bzrlib.bzrdir import BzrDir
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	31	from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
1793.2.3 by Aaron Bentley Rename read_bundle.py to bundle_data.py	32	from bzrlib.bundle.bundle_data import BundleTree
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	33	from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
1910.2.49 by Aaron Bentley Ensure that 0.8 bundles aren't used with KnitRepository2	34	from bzrlib.bundle.serializer.v08 import BundleSerializerV08
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	35	from bzrlib.bundle.serializer.v09 import BundleSerializerV09
2520.4.72 by Aaron Bentley Rename format to 4alpha	36	from bzrlib.bundle.serializer.v4 import BundleSerializerV4
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	37	from bzrlib.branch import Branch
1185.82.90 by Aaron Bentley Reorganized test suite	38	from bzrlib.diff import internal_diff
1910.2.3 by Aaron Bentley All tests pass	39	from bzrlib.errors import (BzrError, TestamentMismatch, NotABundle, BadBundle,
1910.2.3 by Aaron Bentley All tests pass	40	NoSuchFile,)
1185.82.44 by Aaron Bentley Switch to merge_changeset in test suite	41	from bzrlib.merge import Merge3Merger
2241.1.5 by Martin Pool Move KnitFormat2 into repofmt	42	from bzrlib.repofmt import knitrepo
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	43	from bzrlib.osutils import sha_file
	44	from bzrlib.tests import (
	45	SymlinkFeature,
	46	TestCase,
	47	TestCaseInTempDir,
	48	TestCaseWithTransport,
	49	TestSkipped,
	50	test_commit,
	51	)
1185.82.66 by Aaron Bentley Handle new executable files	52	from bzrlib.transform import TreeTransform
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	53
1185.82.90 by Aaron Bentley Reorganized test suite	54
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	55	class MockTree(object):
	56	def __init__(self):
1731.1.4 by Aaron Bentley merge from bzr.dev	57	from bzrlib.inventory import InventoryDirectory, ROOT_ID
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	58	object.__init__(self)
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	59	self.paths = {ROOT_ID: ""}
	60	self.ids = {"": ROOT_ID}
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	61	self.contents = {}
1731.1.4 by Aaron Bentley merge from bzr.dev	62	self.root = InventoryDirectory(ROOT_ID, '', None)
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	63
	64	inventory = property(lambda x:x)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	65
	66	def __iter__(self):
	67	return self.paths.iterkeys()
	68
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	69	def __getitem__(self, file_id):
	70	if file_id == self.root.file_id:
	71	return self.root
	72	else:
	73	return self.make_entry(file_id, self.paths[file_id])
	74
	75	def parent_id(self, file_id):
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	76	parent_dir = os.path.dirname(self.paths[file_id])
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	77	if parent_dir == "":
	78	return None
	79	return self.ids[parent_dir]
	80
	81	def iter_entries(self):
	82	for path, file_id in self.ids.iteritems():
	83	yield path, self[file_id]
	84
	85	def get_file_kind(self, file_id):
	86	if file_id in self.contents:
	87	kind = 'file'
	88	else:
	89	kind = 'directory'
	90	return kind
	91
	92	def make_entry(self, file_id, path):
0.5.119 by John Arbash Meinel Recreated the factory. We really need InventoryEntry.create()	93	from bzrlib.inventory import (InventoryEntry, InventoryFile
	94	, InventoryDirectory, InventoryLink)
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	95	name = os.path.basename(path)
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	96	kind = self.get_file_kind(file_id)
	97	parent_id = self.parent_id(file_id)
	98	text_sha_1, text_size = self.contents_stats(file_id)
0.5.119 by John Arbash Meinel Recreated the factory. We really need InventoryEntry.create()	99	if kind == 'directory':
	100	ie = InventoryDirectory(file_id, name, parent_id)
	101	elif kind == 'file':
	102	ie = InventoryFile(file_id, name, parent_id)
	103	elif kind == 'symlink':
	104	ie = InventoryLink(file_id, name, parent_id)
	105	else:
	106	raise BzrError('unknown kind %r' % kind)
0.5.91 by Aaron Bentley Updated to match API change	107	ie.text_sha1 = text_sha_1
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	108	ie.text_size = text_size
	109	return ie
	110
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	111	def add_dir(self, file_id, path):
	112	self.paths[file_id] = path
	113	self.ids[path] = file_id
	114
	115	def add_file(self, file_id, path, contents):
	116	self.add_dir(file_id, path)
	117	self.contents[file_id] = contents
	118
	119	def path2id(self, path):
	120	return self.ids.get(path)
	121
	122	def id2path(self, file_id):
	123	return self.paths.get(file_id)
	124
	125	def has_id(self, file_id):
	126	return self.id2path(file_id) is not None
	127
	128	def get_file(self, file_id):
	129	result = StringIO()
	130	result.write(self.contents[file_id])
	131	result.seek(0,0)
	132	return result
	133
0.6.1 by Aaron Bentley Fleshed out MockTree, fixed all test failures	134	def contents_stats(self, file_id):
	135	if file_id not in self.contents:
	136	return None, None
	137	text_sha1 = sha_file(self.get_file(file_id))
	138	return text_sha1, len(self.contents[file_id])
	139
	140
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	141	class BTreeTester(TestCase):
	142	"""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)	143
	144	def make_tree_1(self):
	145	mtree = MockTree()
	146	mtree.add_dir("a", "grandparent")
	147	mtree.add_dir("b", "grandparent/parent")
	148	mtree.add_file("c", "grandparent/parent/file", "Hello\n")
	149	mtree.add_dir("d", "grandparent/alt_parent")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	150	return BundleTree(mtree, ''), mtree
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	151
	152	def test_renames(self):
	153	"""Ensure that file renames have the proper effect on children"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	154	btree = self.make_tree_1()[0]
	155	self.assertEqual(btree.old_path("grandparent"), "grandparent")
	156	self.assertEqual(btree.old_path("grandparent/parent"),
	157	"grandparent/parent")
	158	self.assertEqual(btree.old_path("grandparent/parent/file"),
	159	"grandparent/parent/file")
	160
	161	self.assertEqual(btree.id2path("a"), "grandparent")
	162	self.assertEqual(btree.id2path("b"), "grandparent/parent")
	163	self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
	164
	165	self.assertEqual(btree.path2id("grandparent"), "a")
	166	self.assertEqual(btree.path2id("grandparent/parent"), "b")
	167	self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
	168
	169	assert btree.path2id("grandparent2") is None
	170	assert btree.path2id("grandparent2/parent") is None
	171	assert btree.path2id("grandparent2/parent/file") is None
	172
	173	btree.note_rename("grandparent", "grandparent2")
	174	assert btree.old_path("grandparent") is None
	175	assert btree.old_path("grandparent/parent") is None
	176	assert btree.old_path("grandparent/parent/file") is None
	177
	178	self.assertEqual(btree.id2path("a"), "grandparent2")
	179	self.assertEqual(btree.id2path("b"), "grandparent2/parent")
	180	self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
	181
	182	self.assertEqual(btree.path2id("grandparent2"), "a")
	183	self.assertEqual(btree.path2id("grandparent2/parent"), "b")
	184	self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
	185
	186	assert btree.path2id("grandparent") is None
	187	assert btree.path2id("grandparent/parent") is None
	188	assert btree.path2id("grandparent/parent/file") is None
	189
	190	btree.note_rename("grandparent/parent", "grandparent2/parent2")
	191	self.assertEqual(btree.id2path("a"), "grandparent2")
	192	self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
	193	self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
	194
	195	self.assertEqual(btree.path2id("grandparent2"), "a")
	196	self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
	197	self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
	198
	199	assert btree.path2id("grandparent2/parent") is None
	200	assert btree.path2id("grandparent2/parent/file") is None
	201
	202	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)	203	"grandparent2/parent2/file2")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	204	self.assertEqual(btree.id2path("a"), "grandparent2")
	205	self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
	206	self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
	207
	208	self.assertEqual(btree.path2id("grandparent2"), "a")
	209	self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
	210	self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
	211
	212	assert 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)	213
	214	def test_moves(self):
	215	"""Ensure that file moves have the proper effect on children"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	216	btree = self.make_tree_1()[0]
	217	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)	218	"grandparent/alt_parent/file")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	219	self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
	220	self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
	221	assert 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)	222
	223	def unified_diff(self, old, new):
	224	out = StringIO()
	225	internal_diff("old", old, "new", new, out)
	226	out.seek(0,0)
	227	return out.read()
	228
	229	def make_tree_2(self):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	230	btree = self.make_tree_1()[0]
	231	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)	232	"grandparent/alt_parent/file")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	233	assert btree.id2path("e") is None
	234	assert btree.path2id("grandparent/parent/file") is None
	235	btree.note_id("e", "grandparent/parent/file")
	236	return btree
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	237
	238	def test_adds(self):
	239	"""File/inventory adds"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	240	btree = self.make_tree_2()
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	241	add_patch = self.unified_diff([], ["Extra cheese\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	242	btree.note_patch("grandparent/parent/file", add_patch)
	243	btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
	244	btree.note_target('grandparent/parent/symlink', 'venus')
	245	self.adds_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	246
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	247	def adds_test(self, btree):
	248	self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
	249	self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
	250	self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
	251	self.assertEqual(btree.get_symlink_target('f'), 'venus')
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	252
	253	def test_adds2(self):
	254	"""File/inventory adds, with patch-compatibile renames"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	255	btree = self.make_tree_2()
	256	btree.contents_by_id = False
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	257	add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	258	btree.note_patch("grandparent/parent/file", add_patch)
	259	btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
	260	btree.note_target('grandparent/parent/symlink', 'venus')
	261	self.adds_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	262
	263	def make_tree_3(self):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	264	btree, mtree = self.make_tree_1()
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	265	mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	266	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)	267	"grandparent/alt_parent/file")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	268	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)	269	"grandparent/alt_parent/stopping")
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	270	return btree
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	271
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	272	def get_file_test(self, btree):
	273	self.assertEqual(btree.get_file("e").read(), "Lemon\n")
	274	self.assertEqual(btree.get_file("c").read(), "Hello\n")
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	275
	276	def test_get_file(self):
	277	"""Get file contents"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	278	btree = self.make_tree_3()
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	279	mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	280	btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
	281	self.get_file_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	282
	283	def test_get_file2(self):
	284	"""Get file contents, with patch-compatibile renames"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	285	btree = self.make_tree_3()
	286	btree.contents_by_id = False
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	287	mod_patch = self.unified_diff([], ["Lemon\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	288	btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	289	mod_patch = self.unified_diff([], ["Hello\n"])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	290	btree.note_patch("grandparent/alt_parent/file", mod_patch)
	291	self.get_file_test(btree)
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	292
	293	def test_delete(self):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	294	"Deletion by bundle"
	295	btree = self.make_tree_1()[0]
	296	self.assertEqual(btree.get_file("c").read(), "Hello\n")
	297	btree.note_deletion("grandparent/parent/file")
	298	assert btree.id2path("c") is None
	299	assert 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)	300
	301	def sorted_ids(self, tree):
	302	ids = list(tree)
	303	ids.sort()
	304	return ids
	305
	306	def test_iteration(self):
	307	"""Ensure that iteration through ids works properly"""
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	308	btree = self.make_tree_1()[0]
1852.6.3 by Robert Collins Make iter(Tree) consistent for all tree types.	309	self.assertEqual(self.sorted_ids(btree),
	310	[inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	311	btree.note_deletion("grandparent/parent/file")
	312	btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
	313	btree.note_last_changed("grandparent/alt_parent/fool",
1185.82.95 by Aaron Bentley Restore path-orientation of ChangesetTree	314	"revisionidiguess")
1852.6.3 by Robert Collins Make iter(Tree) consistent for all tree types.	315	self.assertEqual(self.sorted_ids(btree),
	316	[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
0.5.66 by John Arbash Meinel Refactoring, moving test code into test (switching back to assert is None)	317
1185.82.7 by John Arbash Meinel Adding patches.py into bzrlib, including the tests into the test suite.	318
1910.2.49 by Aaron Bentley Ensure that 0.8 bundles aren't used with KnitRepository2	319	class BundleTester1(TestCaseWithTransport):
	320
	321	def test_mismatched_bundle(self):
	322	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	323	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.49 by Aaron Bentley Ensure that 0.8 bundles aren't used with KnitRepository2	324	serializer = BundleSerializerV08('0.8')
	325	b = self.make_branch('.', format=format)
2067.3.1 by Martin Pool Clean up BzrNewError, other exception classes and users.	326	self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
1910.2.49 by Aaron Bentley Ensure that 0.8 bundles aren't used with KnitRepository2	327	b.repository, [], {}, StringIO())
	328
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	329	def test_matched_bundle(self):
2067.3.1 by Martin Pool Clean up BzrNewError, other exception classes and users.	330	"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	331	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	332	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	333	serializer = BundleSerializerV09('0.9')
	334	b = self.make_branch('.', format=format)
	335	serializer.write(b.repository, [], {}, StringIO())
	336
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	337	def test_mismatched_model(self):
	338	"""Try copying a bundle from knit2 to knit1"""
	339	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	340	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	341	source = self.make_branch_and_tree('source', format=format)
	342	source.commit('one', rev_id='one-id')
	343	source.commit('two', rev_id='two-id')
	344	text = StringIO()
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	345	write_bundle(source.branch.repository, 'two-id', 'null:', text,
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	346	format='0.9')
	347	text.seek(0)
	348
	349	format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	350	format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.60 by Aaron Bentley Ensure that new-model revisions aren't installed into old-model repos	351	target = self.make_branch('target', format=format)
	352	self.assertRaises(errors.IncompatibleRevision, install_bundle,
	353	target.repository, read_bundle(text))
	354
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	355
2520.4.43 by Aaron Bentley Fix test suite	356	class BundleTester(object):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	357
	358	def bzrdir_format(self):
	359	format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	360	format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	361	return format
	362
	363	def make_branch_and_tree(self, path, format=None):
	364	if format is None:
	365	format = self.bzrdir_format()
	366	return TestCaseWithTransport.make_branch_and_tree(self, path, format)
	367
	368	def make_branch(self, path, format=None):
	369	if format is None:
	370	format = self.bzrdir_format()
	371	return 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.	372
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	373	def create_bundle_text(self, base_rev_id, rev_id):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	374	bundle_txt = StringIO()
	375	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	376	bundle_txt, format=self.format)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	377	bundle_txt.seek(0)
	378	self.assertEqual(bundle_txt.readline(),
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	379	'# Bazaar revision bundle v%s\n' % self.format)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	380	self.assertEqual(bundle_txt.readline(), '#\n')
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	381
1185.82.14 by Aaron Bentley API updates	382	rev = self.b1.repository.get_revision(rev_id)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	383	self.assertEqual(bundle_txt.readline().decode('utf-8'),
	384	u'# message:\n')
	385	bundle_txt.seek(0)
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	386	return bundle_txt, rev_ids
	387
	388	def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
	389	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	390	Make sure that the text generated is valid, and that it
	391	can be applied against the base, and generate the same information.
	392
	393	:return: The in-memory bundle
	394	"""
	395	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
	396
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	397	# This should also validate the generated bundle
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	398	bundle = read_bundle(bundle_txt)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	399	repository = self.b1.repository
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	400	for bundle_rev in bundle.real_revisions:
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	401	# These really should have already been checked when we read the
	402	# bundle, since it computes the sha1 hash for the revision, which
	403	# only will match if everything is okay, but lets be explicit about
	404	# it
	405	branch_rev = repository.get_revision(bundle_rev.revision_id)
1185.82.33 by Aaron Bentley Strengthen tests	406	for a in ('inventory_sha1', 'revision_id', 'parent_ids',
	407	'timestamp', 'timezone', 'message', 'committer',
	408	'parent_ids', 'properties'):
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	409	self.assertEqual(getattr(branch_rev, a),
	410	getattr(bundle_rev, a))
	411	self.assertEqual(len(branch_rev.parent_ids),
	412	len(bundle_rev.parent_ids))
1185.82.47 by Aaron Bentley Ensure all intended rev_ids end up in the revision	413	self.assertEqual(rev_ids,
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	414	[r.revision_id for r in bundle.real_revisions])
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	415	self.valid_apply_bundle(base_rev_id, bundle,
1185.82.89 by Aaron Bentley Remove auto_commit stuff	416	checkout_dir=checkout_dir)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	417
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	418	return bundle
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	419
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	420	def get_invalid_bundle(self, base_rev_id, rev_id):
	421	"""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	422	Munge the text so that it's invalid.
	423
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	424	:return: The in-memory bundle
1185.82.118 by Aaron Bentley Ensure that StrictTestament handles execute bit differences	425	"""
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	426	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	427	new_text = bundle_txt.getvalue().replace('executable:no',
1185.82.118 by Aaron Bentley Ensure that StrictTestament handles execute bit differences	428	'executable:yes')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	429	bundle_txt = StringIO(new_text)
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	430	bundle = read_bundle(bundle_txt)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	431	self.valid_apply_bundle(base_rev_id, bundle)
	432	return bundle
1185.82.118 by Aaron Bentley Ensure that StrictTestament handles execute bit differences	433
1185.82.139 by Aaron Bentley Raise NotABundle when a non-bundle is supplied	434	def test_non_bundle(self):
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	435	self.assertRaises(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
1185.82.139 by Aaron Bentley Raise NotABundle when a non-bundle is supplied	436
1793.2.7 by Aaron Bentley Fix reporting of malformed, (especially, crlf) bundles	437	def test_malformed(self):
	438	self.assertRaises(BadBundle, read_bundle,
	439	StringIO('# Bazaar revision bundle v'))
	440
	441	def test_crlf_bundle(self):
1793.2.9 by Aaron Bentley Don't use assertNotRaises-- instead, catch BadBundle and pass	442	try:
1793.3.14 by John Arbash Meinel Actually fix the bug with missing trailing newline bug #49182	443	read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
1793.2.9 by Aaron Bentley Don't use assertNotRaises-- instead, catch BadBundle and pass	444	except BadBundle:
	445	# It is currently permitted for bundles with crlf line endings to
	446	# make read_bundle raise a BadBundle, but this should be fixed.
1793.2.10 by Aaron Bentley Whitespace/comment fix	447	# Anything else, especially NotABundle, is an error.
1793.2.9 by Aaron Bentley Don't use assertNotRaises-- instead, catch BadBundle and pass	448	pass
	449
0.5.88 by John Arbash Meinel Fixed a bug in the rename code, added more tests.	450	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.	451	"""Get a new tree, with the specified revision in it.
	452	"""
	453
0.5.88 by John Arbash Meinel Fixed a bug in the rename code, added more tests.	454	if checkout_dir is None:
	455	checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
0.5.89 by John Arbash Meinel Updating for explicitly defined directories.	456	else:
	457	if not os.path.exists(checkout_dir):
	458	os.mkdir(checkout_dir)
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	459	tree = self.make_branch_and_tree(checkout_dir)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	460	s = StringIO()
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	461	ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	462	format=self.format)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	463	s.seek(0)
1185.82.135 by Aaron Bentley Ensure that bundles are bytestrings	464	assert isinstance(s.getvalue(), str), (
	465	"Bundle isn't a bytestring:\n %s..." % repr(s.getvalue())[:40])
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	466	install_bundle(tree.branch.repository, read_bundle(s))
1185.82.41 by Aaron Bentley More work on installing changesets	467	for ancestor in ancestors:
	468	old = self.b1.repository.revision_tree(ancestor)
	469	new = tree.branch.repository.revision_tree(ancestor)
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	470
	471	# Check that there aren't any inventory level changes
1852.10.3 by Robert Collins Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.	472	delta = new.changes_from(old)
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	473	self.assertFalse(delta.has_changed(),
	474	'Revision %s not copied correctly.'
	475	% (ancestor,))
1711.7.27 by John Arbash Meinel Investigating why test_bundle fails, something isn't transmitting properly.	476
	477	# Now check that the file contents are all correct
1185.82.41 by Aaron Bentley More work on installing changesets	478	for inventory_id in old:
	479	try:
	480	old_file = old.get_file(inventory_id)
1910.2.3 by Aaron Bentley All tests pass	481	except NoSuchFile:
1185.82.41 by Aaron Bentley More work on installing changesets	482	continue
	483	if old_file is None:
	484	continue
	485	self.assertEqual(old_file.read(),
	486	new.get_file(inventory_id).read())
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	487	if not _mod_revision.is_null(rev_id):
1185.82.44 by Aaron Bentley Switch to merge_changeset in test suite	488	rh = self.b1.revision_history()
	489	tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
	490	tree.update()
1852.10.3 by Robert Collins Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.	491	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.	492	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.	493	'Working tree has modifications: %s' % delta)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	494	return tree
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	495
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	496	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.	497	"""Get the base revision, apply the changes, and make
	498	sure everything matches the builtin branch.
	499	"""
1185.82.17 by Aaron Bentley More API updates	500	to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
1908.6.4 by Robert Collins Update to replaced parent checking api bzrlib/merge.py	501	original_parents = to_tree.get_parent_ids()
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	502	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.	503	original_parents = to_tree.get_parent_ids()
1185.82.41 by Aaron Bentley More work on installing changesets	504	self.assertIs(repository.has_revision(base_rev_id), True)
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	505	for rev in info.real_revisions:
	506	self.assert_(not repository.has_revision(rev.revision_id),
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	507	'Revision {%s} present before applying bundle'
1185.82.40 by Aaron Bentley Started work on testing install_revisions/handling empty changesets	508	% rev.revision_id)
1793.2.2 by Aaron Bentley Move BundleReader into v07 serializer	509	merge_bundle(info, to_tree, True, Merge3Merger, False, False)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	510
	511	for rev in info.real_revisions:
1185.82.17 by Aaron Bentley More API updates	512	self.assert_(repository.has_revision(rev.revision_id),
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	513	'Missing revision {%s} after applying bundle'
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	514	% rev.revision_id)
	515
1185.82.17 by Aaron Bentley More API updates	516	self.assert_(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.	517	# 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.	518
1908.6.4 by Robert Collins Update to replaced parent checking api bzrlib/merge.py	519	self.assertEqual(original_parents + [info.target],
	520	to_tree.get_parent_ids())
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	521
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	522	rev = info.real_revisions[-1]
1185.82.17 by Aaron Bentley More API updates	523	base_tree = self.b1.repository.revision_tree(rev.revision_id)
1185.82.17 by Aaron Bentley More API updates	524	to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	525
	526	# 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.	527	# we might also check the working tree.
	528
	529	base_files = list(base_tree.list_files())
	530	to_files = list(to_tree.list_files())
	531	self.assertEqual(len(base_files), len(to_files))
1185.82.66 by Aaron Bentley Handle new executable files	532	for base_file, to_file in zip(base_files, to_files):
1185.82.66 by Aaron Bentley Handle new executable files	533	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.	534
0.5.117 by John Arbash Meinel Almost there. Just need to track down a few remaining bugs.	535	for path, status, kind, fileid, entry in base_files:
0.5.86 by John Arbash Meinel Updated the auto-commit functionality, and adding to pending-merges, more testing.	536	# Check that the meta information is the same
	537	self.assertEqual(base_tree.get_file_size(fileid),
	538	to_tree.get_file_size(fileid))
	539	self.assertEqual(base_tree.get_file_sha1(fileid),
	540	to_tree.get_file_sha1(fileid))
	541	# Check that the contents are the same
	542	# This is pretty expensive
	543	# self.assertEqual(base_tree.get_file(fileid).read(),
	544	# 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.	545
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	546	def test_bundle(self):
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	547	self.tree1 = self.make_branch_and_tree('b1')
1185.82.14 by Aaron Bentley API updates	548	self.b1 = self.tree1.branch
0.5.78 by John Arbash Meinel Working on test cases, starting with the empty project issues.	549
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	550	open('b1/one', 'wb').write('one\n')
1185.82.14 by Aaron Bentley API updates	551	self.tree1.add('one')
1185.82.14 by Aaron Bentley API updates	552	self.tree1.commit('add one', rev_id='a@cset-0-1')
0.5.78 by John Arbash Meinel Working on test cases, starting with the empty project issues.	553
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	554	bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	555
	556	# Make sure we can handle files with spaces, tabs, other
	557	# bogus characters
0.5.82 by John Arbash Meinel Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids	558	self.build_tree([
0.5.84 by John Arbash Meinel (broken) problem with removes.	559	'b1/with space.txt'
	560	, 'b1/dir/'
	561	, 'b1/dir/filein subdir.c'
	562	, 'b1/dir/WithCaps.txt'
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	563	, 'b1/dir/ pre space'
0.5.84 by John Arbash Meinel (broken) problem with removes.	564	, 'b1/sub/'
	565	, 'b1/sub/sub/'
	566	, 'b1/sub/sub/nonempty.txt'
0.5.82 by John Arbash Meinel Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids	567	])
0.5.84 by John Arbash Meinel (broken) problem with removes.	568	open('b1/sub/sub/emptyfile.txt', 'wb').close()
0.5.94 by Aaron Bentley Switched to native patch application, added tests for terminating newlines	569	open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
1185.82.66 by Aaron Bentley Handle new executable files	570	tt = TreeTransform(self.tree1)
	571	tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
	572	tt.apply()
2520.4.84 by Aaron Bentley Fix heisenbug record-rewriting test	573	# have to fix length of file-id so that we can predictably rewrite
	574	# a (length-prefixed) record containing it later.
	575	self.tree1.add('with space.txt', 'withspace-id')
1185.82.14 by Aaron Bentley API updates	576	self.tree1.add([
2520.4.84 by Aaron Bentley Fix heisenbug record-rewriting test	577	'dir'
0.5.84 by John Arbash Meinel (broken) problem with removes.	578	, 'dir/filein subdir.c'
0.5.84 by John Arbash Meinel (broken) problem with removes.	579	, 'dir/WithCaps.txt'
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	580	, 'dir/ pre space'
0.5.94 by Aaron Bentley Switched to native patch application, added tests for terminating newlines	581	, 'dir/nolastnewline.txt'
0.5.84 by John Arbash Meinel (broken) problem with removes.	582	, 'sub'
	583	, 'sub/sub'
	584	, 'sub/sub/nonempty.txt'
	585	, 'sub/sub/emptyfile.txt'
0.5.82 by John Arbash Meinel Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids	586	])
1185.82.14 by Aaron Bentley API updates	587	self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	588
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	589	bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
0.5.117 by John Arbash Meinel Almost there. Just need to track down a few remaining bugs.	590
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	591	# Check a rollup bundle
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	592	bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
0.5.84 by John Arbash Meinel (broken) problem with removes.	593
0.5.84 by John Arbash Meinel (broken) problem with removes.	594	# Now delete entries
1185.82.21 by Aaron Bentley Stop using deprecated function	595	self.tree1.remove(
0.5.118 by John Arbash Meinel Got most of test_changeset to work. Still needs work for Aaron's test code.	596	['sub/sub/nonempty.txt'
0.5.84 by John Arbash Meinel (broken) problem with removes.	597	, 'sub/sub/emptyfile.txt'
0.5.118 by John Arbash Meinel Got most of test_changeset to work. Still needs work for Aaron's test code.	598	, 'sub/sub'
	599	])
1185.82.68 by Aaron Bentley Handle execute bit on modified files	600	tt = TreeTransform(self.tree1)
	601	trans_id = tt.trans_id_tree_file_id('exe-1')
	602	tt.set_executability(False, trans_id)
	603	tt.apply()
1185.82.19 by Aaron Bentley More API updates	604	self.tree1.commit('removed', rev_id='a@cset-0-3')
0.5.80 by John Arbash Meinel Starting to write tests for changeset, discovering some errors as I go.	605
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	606	bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
2520.4.71 by Aaron Bentley Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch	607	self.assertRaises((TestamentMismatch,
	608	errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
	609	'a@cset-0-2', 'a@cset-0-3')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	610	# Check a rollup bundle
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	611	bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
0.5.84 by John Arbash Meinel (broken) problem with removes.	612
0.5.84 by John Arbash Meinel (broken) problem with removes.	613	# Now move the directory
1185.82.19 by Aaron Bentley More API updates	614	self.tree1.rename_one('dir', 'sub/dir')
1185.82.19 by Aaron Bentley More API updates	615	self.tree1.commit('rename dir', rev_id='a@cset-0-4')
0.5.84 by John Arbash Meinel (broken) problem with removes.	616
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	617	bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
	618	# Check a rollup bundle
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	619	bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
0.5.84 by John Arbash Meinel (broken) problem with removes.	620
0.5.87 by John Arbash Meinel Handling international characters, added more test cases.	621	# Modified files
	622	open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
2520.4.83 by Aaron Bentley Clean up tests	623	open('b1/sub/dir/ pre space', 'ab').write(
2520.4.83 by Aaron Bentley Clean up tests	624	'\r\nAdding some\r\nDOS format lines\r\n')
0.5.94 by Aaron Bentley Switched to native patch application, added tests for terminating newlines	625	open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
1711.7.32 by John Arbash Meinel Switch from a trailing space to a beginning space, which is supported everywhere.	626	self.tree1.rename_one('sub/dir/ pre space',
	627	'sub/ start space')
1185.82.19 by Aaron Bentley More API updates	628	self.tree1.commit('Modified files', rev_id='a@cset-0-5')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	629	bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
0.5.87 by John Arbash Meinel Handling international characters, added more test cases.	630
1185.82.70 by Aaron Bentley Handle renamed files better	631	self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
	632	self.tree1.rename_one('with space.txt', 'WithCaps.txt')
	633	self.tree1.rename_one('temp', 'with space.txt')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	634	self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
	635	verbose=False)
	636	bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
	637	other = self.get_checkout('a@cset-0-5')
1910.2.62 by Aaron Bentley Cleanups	638	tree1_inv = self.tree1.branch.repository.get_inventory_xml(
1910.2.62 by Aaron Bentley Cleanups	639	'a@cset-0-5')
1910.2.54 by Aaron Bentley Implement testament format 3 strict	640	tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
	641	self.assertEqualDiff(tree1_inv, tree2_inv)
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	642	other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
	643	other.commit('rename file', rev_id='a@cset-0-6b')
1551.15.72 by Aaron Bentley remove builtins._merge_helper	644	self.tree1.merge_from_branch(other.branch)
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	645	self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
1185.82.70 by Aaron Bentley Handle renamed files better	646	verbose=False)
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	647	bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
1185.82.72 by Aaron Bentley Always use leftmost base for changesets	648
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	649	def test_symlink_bundle(self):
2949.5.1 by Alexander Belchenko selftest: use SymlinkFeature instead of TestSkipped where appropriate	650	self.requireFeature(SymlinkFeature)
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	651	self.tree1 = self.make_branch_and_tree('b1')
1185.82.87 by Aaron Bentley Got symlink adding working	652	self.b1 = self.tree1.branch
1185.82.87 by Aaron Bentley Got symlink adding working	653	tt = TreeTransform(self.tree1)
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	654	tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
1185.82.87 by Aaron Bentley Got symlink adding working	655	tt.apply()
1185.82.87 by Aaron Bentley Got symlink adding working	656	self.tree1.commit('add symlink', rev_id='l@cset-0-1')
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	657	self.get_valid_bundle('null:', 'l@cset-0-1')
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	658	tt = TreeTransform(self.tree1)
	659	trans_id = tt.trans_id_tree_file_id('link-1')
	660	tt.adjust_path('link2', tt.root, trans_id)
	661	tt.delete_contents(trans_id)
	662	tt.create_symlink('mars', trans_id)
	663	tt.apply()
	664	self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	665	self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	666	tt = TreeTransform(self.tree1)
	667	trans_id = tt.trans_id_tree_file_id('link-1')
	668	tt.delete_contents(trans_id)
	669	tt.create_symlink('jupiter', trans_id)
	670	tt.apply()
	671	self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	672	self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
1185.82.88 by Aaron Bentley Get symlink modification, renames and deletion under test	673	tt = TreeTransform(self.tree1)
	674	trans_id = tt.trans_id_tree_file_id('link-1')
	675	tt.delete_contents(trans_id)
	676	tt.apply()
	677	self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	678	self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
1185.82.96 by Aaron Bentley Got first binary test passing	679
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	680	def test_binary_bundle(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	681	self.tree1 = self.make_branch_and_tree('b1')
1185.82.96 by Aaron Bentley Got first binary test passing	682	self.b1 = self.tree1.branch
1185.82.96 by Aaron Bentley Got first binary test passing	683	tt = TreeTransform(self.tree1)
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	684
	685	# Add
	686	tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
2520.4.83 by Aaron Bentley Clean up tests	687	tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
2520.4.83 by Aaron Bentley Clean up tests	688	'binary-2')
1185.82.96 by Aaron Bentley Got first binary test passing	689	tt.apply()
1185.82.96 by Aaron Bentley Got first binary test passing	690	self.tree1.commit('add binary', rev_id='b@cset-0-1')
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	691	self.get_valid_bundle('null:', 'b@cset-0-1')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	692
	693	# Delete
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	694	tt = TreeTransform(self.tree1)
	695	trans_id = tt.trans_id_tree_file_id('binary-1')
	696	tt.delete_contents(trans_id)
	697	tt.apply()
	698	self.tree1.commit('delete binary', rev_id='b@cset-0-2')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	699	self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	700
	701	# Rename & modify
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	702	tt = TreeTransform(self.tree1)
	703	trans_id = tt.trans_id_tree_file_id('binary-2')
	704	tt.adjust_path('file3', tt.root, trans_id)
	705	tt.delete_contents(trans_id)
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	706	tt.create_file('file\rcontents\x00\n\x00', trans_id)
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	707	tt.apply()
	708	self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	709	self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	710
	711	# Modify
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	712	tt = TreeTransform(self.tree1)
	713	trans_id = tt.trans_id_tree_file_id('binary-2')
	714	tt.delete_contents(trans_id)
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	715	tt.create_file('\x00file\rcontents', trans_id)
1185.82.97 by Aaron Bentley Got binary files working for adds, renames, modifications	716	tt.apply()
	717	self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	718	self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	719
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	720	# Rollup
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	721	self.get_valid_bundle('null:', 'b@cset-0-4')
1848.1.1 by John Arbash Meinel fix bug in bundle handling of binary files with just '\r' in them.	722
1185.82.115 by Aaron Bentley Add test for last-changed special cases	723	def test_last_modified(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	724	self.tree1 = self.make_branch_and_tree('b1')
1185.82.115 by Aaron Bentley Add test for last-changed special cases	725	self.b1 = self.tree1.branch
	726	tt = TreeTransform(self.tree1)
	727	tt.new_file('file', tt.root, 'file', 'file')
	728	tt.apply()
	729	self.tree1.commit('create file', rev_id='a@lmod-0-1')
	730
	731	tt = TreeTransform(self.tree1)
	732	trans_id = tt.trans_id_tree_file_id('file')
	733	tt.delete_contents(trans_id)
	734	tt.create_file('file2', trans_id)
	735	tt.apply()
	736	self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
	737
	738	other = self.get_checkout('a@lmod-0-1')
	739	tt = TreeTransform(other)
	740	trans_id = tt.trans_id_tree_file_id('file')
	741	tt.delete_contents(trans_id)
	742	tt.create_file('file2', trans_id)
	743	tt.apply()
	744	other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
1551.15.72 by Aaron Bentley remove builtins._merge_helper	745	self.tree1.merge_from_branch(other.branch)
1185.82.115 by Aaron Bentley Add test for last-changed special cases	746	self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
	747	verbose=False)
	748	self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
1185.82.130 by Aaron Bentley Rename changesets to revision bundles	749	bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	750
	751	def test_hide_history(self):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	752	self.tree1 = self.make_branch_and_tree('b1')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	753	self.b1 = self.tree1.branch
	754
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	755	open('b1/one', 'wb').write('one\n')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	756	self.tree1.add('one')
	757	self.tree1.commit('add file', rev_id='a@cset-0-1')
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	758	open('b1/one', 'wb').write('two\n')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	759	self.tree1.commit('modify', rev_id='a@cset-0-2')
1793.3.1 by John Arbash Meinel Clean up the bundle tests a little bit.	760	open('b1/one', 'wb').write('three\n')
1185.84.3 by Aaron Bentley Hide diffs for old revisions in bundles	761	self.tree1.commit('modify', rev_id='a@cset-0-3')
	762	bundle_file = StringIO()
	763	rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
1910.2.51 by Aaron Bentley Bundles now corrupt repositories	764	'a@cset-0-1', bundle_file, format=self.format)
2382.1.1 by Ian Clatworthy Fixes #98510 - bundle selftest fails if email has 'two' embedded	765	self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
2520.4.32 by Aaron Bentley Fix test case	766	self.assertContainsRe(self.get_raw(bundle_file), 'one')
	767	self.assertContainsRe(self.get_raw(bundle_file), 'three')
	768
2520.4.75 by Aaron Bentley Fix traceback on empty bundles.	769	def test_bundle_same_basis(self):
	770	"""Ensure using the basis as the target doesn't cause an error"""
	771	self.tree1 = self.make_branch_and_tree('b1')
	772	self.tree1.commit('add file', rev_id='a@cset-0-1')
	773	bundle_file = StringIO()
	774	rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
	775	'a@cset-0-1', bundle_file)
	776
2520.4.32 by Aaron Bentley Fix test case	777	@staticmethod
	778	def get_raw(bundle_file):
	779	return bundle_file.getvalue()
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	780
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	781	def test_unicode_bundle(self):
	782	# Handle international characters
	783	os.mkdir('b1')
	784	try:
	785	f = open(u'b1/with Dod\xe9', 'wb')
	786	except UnicodeEncodeError:
	787	raise TestSkipped("Filesystem doesn't support unicode")
	788
	789	self.tree1 = self.make_branch_and_tree('b1')
	790	self.b1 = self.tree1.branch
	791
	792	f.write((u'A file\n'
	793	u'With international man of mystery\n'
	794	u'William Dod\xe9\n').encode('utf-8'))
	795	f.close()
	796
2386.1.1 by John Arbash Meinel Update test_unicode_bundle, since we know how it fails on Mac OSX	797	self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
	798	self.tree1.commit(u'i18n commit from William Dod\xe9',
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	799	rev_id='i18n-1', committer=u'William Dod\xe9')
	800
2386.1.1 by John Arbash Meinel Update test_unicode_bundle, since we know how it fails on Mac OSX	801	if sys.platform == 'darwin':
2823.1.3 by Vincent Ladeuil WorkingTree3 unicode related expected failure.	802	from bzrlib.workingtree import WorkingTree3
	803	if type(self.tree1) is WorkingTree3:
2823.1.11 by Vincent Ladeuil Review feedback.	804	self.knownFailure("Bug #141438: fails for WorkingTree3 on OSX")
2823.1.3 by Vincent Ladeuil WorkingTree3 unicode related expected failure.	805
2386.1.1 by John Arbash Meinel Update test_unicode_bundle, since we know how it fails on Mac OSX	806	# On Mac the '\xe9' gets changed to 'e\u0301'
	807	self.assertEqual([u'.bzr', u'with Dode\u0301'],
	808	sorted(os.listdir(u'b1')))
	809	delta = self.tree1.changes_from(self.tree1.basis_tree())
	810	self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
	811	delta.removed)
	812	self.knownFailure("Mac OSX doesn't preserve unicode"
	813	" combining characters.")
	814
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	815	# Add
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	816	bundle = self.get_valid_bundle('null:', 'i18n-1')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	817
	818	# Modified
	819	f = open(u'b1/with Dod\xe9', 'wb')
	820	f.write(u'Modified \xb5\n'.encode('utf8'))
	821	f.close()
	822	self.tree1.commit(u'modified', rev_id='i18n-2')
	823
	824	bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
	825
	826	# Renamed
	827	self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
	828	self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
	829	committer=u'Erik B\xe5gfors')
	830
	831	bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
	832
	833	# Removed
	834	self.tree1.remove([u'B\xe5gfors'])
	835	self.tree1.commit(u'removed', rev_id='i18n-4')
	836
	837	bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
	838
	839	# Rollup
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	840	bundle = self.get_valid_bundle('null:', 'i18n-4')
1711.7.35 by John Arbash Meinel Factor out i18n bundle tests, so we don't always skip.	841
	842
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	843	def test_whitespace_bundle(self):
	844	if sys.platform in ('win32', 'cygwin'):
	845	raise TestSkipped('Windows doesn\'t support filenames'
	846	' with tabs or trailing spaces')
	847	self.tree1 = self.make_branch_and_tree('b1')
	848	self.b1 = self.tree1.branch
	849
	850	self.build_tree(['b1/trailing space '])
	851	self.tree1.add(['trailing space '])
	852	# TODO: jam 20060701 Check for handling files with '\t' characters
	853	# once we actually support them
	854
	855	# Added
	856	self.tree1.commit('funky whitespace', rev_id='white-1')
	857
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	858	bundle = self.get_valid_bundle('null:', 'white-1')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	859
	860	# Modified
	861	open('b1/trailing space ', 'ab').write('add some text\n')
	862	self.tree1.commit('add text', rev_id='white-2')
	863
	864	bundle = self.get_valid_bundle('white-1', 'white-2')
	865
	866	# Renamed
	867	self.tree1.rename_one('trailing space ', ' start and end space ')
	868	self.tree1.commit('rename', rev_id='white-3')
	869
	870	bundle = self.get_valid_bundle('white-2', 'white-3')
	871
	872	# Removed
	873	self.tree1.remove([' start and end space '])
	874	self.tree1.commit('removed', rev_id='white-4')
	875
	876	bundle = self.get_valid_bundle('white-3', 'white-4')
	877
	878	# Now test a complet roll-up
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	879	bundle = self.get_valid_bundle('null:', 'white-4')
1711.7.34 by John Arbash Meinel Include a test to ensure bundles handle trailing whitespace.	880
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	881	def test_alt_timezone_bundle(self):
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	882	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	883	self.b1 = self.tree1.branch
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	884	builder = treebuilder.TreeBuilder()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	885
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	886	self.tree1.lock_write()
	887	builder.start_tree(self.tree1)
	888	builder.build(['newfile'])
	889	builder.finish_tree()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	890
	891	# Asia/Colombo offset = 5 hours 30 minutes
	892	self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
	893	timezone=19800, timestamp=1152544886.0)
	894
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	895	bundle = self.get_valid_bundle('null:', 'tz-1')
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	896
	897	rev = bundle.revisions[0]
	898	self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
	899	self.assertEqual(19800, rev.timezone)
	900	self.assertEqual(1152544886.0, rev.timestamp)
1986.1.2 by Robert Collins Various changes to allow non-workingtree specific tests to run entirely	901	self.tree1.unlock()
1793.3.9 by John Arbash Meinel Add a test to timezone for non integer tz offsets	902
1910.2.1 by Aaron Bentley Ensure root entry always has a revision	903	def test_bundle_root_id(self):
	904	self.tree1 = self.make_branch_and_tree('b1')
	905	self.b1 = self.tree1.branch
	906	self.tree1.commit('message', rev_id='revid1')
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	907	bundle = self.get_valid_bundle('null:', 'revid1')
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	908	tree = self.get_bundle_tree(bundle, 'revid1')
1910.2.6 by Aaron Bentley Update for merge review, handle deprecations	909	self.assertEqual('revid1', tree.inventory.root.revision)
1910.2.1 by Aaron Bentley Ensure root entry always has a revision	910
1551.14.9 by Aaron Bentley rename get_target_revision to install_revisions	911	def test_install_revisions(self):
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	912	self.tree1 = self.make_branch_and_tree('b1')
	913	self.b1 = self.tree1.branch
	914	self.tree1.commit('message', rev_id='rev2a')
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	915	bundle = self.get_valid_bundle('null:', 'rev2a')
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	916	branch2 = self.make_branch('b2')
	917	self.assertFalse(branch2.repository.has_revision('rev2a'))
1551.14.9 by Aaron Bentley rename get_target_revision to install_revisions	918	target_revision = bundle.install_revisions(branch2.repository)
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	919	self.assertTrue(branch2.repository.has_revision('rev2a'))
1551.14.9 by Aaron Bentley rename get_target_revision to install_revisions	920	self.assertEqual('rev2a', target_revision)
1551.14.4 by Aaron Bentley Change bundle reader and merge directive to both be 'mergeables'	921
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	922	def test_bundle_empty_property(self):
	923	"""Test serializing revision properties with an empty value."""
	924	tree = self.make_branch_and_memory_tree('tree')
	925	tree.lock_write()
	926	self.addCleanup(tree.unlock)
	927	tree.add([''], ['TREE_ROOT'])
	928	tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
	929	self.b1 = tree.branch
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	930	bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	931	bundle = read_bundle(bundle_sio)
	932	revision_info = bundle.revisions[0]
	933	self.assertEqual('rev1', revision_info.revision_id)
	934	rev = revision_info.as_revision()
	935	self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
	936	rev.properties)
	937
	938	def test_bundle_sorted_properties(self):
	939	"""For stability the writer should write properties in sorted order."""
	940	tree = self.make_branch_and_memory_tree('tree')
	941	tree.lock_write()
	942	self.addCleanup(tree.unlock)
	943
	944	tree.add([''], ['TREE_ROOT'])
	945	tree.commit('One', rev_id='rev1',
	946	revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
	947	self.b1 = tree.branch
2520.4.132 by Aaron Bentley Merge from bzr.dev	948	bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	949	bundle = read_bundle(bundle_sio)
	950	revision_info = bundle.revisions[0]
	951	self.assertEqual('rev1', revision_info.revision_id)
	952	rev = revision_info.as_revision()
	953	self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
	954	'd':'1'}, rev.properties)
	955
	956	def test_bundle_unicode_properties(self):
	957	"""We should be able to round trip a non-ascii property."""
	958	tree = self.make_branch_and_memory_tree('tree')
	959	tree.lock_write()
	960	self.addCleanup(tree.unlock)
	961
	962	tree.add([''], ['TREE_ROOT'])
	963	# Revisions themselves do not require anything about revision property
	964	# keys, other than that they are a basestring, and do not contain
	965	# whitespace.
	966	# However, Testaments assert than they are str(), and thus should not
	967	# be Unicode.
	968	tree.commit('One', rev_id='rev1',
	969	revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
	970	self.b1 = tree.branch
2520.4.132 by Aaron Bentley Merge from bzr.dev	971	bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	972	bundle = read_bundle(bundle_sio)
	973	revision_info = bundle.revisions[0]
	974	self.assertEqual('rev1', revision_info.revision_id)
	975	rev = revision_info.as_revision()
	976	self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
	977	'alpha':u'\u03b1'}, rev.properties)
	978
2520.4.43 by Aaron Bentley Fix test suite	979	def test_bundle_with_ghosts(self):
	980	tree = self.make_branch_and_tree('tree')
	981	self.b1 = tree.branch
	982	self.build_tree_contents([('tree/file', 'content1')])
	983	tree.add(['file'])
	984	tree.commit('rev1')
	985	self.build_tree_contents([('tree/file', 'content2')])
	986	tree.add_parent_tree_id('ghost')
	987	tree.commit('rev2', rev_id='rev2')
2520.4.132 by Aaron Bentley Merge from bzr.dev	988	bundle = self.get_valid_bundle('null:', 'rev2')
2520.4.43 by Aaron Bentley Fix test suite	989
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	990	def make_simple_tree(self, format=None):
	991	tree = self.make_branch_and_tree('b1', format=format)
	992	self.b1 = tree.branch
	993	self.build_tree(['b1/file'])
	994	tree.add('file')
	995	return tree
	996
	997	def test_across_serializers(self):
	998	tree = self.make_simple_tree('knit')
	999	tree.commit('hello', rev_id='rev1')
2520.4.98 by Aaron Bentley Support inventory conversion with parents	1000	tree.commit('hello', rev_id='rev2')
2520.4.132 by Aaron Bentley Merge from bzr.dev	1001	bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1002	repo = self.make_repository('repo', format='dirstate-with-subtree')
	1003	bundle.install_revisions(repo)
2520.4.98 by Aaron Bentley Support inventory conversion with parents	1004	inv_text = repo.get_inventory_xml('rev2')
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1005	self.assertNotContainsRe(inv_text, 'format="5"')
2520.4.99 by Aaron Bentley Test conversion across models	1006	self.assertContainsRe(inv_text, 'format="7"')
	1007
	1008	def test_across_models(self):
	1009	tree = self.make_simple_tree('knit')
	1010	tree.commit('hello', rev_id='rev1')
	1011	tree.commit('hello', rev_id='rev2')
2520.4.132 by Aaron Bentley Merge from bzr.dev	1012	bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
2520.4.99 by Aaron Bentley Test conversion across models	1013	repo = self.make_repository('repo', format='dirstate-with-subtree')
	1014	bundle.install_revisions(repo)
	1015	inv = repo.get_inventory('rev2')
	1016	self.assertEqual('rev2', inv.root.revision)
	1017	root_vf = repo.weave_store.get_weave(inv.root.file_id,
	1018	repo.get_transaction())
	1019	self.assertEqual(root_vf.versions(), ['rev1', 'rev2'])
	1020
	1021	def test_across_models_incompatible(self):
	1022	tree = self.make_simple_tree('dirstate-with-subtree')
	1023	tree.commit('hello', rev_id='rev1')
	1024	tree.commit('hello', rev_id='rev2')
	1025	try:
2520.4.132 by Aaron Bentley Merge from bzr.dev	1026	bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
2520.4.99 by Aaron Bentley Test conversion across models	1027	except errors.IncompatibleBundleFormat:
	1028	raise TestSkipped("Format 0.8 doesn't work with knit3")
	1029	repo = self.make_repository('repo', format='knit')
	1030	bundle.install_revisions(repo)
	1031
2520.4.132 by Aaron Bentley Merge from bzr.dev	1032	bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
2520.4.99 by Aaron Bentley Test conversion across models	1033	self.assertRaises(errors.IncompatibleRevision,
2520.4.99 by Aaron Bentley Test conversion across models	1034	bundle.install_revisions, repo)
2520.4.97 by Aaron Bentley Hack in support for inventory conversion	1035
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1036	def test_get_merge_request(self):
	1037	tree = self.make_simple_tree()
	1038	tree.commit('hello', rev_id='rev1')
	1039	tree.commit('hello', rev_id='rev2')
2520.4.132 by Aaron Bentley Merge from bzr.dev	1040	bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
2520.4.109 by Aaron Bentley start work on directive cherry-picking	1041	result = bundle.get_merge_request(tree.branch.repository)
	1042	self.assertEqual((None, 'rev1', 'inapplicable'), result)
	1043
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1044	def test_with_subtree(self):
	1045	tree = self.make_branch_and_tree('tree',
	1046	format='dirstate-with-subtree')
	1047	self.b1 = tree.branch
	1048	subtree = self.make_branch_and_tree('tree/subtree',
	1049	format='dirstate-with-subtree')
	1050	tree.add('subtree')
	1051	tree.commit('hello', rev_id='rev1')
	1052	try:
2520.4.132 by Aaron Bentley Merge from bzr.dev	1053	bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
2520.5.1 by Aaron Bentley Test installing revisions with subtrees	1054	except errors.IncompatibleBundleFormat:
	1055	raise TestSkipped("Format 0.8 doesn't work with knit3")
	1056	if isinstance(bundle, v09.BundleInfo09):
	1057	raise TestSkipped("Format 0.9 doesn't work with subtrees")
	1058	repo = self.make_repository('repo', format='knit')
	1059	self.assertRaises(errors.IncompatibleRevision,
	1060	bundle.install_revisions, repo)
	1061	repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
	1062	bundle.install_revisions(repo2)
	1063
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1064	def test_revision_id_with_slash(self):
	1065	self.tree1 = self.make_branch_and_tree('tree')
	1066	self.b1 = self.tree1.branch
	1067	try:
	1068	self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
	1069	except ValueError:
	1070	raise TestSkipped("Repository doesn't support revision ids with"
	1071	" slashes")
2520.4.132 by Aaron Bentley Merge from bzr.dev	1072	bundle = self.get_valid_bundle('null:', 'rev/id')
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1073
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1074	def test_skip_file(self):
	1075	"""Make sure we don't accidentally write to the wrong versionedfile"""
	1076	self.tree1 = self.make_branch_and_tree('tree')
	1077	self.b1 = self.tree1.branch
	1078	# rev1 is not present in bundle, done by fetch
	1079	self.build_tree_contents([('tree/file2', 'contents1')])
	1080	self.tree1.add('file2', 'file2-id')
	1081	self.tree1.commit('rev1', rev_id='reva')
	1082	self.build_tree_contents([('tree/file3', 'contents2')])
	1083	# rev2 is present in bundle, and done by fetch
	1084	# having file1 in the bunle causes file1's versionedfile to be opened.
	1085	self.tree1.add('file3', 'file3-id')
	1086	self.tree1.commit('rev2')
	1087	# Updating file2 should not cause an attempt to add to file1's vf
	1088	target = self.tree1.bzrdir.sprout('target').open_workingtree()
	1089	self.build_tree_contents([('tree/file2', 'contents3')])
	1090	self.tree1.commit('rev3', rev_id='rev3')
	1091	bundle = self.get_valid_bundle('reva', 'rev3')
2520.6.5 by Aaron Bentley Skip for bundle formats that don't provide get_bundle_reader	1092	if getattr(bundle, 'get_bundle_reader', None) is None:
	1093	raise TestSkipped('Bundle format cannot provide reader')
2520.6.2 by Aaron Bentley Fix bundle installation wrong-versionedfile bug	1094	# be sure that file1 comes before file2
	1095	for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
	1096	if f == 'file3-id':
	1097	break
	1098	self.assertNotEqual(f, 'file2-id')
	1099	bundle.install_revisions(target.branch.repository)
	1100
2520.4.43 by Aaron Bentley Fix test suite	1101
2520.4.43 by Aaron Bentley Fix test suite	1102	class V08BundleTester(BundleTester, TestCaseWithTransport):
2520.4.33 by Aaron Bentley remove test dependencies on serialization minutia	1103
	1104	format = '0.8'
	1105
	1106	def test_bundle_empty_property(self):
	1107	"""Test serializing revision properties with an empty value."""
	1108	tree = self.make_branch_and_memory_tree('tree')
	1109	tree.lock_write()
	1110	self.addCleanup(tree.unlock)
	1111	tree.add([''], ['TREE_ROOT'])
	1112	tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
	1113	self.b1 = tree.branch
2520.4.132 by Aaron Bentley Merge from bzr.dev	1114	bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1115	self.assertContainsRe(bundle_sio.getvalue(),
	1116	'# properties:\n'
	1117	'# branch-nick: tree\n'
2447.1.3 by John Arbash Meinel Change the default serializer to include a trailing whitespace for empty properties.	1118	'# empty: \n'
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1119	'# one: two\n'
	1120	)
	1121	bundle = read_bundle(bundle_sio)
	1122	revision_info = bundle.revisions[0]
	1123	self.assertEqual('rev1', revision_info.revision_id)
	1124	rev = revision_info.as_revision()
	1125	self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
	1126	rev.properties)
	1127
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1128	def get_bundle_tree(self, bundle, revision_id):
	1129	repository = self.make_repository('repo')
	1130	return bundle.revision_tree(repository, 'revid1')
	1131
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1132	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.	1133	"""Test serializing revision properties with an empty value.
	1134
	1135	Older readers had a bug when reading an empty property.
	1136	They assumed that all keys ended in ': \n'. However they would write an
	1137	empty value as ':\n'. This tests make sure that all newer bzr versions
	1138	can handle th second form.
	1139	"""
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1140	tree = self.make_branch_and_memory_tree('tree')
	1141	tree.lock_write()
	1142	self.addCleanup(tree.unlock)
	1143	tree.add([''], ['TREE_ROOT'])
	1144	tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
	1145	self.b1 = tree.branch
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	1146	bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1147	txt = bundle_sio.getvalue()
2447.1.3 by John Arbash Meinel Change the default serializer to include a trailing whitespace for empty properties.	1148	loc = txt.find('# empty: ') + len('# empty:')
	1149	# Create a new bundle, which strips the trailing space after empty
	1150	bundle_sio = StringIO(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'.	1151
	1152	self.assertContainsRe(bundle_sio.getvalue(),
	1153	'# properties:\n'
	1154	'# branch-nick: tree\n'
2447.1.3 by John Arbash Meinel Change the default serializer to include a trailing whitespace for empty properties.	1155	'# empty:\n'
2447.1.2 by John Arbash Meinel Add tests that we handle empty values whether they end in ': \n' or ':\n'.	1156	'# one: two\n'
	1157	)
	1158	bundle = read_bundle(bundle_sio)
	1159	revision_info = bundle.revisions[0]
	1160	self.assertEqual('rev1', revision_info.revision_id)
	1161	rev = revision_info.as_revision()
	1162	self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
	1163	rev.properties)
	1164
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1165	def test_bundle_sorted_properties(self):
	1166	"""For stability the writer should write properties in sorted order."""
	1167	tree = self.make_branch_and_memory_tree('tree')
	1168	tree.lock_write()
	1169	self.addCleanup(tree.unlock)
	1170
	1171	tree.add([''], ['TREE_ROOT'])
	1172	tree.commit('One', rev_id='rev1',
	1173	revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
	1174	self.b1 = tree.branch
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	1175	bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1176	self.assertContainsRe(bundle_sio.getvalue(),
	1177	'# properties:\n'
	1178	'# a: 4\n'
	1179	'# b: 3\n'
	1180	'# branch-nick: tree\n'
	1181	'# c: 2\n'
	1182	'# d: 1\n'
	1183	)
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1184	bundle = read_bundle(bundle_sio)
	1185	revision_info = bundle.revisions[0]
	1186	self.assertEqual('rev1', revision_info.revision_id)
	1187	rev = revision_info.as_revision()
	1188	self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
	1189	'd':'1'}, rev.properties)
	1190
	1191	def test_bundle_unicode_properties(self):
	1192	"""We should be able to round trip a non-ascii property."""
	1193	tree = self.make_branch_and_memory_tree('tree')
	1194	tree.lock_write()
	1195	self.addCleanup(tree.unlock)
	1196
	1197	tree.add([''], ['TREE_ROOT'])
	1198	# Revisions themselves do not require anything about revision property
	1199	# keys, other than that they are a basestring, and do not contain
	1200	# whitespace.
	1201	# However, Testaments assert than they are str(), and thus should not
	1202	# be Unicode.
	1203	tree.commit('One', rev_id='rev1',
	1204	revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
	1205	self.b1 = tree.branch
2598.5.3 by Aaron Bentley Push NULL_REVISION deeper	1206	bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
2447.1.4 by John Arbash Meinel Add a test that we properly round-trip unicode properties.	1207	self.assertContainsRe(bundle_sio.getvalue(),
	1208	'# properties:\n'
	1209	'# alpha: \xce\xb1\n'
	1210	'# branch-nick: tree\n'
	1211	'# omega: \xce\xa9\n'
	1212	)
	1213	bundle = read_bundle(bundle_sio)
	1214	revision_info = bundle.revisions[0]
	1215	self.assertEqual('rev1', revision_info.revision_id)
	1216	rev = revision_info.as_revision()
	1217	self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
	1218	'alpha':u'\u03b1'}, rev.properties)
2447.1.1 by John Arbash Meinel For stability and ease of testing, write properties in sorted order.	1219
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1220
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1221	class V09BundleKnit2Tester(V08BundleTester):
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	1222
	1223	format = '0.9'
	1224
	1225	def bzrdir_format(self):
	1226	format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins Remove knit2 repository format- it has never been supported.	1227	format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.50 by Aaron Bentley start work on format 0.9 serializer	1228	return format
	1229
	1230
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1231	class V09BundleKnit1Tester(V08BundleTester):
	1232
	1233	format = '0.9'
	1234
	1235	def bzrdir_format(self):
	1236	format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and	1237	format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.59 by Aaron Bentley Test 0.9 bundles for knit format1 and knit format2	1238	return format
	1239
	1240
2520.4.72 by Aaron Bentley Rename format to 4alpha	1241	class V4BundleTester(BundleTester, TestCaseWithTransport):
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1242
2520.4.136 by Aaron Bentley Fix format strings	1243	format = '4'
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1244
	1245	def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
	1246	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1247	Make sure that the text generated is valid, and that it
	1248	can be applied against the base, and generate the same information.
	1249
	1250	:return: The in-memory bundle
	1251	"""
	1252	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
	1253
	1254	# This should also validate the generated bundle
	1255	bundle = read_bundle(bundle_txt)
	1256	repository = self.b1.repository
	1257	for bundle_rev in bundle.real_revisions:
	1258	# These really should have already been checked when we read the
	1259	# bundle, since it computes the sha1 hash for the revision, which
	1260	# only will match if everything is okay, but lets be explicit about
	1261	# it
	1262	branch_rev = repository.get_revision(bundle_rev.revision_id)
	1263	for a in ('inventory_sha1', 'revision_id', 'parent_ids',
	1264	'timestamp', 'timezone', 'message', 'committer',
	1265	'parent_ids', 'properties'):
	1266	self.assertEqual(getattr(branch_rev, a),
	1267	getattr(bundle_rev, a))
	1268	self.assertEqual(len(branch_rev.parent_ids),
	1269	len(bundle_rev.parent_ids))
2520.4.29 by Aaron Bentley Reactivate some testing, fix topo_iter	1270	self.assertEqual(set(rev_ids),
	1271	set([r.revision_id for r in bundle.real_revisions]))
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1272	self.valid_apply_bundle(base_rev_id, bundle,
	1273	checkout_dir=checkout_dir)
	1274
	1275	return bundle
	1276
2520.4.34 by Aaron Bentley Add signature support	1277	def get_invalid_bundle(self, base_rev_id, rev_id):
	1278	"""Create a bundle from base_rev_id -> rev_id in built-in branch.
	1279	Munge the text so that it's invalid.
	1280
	1281	:return: The in-memory bundle
	1282	"""
	1283	from bzrlib.bundle import serializer
	1284	bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
	1285	new_text = self.get_raw(StringIO(''.join(bundle_txt)))
	1286	new_text = new_text.replace('<file file_id="exe-1"',
	1287	'<file executable="y" file_id="exe-1"')
2520.4.143 by Aaron Bentley Fix invalid bundle test	1288	new_text = new_text.replace('B222', 'B237')
2520.4.34 by Aaron Bentley Add signature support	1289	bundle_txt = StringIO()
2520.4.136 by Aaron Bentley Fix format strings	1290	bundle_txt.write(serializer._get_bundle_header('4'))
2520.4.34 by Aaron Bentley Add signature support	1291	bundle_txt.write('\n')
2520.4.76 by Aaron Bentley Move base64-encoding into merge directives	1292	bundle_txt.write(new_text.encode('bz2'))
2520.4.34 by Aaron Bentley Add signature support	1293	bundle_txt.seek(0)
	1294	bundle = read_bundle(bundle_txt)
	1295	self.valid_apply_bundle(base_rev_id, bundle)
	1296	return bundle
	1297
2520.4.14 by Aaron Bentley Get most tests passing, use format header	1298	def create_bundle_text(self, base_rev_id, rev_id):
	1299	bundle_txt = StringIO()
	1300	rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
	1301	bundle_txt, format=self.format)
	1302	bundle_txt.seek(0)
	1303	self.assertEqual(bundle_txt.readline(),
	1304	'# Bazaar revision bundle v%s\n' % self.format)
	1305	self.assertEqual(bundle_txt.readline(), '#\n')
	1306	rev = self.b1.repository.get_revision(rev_id)
	1307	bundle_txt.seek(0)
	1308	return bundle_txt, rev_ids
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1309
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1310	def get_bundle_tree(self, bundle, revision_id):
	1311	repository = self.make_repository('repo')
	1312	bundle.install_revisions(repository)
	1313	return repository.revision_tree(revision_id)
	1314
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1315	def test_creation(self):
	1316	tree = self.make_branch_and_tree('tree')
2520.4.8 by Aaron Bentley Serialize inventory	1317	self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
2520.4.6 by Aaron Bentley Get installation started	1318	tree.add('file', 'fileid-2')
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1319	tree.commit('added file', rev_id='rev1')
2520.4.8 by Aaron Bentley Serialize inventory	1320	self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
2520.4.10 by Aaron Bentley Enable installation of revisions	1321	tree.commit('changed file', rev_id='rev2')
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1322	s = StringIO()
2520.4.72 by Aaron Bentley Rename format to 4alpha	1323	serializer = BundleSerializerV4('1.0')
2520.4.8 by Aaron Bentley Serialize inventory	1324	serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
2520.4.5 by Aaron Bentley Start work on reading mpbundles	1325	s.seek(0)
2520.4.6 by Aaron Bentley Get installation started	1326	tree2 = self.make_branch_and_tree('target')
	1327	target_repo = tree2.branch.repository
	1328	install_bundle(target_repo, serializer.read(s))
	1329	vf = target_repo.weave_store.get_weave('fileid-2',
	1330	target_repo.get_transaction())
2520.4.8 by Aaron Bentley Serialize inventory	1331	self.assertEqual('contents1\nstatic\n', vf.get_text('rev1'))
	1332	self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
	1333	rtree = target_repo.revision_tree('rev2')
2520.4.9 by Aaron Bentley Test inventory_vf parents	1334	inventory_vf = target_repo.get_inventory_weave()
2520.4.9 by Aaron Bentley Test inventory_vf parents	1335	self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
2520.4.10 by Aaron Bentley Enable installation of revisions	1336	self.assertEqual('changed file',
2520.4.10 by Aaron Bentley Enable installation of revisions	1337	target_repo.get_revision('rev2').message)
2520.4.6 by Aaron Bentley Get installation started	1338
2520.4.32 by Aaron Bentley Fix test case	1339	@staticmethod
	1340	def get_raw(bundle_file):
	1341	bundle_file.seek(0)
2520.4.70 by Aaron Bentley Yank patch-handling functionality	1342	line = bundle_file.readline()
	1343	line = bundle_file.readline()
2520.4.32 by Aaron Bentley Fix test case	1344	lines = bundle_file.readlines()
2520.4.76 by Aaron Bentley Move base64-encoding into merge directives	1345	return ''.join(lines).decode('bz2')
2520.4.32 by Aaron Bentley Fix test case	1346
2520.4.34 by Aaron Bentley Add signature support	1347	def test_copy_signatures(self):
	1348	tree_a = self.make_branch_and_tree('tree_a')
	1349	import bzrlib.gpg
	1350	import bzrlib.commit as commit
	1351	oldstrategy = bzrlib.gpg.GPGStrategy
	1352	branch = tree_a.branch
	1353	repo_a = branch.repository
	1354	tree_a.commit("base", allow_pointless=True, rev_id='A')
	1355	self.failIf(branch.repository.has_signature_for_revision_id('A'))
	1356	try:
	1357	from bzrlib.testament import Testament
	1358	# monkey patch gpg signing mechanism
	1359	bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
	1360	new_config = test_commit.MustSignConfig(branch)
	1361	commit.Commit(config=new_config).commit(message="base",
	1362	allow_pointless=True,
	1363	rev_id='B',
	1364	working_tree=tree_a)
	1365	def sign(text):
	1366	return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
	1367	self.assertTrue(repo_a.has_signature_for_revision_id('B'))
	1368	finally:
	1369	bzrlib.gpg.GPGStrategy = oldstrategy
	1370	tree_b = self.make_branch_and_tree('tree_b')
	1371	repo_b = tree_b.branch.repository
	1372	s = StringIO()
2520.4.136 by Aaron Bentley Fix format strings	1373	serializer = BundleSerializerV4('4')
2520.4.34 by Aaron Bentley Add signature support	1374	serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
	1375	s.seek(0)
	1376	install_bundle(repo_b, serializer.read(s))
	1377	self.assertTrue(repo_b.has_signature_for_revision_id('B'))
	1378	self.assertEqual(repo_b.get_signature_text('B'),
	1379	repo_a.get_signature_text('B'))
2520.4.100 by Aaron Bentley Fix repeat signature installs	1380	s.seek(0)
	1381	# ensure repeat installs are harmless
	1382	install_bundle(repo_b, serializer.read(s))
2520.4.34 by Aaron Bentley Add signature support	1383
2520.4.4 by Aaron Bentley Get basis support for a new bundle format in place	1384
2520.4.90 by Aaron Bentley Handle \r terminated lines in Weaves properly	1385	class V4WeaveBundleTester(V4BundleTester):
	1386
	1387	def bzrdir_format(self):
2520.4.91 by Aaron Bentley Okay, so I meant metaweave. I think.	1388	return 'metaweave'
2520.4.90 by Aaron Bentley Handle \r terminated lines in Weaves properly	1389
	1390
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1391	class MungedBundleTester(object):
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1392
	1393	def build_test_bundle(self):
	1394	wt = self.make_branch_and_tree('b1')
	1395
	1396	self.build_tree(['b1/one'])
	1397	wt.add('one')
	1398	wt.commit('add one', rev_id='a@cset-0-1')
	1399	self.build_tree(['b1/two'])
	1400	wt.add('two')
1793.3.14 by John Arbash Meinel Actually fix the bug with missing trailing newline bug #49182	1401	wt.commit('add two', rev_id='a@cset-0-2',
	1402	revprops={'branch-nick':'test'})
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1403
	1404	bundle_txt = StringIO()
	1405	rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1406	'a@cset-0-1', bundle_txt, self.format)
	1407	self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1408	bundle_txt.seek(0, 0)
	1409	return bundle_txt
	1410
	1411	def check_valid(self, bundle):
	1412	"""Check that after whatever munging, the final object is valid."""
1793.3.14 by John Arbash Meinel Actually fix the bug with missing trailing newline bug #49182	1413	self.assertEqual(['a@cset-0-2'],
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1414	[r.revision_id for r in bundle.real_revisions])
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1415
	1416	def test_extra_whitespace(self):
	1417	bundle_txt = self.build_test_bundle()
	1418
	1419	# Seek to the end of the file
	1420	# Adding one extra newline used to give us
	1421	# TypeError: float() argument must be a string or a number
	1422	bundle_txt.seek(0, 2)
	1423	bundle_txt.write('\n')
	1424	bundle_txt.seek(0)
	1425
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1426	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1427	self.check_valid(bundle)
	1428
	1429	def test_extra_whitespace_2(self):
	1430	bundle_txt = self.build_test_bundle()
	1431
	1432	# Seek to the end of the file
	1433	# Adding two extra newlines used to give us
	1434	# MalformedPatches: The first line of all patches should be ...
	1435	bundle_txt.seek(0, 2)
	1436	bundle_txt.write('\n\n')
	1437	bundle_txt.seek(0)
	1438
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1439	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1440	self.check_valid(bundle)
	1441
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1442
	1443	class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
	1444
	1445	format = '0.9'
	1446
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1447	def test_missing_trailing_whitespace(self):
	1448	bundle_txt = self.build_test_bundle()
	1449
	1450	# Remove a trailing newline, it shouldn't kill the parser
	1451	raw = bundle_txt.getvalue()
	1452	# The contents of the bundle don't have to be this, but this
	1453	# test is concerned with the exact case where the serializer
	1454	# creates a blank line at the end, and fails if that
	1455	# line is stripped
	1456	self.assertEqual('\n\n', raw[-2:])
1793.3.14 by John Arbash Meinel Actually fix the bug with missing trailing newline bug #49182	1457	bundle_txt = StringIO(raw[:-1])
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1458
1793.3.4 by John Arbash Meinel [merge] bzr.dev 1804 and fix conflicts.	1459	bundle = read_bundle(bundle_txt)
1793.3.2 by John Arbash Meinel (failing) add some tests which munge trailing whitespace	1460	self.check_valid(bundle)
1793.3.14 by John Arbash Meinel Actually fix the bug with missing trailing newline bug #49182	1461
1793.3.16 by John Arbash Meinel Add tests to ensure that we gracefully handle opening and trailing non-bundle text.	1462	def test_opening_text(self):
	1463	bundle_txt = self.build_test_bundle()
	1464
	1465	bundle_txt = StringIO("Some random\nemail comments\n"
	1466	+ bundle_txt.getvalue())
	1467
	1468	bundle = read_bundle(bundle_txt)
	1469	self.check_valid(bundle)
	1470
	1471	def test_trailing_text(self):
	1472	bundle_txt = self.build_test_bundle()
	1473
	1474	bundle_txt = StringIO(bundle_txt.getvalue() +
	1475	"Some trailing\nrandom\ntext\n")
	1476
	1477	bundle = read_bundle(bundle_txt)
	1478	self.check_valid(bundle)
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1479
	1480
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1481	class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
	1482
2520.4.136 by Aaron Bentley Fix format strings	1483	format = '4'
2520.4.79 by Aaron Bentley Fixed up not-really-relevant munging tests	1484
	1485
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1486	class TestBundleWriterReader(TestCase):
	1487
	1488	def test_roundtrip_record(self):
	1489	fileobj = StringIO()
2520.4.72 by Aaron Bentley Rename format to 4alpha	1490	writer = v4.BundleWriter(fileobj)
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1491	writer.begin()
2520.4.95 by Aaron Bentley Add support for header/info records	1492	writer.add_info_record(foo='bar')
	1493	writer._add_record("Record body", {'parents': ['1', '3'],
	1494	'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
2520.4.56 by Aaron Bentley Begin adding support for arbitrary metadata	1495	writer.end()
	1496	fileobj.seek(0)
2520.4.148 by Aaron Bentley Updates from review	1497	reader = v4.BundleReader(fileobj, stream_input=True)
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1498	record_iter = reader.iter_records()
	1499	record = record_iter.next()
	1500	self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
	1501	'info', None, None), record)
	1502	record = record_iter.next()
	1503	self.assertEqual(("Record body", {'storage_kind': 'fulltext',
	1504	'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
	1505	record)
	1506
	1507	def test_roundtrip_record_memory_hungry(self):
	1508	fileobj = StringIO()
	1509	writer = v4.BundleWriter(fileobj)
	1510	writer.begin()
	1511	writer.add_info_record(foo='bar')
	1512	writer._add_record("Record body", {'parents': ['1', '3'],
	1513	'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
	1514	writer.end()
	1515	fileobj.seek(0)
2520.4.148 by Aaron Bentley Updates from review	1516	reader = v4.BundleReader(fileobj, stream_input=False)
2520.4.145 by Aaron Bentley Add memory_friendly toggle, be memory-unfriendly for merge directives	1517	record_iter = reader.iter_records()
2520.4.95 by Aaron Bentley Add support for header/info records	1518	record = record_iter.next()
	1519	self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
	1520	'info', None, None), record)
	1521	record = record_iter.next()
	1522	self.assertEqual(("Record body", {'storage_kind': 'fulltext',
	1523	'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
	1524	record)
	1525
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1526	def test_encode_name(self):
2520.4.95 by Aaron Bentley Add support for header/info records	1527	self.assertEqual('revision/rev1',
	1528	v4.BundleWriter.encode_name('revision', 'rev1'))
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1529	self.assertEqual('file/rev//1/file-id-1',
	1530	v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
2520.4.95 by Aaron Bentley Add support for header/info records	1531	self.assertEqual('info',
	1532	v4.BundleWriter.encode_name('info', None, None))
	1533
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1534	def test_decode_name(self):
2520.4.95 by Aaron Bentley Add support for header/info records	1535	self.assertEqual(('revision', 'rev1', None),
	1536	v4.BundleReader.decode_name('revision/rev1'))
2520.4.127 by Aaron Bentley Fix up name encoding to handle revision-ids with slashes	1537	self.assertEqual(('file', 'rev/1', 'file-id-1'),
	1538	v4.BundleReader.decode_name('file/rev//1/file-id-1'))
2520.4.95 by Aaron Bentley Add support for header/info records	1539	self.assertEqual(('info', None, None),
	1540	v4.BundleReader.decode_name('info'))
2520.4.131 by Aaron Bentley Raise BadBundle for records with wrong number of names	1541
	1542	def test_too_many_names(self):
	1543	fileobj = StringIO()
	1544	writer = v4.BundleWriter(fileobj)
	1545	writer.begin()
	1546	writer.add_info_record(foo='bar')
	1547	writer._container.add_bytes_record('blah', ['two', 'names'])
	1548	writer.end()
	1549	fileobj.seek(0)
	1550	record_iter = v4.BundleReader(fileobj).iter_records()
	1551	record = record_iter.next()
	1552	self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
	1553	'info', None, None), record)
	1554	self.assertRaises(BadBundle, record_iter.next)