/brz/remove-bazaar : contents of bzrlib/tests/test_versionedfile.py at revision 3316.2.8

: (revision 3316.2.8)

To get this branch, use:

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

2052.3.2 by John Arbash Meinel Change Copyright .. by Canonical to Copyright ... Canonical	1	# Copyright (C) 2005 Canonical Ltd
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	2	#
	3	# Authors:
	4	# Johan Rydberg <jrydberg@gnu.org>
	5	#
	6	# This program is free software; you can redistribute it and/or modify
	7	# it under the terms of the GNU General Public License as published by
	8	# the Free Software Foundation; either version 2 of the License, or
	9	# (at your option) any later version.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	10	#
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	11	# This program is distributed in the hope that it will be useful,
	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	15	#
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	16	# You should have received a copy of the GNU General Public License
	17	# along with this program; if not, write to the Free Software
	18	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	19
	20
1704.2.15 by Martin Pool Remove TODO about knit testing printed from test suite	21	# TODO: might be nice to create a versionedfile with some type of corruption
	22	# considered typical and check that it can be detected/corrected.
	23
1664.2.9 by Aaron Bentley Ported weave merge test to versionedfile	24	from StringIO import StringIO
	25
1563.2.6 by Robert Collins Start check tests for knits (pending), and remove dead code.	26	import bzrlib
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	27	from bzrlib import (
	28	errors,
2309.4.7 by John Arbash Meinel Update VersionedFile tests to ensure that they can take Unicode,	29	osutils,
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	30	progress,
	31	)
1563.2.11 by Robert Collins Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.	32	from bzrlib.errors import (
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	33	RevisionNotPresent,
1563.2.11 by Robert Collins Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.	34	RevisionAlreadyPresent,
	35	WeaveParentMismatch
	36	)
2770.1.1 by Aaron Bentley Initial implmentation of plain knit annotation	37	from bzrlib.knit import (
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	38	make_file_knit,
2770.1.1 by Aaron Bentley Initial implmentation of plain knit annotation	39	KnitAnnotateFactory,
2770.1.10 by Aaron Bentley Merge bzr.dev	40	KnitPlainFactory,
2770.1.1 by Aaron Bentley Initial implmentation of plain knit annotation	41	)
3287.5.4 by Robert Collins Bump the deprecation to 1.4.	42	from bzrlib.symbol_versioning import one_four
2535.3.48 by Andrew Bennetts Merge from bzr.dev.	43	from bzrlib.tests import TestCaseWithMemoryTransport, TestSkipped
3102.1.1 by Vincent Ladeuil Rename bzrlib/test/HTTPTestUtils.py to bzrlib/tests/http_utils.py and fix	44	from bzrlib.tests.http_utils import TestCaseWithWebserver
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	45	from bzrlib.trace import mutter
1563.2.16 by Robert Collins Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.	46	from bzrlib.transport import get_transport
1563.2.13 by Robert Collins InterVersionedFile implemented.	47	from bzrlib.transport.memory import MemoryTransport
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	48	from bzrlib.tsort import topo_sort
1563.2.12 by Robert Collins Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.	49	import bzrlib.versionedfile as versionedfile
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	50	from bzrlib.weave import WeaveFile
1664.2.9 by Aaron Bentley Ported weave merge test to versionedfile	51	from bzrlib.weavefile import read_weave, write_weave
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	52
	53
	54	class VersionedFileTestMixIn(object):
	55	"""A mixin test class for testing VersionedFiles.
	56
	57	This is not an adaptor-style test at this point because
	58	theres no dynamic substitution of versioned file implementations,
	59	they are strictly controlled by their owning repositories.
	60	"""
	61
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	62	def get_transaction(self):
	63	if not hasattr(self, '_transaction'):
	64	self._transaction = None
	65	return self._transaction
	66
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	67	def test_add(self):
	68	f = self.get_file()
	69	f.add_lines('r0', [], ['a\n', 'b\n'])
	70	f.add_lines('r1', ['r0'], ['b\n', 'c\n'])
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	71	def verify_file(f):
	72	versions = f.versions()
	73	self.assertTrue('r0' in versions)
	74	self.assertTrue('r1' in versions)
	75	self.assertEquals(f.get_lines('r0'), ['a\n', 'b\n'])
	76	self.assertEquals(f.get_text('r0'), 'a\nb\n')
	77	self.assertEquals(f.get_lines('r1'), ['b\n', 'c\n'])
1563.2.18 by Robert Collins get knit repositories really using knits for text storage.	78	self.assertEqual(2, len(f))
	79	self.assertEqual(2, f.num_versions())
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	80
	81	self.assertRaises(RevisionNotPresent,
	82	f.add_lines, 'r2', ['foo'], [])
	83	self.assertRaises(RevisionAlreadyPresent,
	84	f.add_lines, 'r1', [], [])
	85	verify_file(f)
1666.1.6 by Robert Collins Make knit the default format.	86	# this checks that reopen with create=True does not break anything.
1666.1.6 by Robert Collins Make knit the default format.	87	f = self.reopen_file(create=True)
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	88	verify_file(f)
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	89
1596.2.32 by Robert Collins Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.	90	def test_adds_with_parent_texts(self):
	91	f = self.get_file()
	92	parent_texts = {}
2776.1.1 by Robert Collins * The ``add_lines`` methods on ``VersionedFile`` implementations has changed	93	_, _, parent_texts['r0'] = f.add_lines('r0', [], ['a\n', 'b\n'])
1596.2.32 by Robert Collins Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.	94	try:
2776.1.1 by Robert Collins * The ``add_lines`` methods on ``VersionedFile`` implementations has changed	95	_, _, parent_texts['r1'] = f.add_lines_with_ghosts('r1',
	96	['r0', 'ghost'], ['b\n', 'c\n'], parent_texts=parent_texts)
1596.2.32 by Robert Collins Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.	97	except NotImplementedError:
	98	# if the format doesn't support ghosts, just add normally.
2776.1.1 by Robert Collins * The ``add_lines`` methods on ``VersionedFile`` implementations has changed	99	_, _, parent_texts['r1'] = f.add_lines('r1',
	100	['r0'], ['b\n', 'c\n'], parent_texts=parent_texts)
1596.2.32 by Robert Collins Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.	101	f.add_lines('r2', ['r1'], ['c\n', 'd\n'], parent_texts=parent_texts)
	102	self.assertNotEqual(None, parent_texts['r0'])
	103	self.assertNotEqual(None, parent_texts['r1'])
	104	def verify_file(f):
	105	versions = f.versions()
	106	self.assertTrue('r0' in versions)
	107	self.assertTrue('r1' in versions)
	108	self.assertTrue('r2' in versions)
	109	self.assertEquals(f.get_lines('r0'), ['a\n', 'b\n'])
	110	self.assertEquals(f.get_lines('r1'), ['b\n', 'c\n'])
	111	self.assertEquals(f.get_lines('r2'), ['c\n', 'd\n'])
	112	self.assertEqual(3, f.num_versions())
	113	origins = f.annotate('r1')
	114	self.assertEquals(origins[0][0], 'r0')
	115	self.assertEquals(origins[1][0], 'r1')
	116	origins = f.annotate('r2')
	117	self.assertEquals(origins[0][0], 'r1')
	118	self.assertEquals(origins[1][0], 'r2')
	119
	120	verify_file(f)
	121	f = self.reopen_file()
	122	verify_file(f)
	123
2805.6.7 by Robert Collins Review feedback.	124	def test_add_unicode_content(self):
	125	# unicode content is not permitted in versioned files.
	126	# versioned files version sequences of bytes only.
	127	vf = self.get_file()
	128	self.assertRaises(errors.BzrBadParameterUnicode,
	129	vf.add_lines, 'a', [], ['a\n', u'b\n', 'c\n'])
	130	self.assertRaises(
	131	(errors.BzrBadParameterUnicode, NotImplementedError),
	132	vf.add_lines_with_ghosts, 'a', [], ['a\n', u'b\n', 'c\n'])
	133
2520.4.150 by Aaron Bentley Test that non-Weave uses left_matching_blocks for add_lines	134	def test_add_follows_left_matching_blocks(self):
	135	"""If we change left_matching_blocks, delta changes
	136
	137	Note: There are multiple correct deltas in this case, because
	138	we start with 1 "a" and we get 3.
	139	"""
	140	vf = self.get_file()
	141	if isinstance(vf, WeaveFile):
	142	raise TestSkipped("WeaveFile ignores left_matching_blocks")
	143	vf.add_lines('1', [], ['a\n'])
	144	vf.add_lines('2', ['1'], ['a\n', 'a\n', 'a\n'],
	145	left_matching_blocks=[(0, 0, 1), (1, 3, 0)])
2794.1.2 by Robert Collins Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.	146	self.assertEqual(['a\n', 'a\n', 'a\n'], vf.get_lines('2'))
2520.4.150 by Aaron Bentley Test that non-Weave uses left_matching_blocks for add_lines	147	vf.add_lines('3', ['1'], ['a\n', 'a\n', 'a\n'],
	148	left_matching_blocks=[(0, 2, 1), (1, 3, 0)])
2794.1.2 by Robert Collins Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.	149	self.assertEqual(['a\n', 'a\n', 'a\n'], vf.get_lines('3'))
2520.4.150 by Aaron Bentley Test that non-Weave uses left_matching_blocks for add_lines	150
2805.6.7 by Robert Collins Review feedback.	151	def test_inline_newline_throws(self):
	152	# \r characters are not permitted in lines being added
	153	vf = self.get_file()
	154	self.assertRaises(errors.BzrBadParameterContainsNewline,
	155	vf.add_lines, 'a', [], ['a\n\n'])
	156	self.assertRaises(
	157	(errors.BzrBadParameterContainsNewline, NotImplementedError),
	158	vf.add_lines_with_ghosts, 'a', [], ['a\n\n'])
	159	# but inline CR's are allowed
	160	vf.add_lines('a', [], ['a\r\n'])
	161	try:
	162	vf.add_lines_with_ghosts('b', [], ['a\r\n'])
	163	except NotImplementedError:
	164	pass
	165
2229.2.1 by Aaron Bentley Reject reserved ids in versiondfile, tree, branch and repository	166	def test_add_reserved(self):
	167	vf = self.get_file()
	168	self.assertRaises(errors.ReservedId,
	169	vf.add_lines, 'a:', [], ['a\n', 'b\n', 'c\n'])
	170
2794.1.1 by Robert Collins Allow knits to be instructed not to add a text based on a sha, for commit.	171	def test_add_lines_nostoresha(self):
	172	"""When nostore_sha is supplied using old content raises."""
	173	vf = self.get_file()
	174	empty_text = ('a', [])
	175	sample_text_nl = ('b', ["foo\n", "bar\n"])
	176	sample_text_no_nl = ('c', ["foo\n", "bar"])
	177	shas = []
	178	for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
	179	sha, _, _ = vf.add_lines(version, [], lines)
	180	shas.append(sha)
	181	# we now have a copy of all the lines in the vf.
	182	for sha, (version, lines) in zip(
	183	shas, (empty_text, sample_text_nl, sample_text_no_nl)):
	184	self.assertRaises(errors.ExistingContent,
	185	vf.add_lines, version + "2", [], lines,
	186	nostore_sha=sha)
	187	# and no new version should have been added.
	188	self.assertRaises(errors.RevisionNotPresent, vf.get_lines,
	189	version + "2")
	190
2803.1.1 by Robert Collins Fix typo in ghosts version of test_add_lines_nostoresha.	191	def test_add_lines_with_ghosts_nostoresha(self):
2794.1.1 by Robert Collins Allow knits to be instructed not to add a text based on a sha, for commit.	192	"""When nostore_sha is supplied using old content raises."""
	193	vf = self.get_file()
	194	empty_text = ('a', [])
	195	sample_text_nl = ('b', ["foo\n", "bar\n"])
	196	sample_text_no_nl = ('c', ["foo\n", "bar"])
	197	shas = []
	198	for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
	199	sha, _, _ = vf.add_lines(version, [], lines)
	200	shas.append(sha)
	201	# we now have a copy of all the lines in the vf.
	202	# is the test applicable to this vf implementation?
	203	try:
	204	vf.add_lines_with_ghosts('d', [], [])
	205	except NotImplementedError:
	206	raise TestSkipped("add_lines_with_ghosts is optional")
	207	for sha, (version, lines) in zip(
	208	shas, (empty_text, sample_text_nl, sample_text_no_nl)):
	209	self.assertRaises(errors.ExistingContent,
	210	vf.add_lines_with_ghosts, version + "2", [], lines,
	211	nostore_sha=sha)
	212	# and no new version should have been added.
	213	self.assertRaises(errors.RevisionNotPresent, vf.get_lines,
	214	version + "2")
	215
2776.1.1 by Robert Collins * The ``add_lines`` methods on ``VersionedFile`` implementations has changed	216	def test_add_lines_return_value(self):
	217	# add_lines should return the sha1 and the text size.
	218	vf = self.get_file()
	219	empty_text = ('a', [])
	220	sample_text_nl = ('b', ["foo\n", "bar\n"])
	221	sample_text_no_nl = ('c', ["foo\n", "bar"])
	222	# check results for the three cases:
	223	for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
	224	# the first two elements are the same for all versioned files:
	225	# - the digest and the size of the text. For some versioned files
	226	# additional data is returned in additional tuple elements.
	227	result = vf.add_lines(version, [], lines)
	228	self.assertEqual(3, len(result))
	229	self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))),
	230	result[0:2])
	231	# parents should not affect the result:
	232	lines = sample_text_nl[1]
	233	self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))),
	234	vf.add_lines('d', ['b', 'c'], lines)[0:2])
	235
2229.2.1 by Aaron Bentley Reject reserved ids in versiondfile, tree, branch and repository	236	def test_get_reserved(self):
	237	vf = self.get_file()
	238	self.assertRaises(errors.ReservedId, vf.get_texts, ['b:'])
	239	self.assertRaises(errors.ReservedId, vf.get_lines, 'b:')
	240	self.assertRaises(errors.ReservedId, vf.get_text, 'b:')
	241
2520.4.85 by Aaron Bentley Get all test passing (which just proves there aren't enough tests!)	242	def test_make_mpdiffs(self):
2520.4.3 by Aaron Bentley Implement plain strategy for extracting and installing multiparent diffs	243	from bzrlib import multiparent
	244	vf = self.get_file('foo')
	245	sha1s = self._setup_for_deltas(vf)
	246	new_vf = self.get_file('bar')
	247	for version in multiparent.topo_iter(vf):
2520.4.85 by Aaron Bentley Get all test passing (which just proves there aren't enough tests!)	248	mpdiff = vf.make_mpdiffs([version])[0]
3287.5.2 by Robert Collins Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.	249	new_vf.add_mpdiffs([(version, vf.get_parent_map([version])[version],
2520.4.85 by Aaron Bentley Get all test passing (which just proves there aren't enough tests!)	250	vf.get_sha1(version), mpdiff)])
2520.4.3 by Aaron Bentley Implement plain strategy for extracting and installing multiparent diffs	251	self.assertEqualDiff(vf.get_text(version),
	252	new_vf.get_text(version))
	253
1596.2.38 by Robert Collins rollback from using deltas to using fulltexts - deltas need more work to be ready.	254	def _setup_for_deltas(self, f):
2794.1.2 by Robert Collins Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.	255	self.assertFalse(f.has_version('base'))
1596.2.36 by Robert Collins add a get_delta api to versioned_file.	256	# add texts that should trip the knit maximum delta chain threshold
	257	# as well as doing parallel chains of data in knits.
	258	# this is done by two chains of 25 insertions
	259	f.add_lines('base', [], ['line\n'])
1596.2.38 by Robert Collins rollback from using deltas to using fulltexts - deltas need more work to be ready.	260	f.add_lines('noeol', ['base'], ['line'])
	261	# detailed eol tests:
	262	# shared last line with parent no-eol
	263	f.add_lines('noeolsecond', ['noeol'], ['line\n', 'line'])
	264	# differing last line with parent, both no-eol
	265	f.add_lines('noeolnotshared', ['noeolsecond'], ['line\n', 'phone'])
	266	# add eol following a noneol parent, change content
	267	f.add_lines('eol', ['noeol'], ['phone\n'])
	268	# add eol following a noneol parent, no change content
	269	f.add_lines('eolline', ['noeol'], ['line\n'])
	270	# noeol with no parents:
	271	f.add_lines('noeolbase', [], ['line'])
	272	# noeol preceeding its leftmost parent in the output:
	273	# this is done by making it a merge of two parents with no common
	274	# anestry: noeolbase and noeol with the
	275	# later-inserted parent the leftmost.
	276	f.add_lines('eolbeforefirstparent', ['noeolbase', 'noeol'], ['line'])
	277	# two identical eol texts
	278	f.add_lines('noeoldup', ['noeol'], ['line'])
1596.2.36 by Robert Collins add a get_delta api to versioned_file.	279	next_parent = 'base'
	280	text_name = 'chain1-'
	281	text = ['line\n']
	282	sha1s = {0 :'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
	283	1 :'45e21ea146a81ea44a821737acdb4f9791c8abe7',
	284	2 :'e1f11570edf3e2a070052366c582837a4fe4e9fa',
	285	3 :'26b4b8626da827088c514b8f9bbe4ebf181edda1',
	286	4 :'e28a5510be25ba84d31121cff00956f9970ae6f6',
	287	5 :'d63ec0ce22e11dcf65a931b69255d3ac747a318d',
	288	6 :'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
	289	7 :'95c14da9cafbf828e3e74a6f016d87926ba234ab',
	290	8 :'779e9a0b28f9f832528d4b21e17e168c67697272',
	291	9 :'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
	292	10:'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
	293	11:'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
	294	12:'31a2286267f24d8bedaa43355f8ad7129509ea85',
	295	13:'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
	296	14:'2c4b1736566b8ca6051e668de68650686a3922f2',
	297	15:'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
	298	16:'b0d2e18d3559a00580f6b49804c23fea500feab3',
	299	17:'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
	300	18:'5cf64a3459ae28efa60239e44b20312d25b253f3',
	301	19:'1ebed371807ba5935958ad0884595126e8c4e823',
	302	20:'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
	303	21:'01edc447978004f6e4e962b417a4ae1955b6fe5d',
	304	22:'d8d8dc49c4bf0bab401e0298bb5ad827768618bb',
	305	23:'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
	306	24:'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
	307	25:'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
	308	}
	309	for depth in range(26):
	310	new_version = text_name + '%s' % depth
	311	text = text + ['line\n']
	312	f.add_lines(new_version, [next_parent], text)
	313	next_parent = new_version
	314	next_parent = 'base'
	315	text_name = 'chain2-'
	316	text = ['line\n']
	317	for depth in range(26):
	318	new_version = text_name + '%s' % depth
	319	text = text + ['line\n']
	320	f.add_lines(new_version, [next_parent], text)
	321	next_parent = new_version
1596.2.38 by Robert Collins rollback from using deltas to using fulltexts - deltas need more work to be ready.	322	return sha1s
1596.2.37 by Robert Collins Switch to delta based content copying in the generic versioned file copier.	323
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	324	def test_ancestry(self):
	325	f = self.get_file()
1563.2.29 by Robert Collins Remove all but fetch references to repository.revision_store.	326	self.assertEqual([], f.get_ancestry([]))
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	327	f.add_lines('r0', [], ['a\n', 'b\n'])
	328	f.add_lines('r1', ['r0'], ['b\n', 'c\n'])
	329	f.add_lines('r2', ['r0'], ['b\n', 'c\n'])
	330	f.add_lines('r3', ['r2'], ['b\n', 'c\n'])
	331	f.add_lines('rM', ['r1', 'r2'], ['b\n', 'c\n'])
1563.2.29 by Robert Collins Remove all but fetch references to repository.revision_store.	332	self.assertEqual([], f.get_ancestry([]))
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	333	versions = f.get_ancestry(['rM'])
	334	# there are some possibilities:
	335	# r0 r1 r2 rM r3
	336	# r0 r1 r2 r3 rM
	337	# etc
	338	# so we check indexes
	339	r0 = versions.index('r0')
	340	r1 = versions.index('r1')
	341	r2 = versions.index('r2')
	342	self.assertFalse('r3' in versions)
	343	rM = versions.index('rM')
	344	self.assertTrue(r0 < r1)
	345	self.assertTrue(r0 < r2)
	346	self.assertTrue(r1 < rM)
	347	self.assertTrue(r2 < rM)
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	348
	349	self.assertRaises(RevisionNotPresent,
	350	f.get_ancestry, ['rM', 'rX'])
1594.2.21 by Robert Collins Teach versioned files to prevent mutation after finishing.	351
2530.1.1 by Aaron Bentley Make topological sorting optional for get_ancestry	352	self.assertEqual(set(f.get_ancestry('rM')),
	353	set(f.get_ancestry('rM', topo_sorted=False)))
	354
1594.2.21 by Robert Collins Teach versioned files to prevent mutation after finishing.	355	def test_mutate_after_finish(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	356	self._transaction = 'before'
1594.2.21 by Robert Collins Teach versioned files to prevent mutation after finishing.	357	f = self.get_file()
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	358	self._transaction = 'after'
1594.2.21 by Robert Collins Teach versioned files to prevent mutation after finishing.	359	self.assertRaises(errors.OutSideTransaction, f.add_lines, '', [], [])
	360	self.assertRaises(errors.OutSideTransaction, f.add_lines_with_ghosts, '', [], [])
	361	self.assertRaises(errors.OutSideTransaction, f.join, '')
1594.2.24 by Robert Collins Make use of the transaction finalisation warning support to implement in-knit caching.	362	self.assertRaises(errors.OutSideTransaction, f.clone_text, 'base', 'bar', ['foo'])
1563.2.7 by Robert Collins add versioned file clear_cache entry.	363
	364	def test_clear_cache(self):
	365	f = self.get_file()
	366	# on a new file it should not error
	367	f.clear_cache()
	368	# and after adding content, doing a clear_cache and a get should work.
	369	f.add_lines('0', [], ['a'])
	370	f.clear_cache()
	371	self.assertEqual(['a'], f.get_lines('0'))
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	372
	373	def test_clone_text(self):
	374	f = self.get_file()
	375	f.add_lines('r0', [], ['a\n', 'b\n'])
1563.2.5 by Robert Collins Remove unused transaction references from knit.py and the versionedfile interface.	376	f.clone_text('r1', 'r0', ['r0'])
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	377	def verify_file(f):
	378	self.assertEquals(f.get_lines('r1'), f.get_lines('r0'))
	379	self.assertEquals(f.get_lines('r1'), ['a\n', 'b\n'])
3287.5.2 by Robert Collins Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.	380	self.assertEqual({'r1':('r0',)}, f.get_parent_map(['r1']))
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	381	self.assertRaises(RevisionNotPresent,
	382	f.clone_text, 'r2', 'rX', [])
	383	self.assertRaises(RevisionAlreadyPresent,
	384	f.clone_text, 'r1', 'r0', [])
	385	verify_file(f)
	386	verify_file(self.reopen_file())
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	387
1563.2.15 by Robert Collins remove the weavestore assumptions about the number and nature of files it manages.	388	def test_copy_to(self):
	389	f = self.get_file()
	390	f.add_lines('0', [], ['a\n'])
	391	t = MemoryTransport()
	392	f.copy_to('foo', t)
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	393	for suffix in self.get_factory().get_suffixes():
1563.2.15 by Robert Collins remove the weavestore assumptions about the number and nature of files it manages.	394	self.assertTrue(t.has('foo' + suffix))
	395
	396	def test_get_suffixes(self):
	397	f = self.get_file()
	398	# and should be a list
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	399	self.assertTrue(isinstance(self.get_factory().get_suffixes(), list))
1563.2.15 by Robert Collins remove the weavestore assumptions about the number and nature of files it manages.	400
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	401	def build_graph(self, file, graph):
	402	for node in topo_sort(graph.items()):
	403	file.add_lines(node, graph[node], [])
	404
1563.2.13 by Robert Collins InterVersionedFile implemented.	405	def test_get_graph(self):
1563.2.13 by Robert Collins InterVersionedFile implemented.	406	f = self.get_file()
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	407	graph = {
2592.3.43 by Robert Collins A knit iter_parents API.	408	'v1': (),
	409	'v2': ('v1', ),
	410	'v3': ('v2', )}
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	411	self.build_graph(f, graph)
3316.2.7 by Robert Collins Actually deprecated VersionedFile.get_graph.	412	self.assertEqual(graph, self.applyDeprecated(one_four, f.get_graph))
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	413
	414	def test_get_graph_partial(self):
	415	f = self.get_file()
	416	complex_graph = {}
	417	simple_a = {
2592.3.43 by Robert Collins A knit iter_parents API.	418	'c': (),
	419	'b': ('c', ),
	420	'a': ('b', ),
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	421	}
	422	complex_graph.update(simple_a)
	423	simple_b = {
2592.3.43 by Robert Collins A knit iter_parents API.	424	'c': (),
2592.3.43 by Robert Collins A knit iter_parents API.	425	'b': ('c', ),
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	426	}
	427	complex_graph.update(simple_b)
	428	simple_gam = {
2592.3.43 by Robert Collins A knit iter_parents API.	429	'c': (),
	430	'oo': (),
	431	'bar': ('oo', 'c'),
	432	'gam': ('bar', ),
1684.3.1 by Robert Collins Fix versioned file joins with empty targets.	433	}
	434	complex_graph.update(simple_gam)
	435	simple_b_gam = {}
	436	simple_b_gam.update(simple_gam)
	437	simple_b_gam.update(simple_b)
	438	self.build_graph(f, complex_graph)
3316.2.7 by Robert Collins Actually deprecated VersionedFile.get_graph.	439	self.assertEqual(simple_a, self.applyDeprecated(one_four, f.get_graph,
	440	['a']))
	441	self.assertEqual(simple_b, self.applyDeprecated(one_four, f.get_graph,
	442	['b']))
	443	self.assertEqual(simple_gam, self.applyDeprecated(one_four,
	444	f.get_graph, ['gam']))
	445	self.assertEqual(simple_b_gam, self.applyDeprecated(one_four,
	446	f.get_graph, ['b', 'gam']))
1563.2.13 by Robert Collins InterVersionedFile implemented.	447
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	448	def test_get_parents(self):
	449	f = self.get_file()
	450	f.add_lines('r0', [], ['a\n', 'b\n'])
	451	f.add_lines('r1', [], ['a\n', 'b\n'])
	452	f.add_lines('r2', [], ['a\n', 'b\n'])
	453	f.add_lines('r3', [], ['a\n', 'b\n'])
	454	f.add_lines('m', ['r0', 'r1', 'r2', 'r3'], ['a\n', 'b\n'])
3287.5.2 by Robert Collins Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.	455	self.assertEqual(['r0', 'r1', 'r2', 'r3'],
3287.5.4 by Robert Collins Bump the deprecation to 1.4.	456	self.applyDeprecated(one_four, f.get_parents, 'm'))
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	457	self.assertRaises(RevisionNotPresent,
3287.5.4 by Robert Collins Bump the deprecation to 1.4.	458	self.applyDeprecated, one_four, f.get_parents, 'y')
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	459
3287.5.1 by Robert Collins Add VersionedFile.get_parent_map.	460	def test_get_parent_map(self):
	461	f = self.get_file()
	462	f.add_lines('r0', [], ['a\n', 'b\n'])
	463	self.assertEqual(
	464	{'r0':()}, f.get_parent_map(['r0']))
	465	f.add_lines('r1', ['r0'], ['a\n', 'b\n'])
	466	self.assertEqual(
	467	{'r1':('r0',)}, f.get_parent_map(['r1']))
	468	self.assertEqual(
	469	{'r0':(),
	470	'r1':('r0',)},
	471	f.get_parent_map(['r0', 'r1']))
	472	f.add_lines('r2', [], ['a\n', 'b\n'])
	473	f.add_lines('r3', [], ['a\n', 'b\n'])
	474	f.add_lines('m', ['r0', 'r1', 'r2', 'r3'], ['a\n', 'b\n'])
	475	self.assertEqual(
	476	{'m':('r0', 'r1', 'r2', 'r3')}, f.get_parent_map(['m']))
	477	self.assertEqual({}, f.get_parent_map('y'))
	478	self.assertEqual(
	479	{'r0':(),
	480	'r1':('r0',)},
	481	f.get_parent_map(['r0', 'y', 'r1']))
	482
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	483	def test_annotate(self):
	484	f = self.get_file()
	485	f.add_lines('r0', [], ['a\n', 'b\n'])
	486	f.add_lines('r1', ['r0'], ['c\n', 'b\n'])
	487	origins = f.annotate('r1')
	488	self.assertEquals(origins[0][0], 'r1')
	489	self.assertEquals(origins[1][0], 'r0')
	490
	491	self.assertRaises(RevisionNotPresent,
	492	f.annotate, 'foo')
	493
1563.2.6 by Robert Collins Start check tests for knits (pending), and remove dead code.	494	def test_detection(self):
	495	# Test weaves detect corruption.
	496	#
	497	# Weaves contain a checksum of their texts.
	498	# When a text is extracted, this checksum should be
	499	# verified.
	500
	501	w = self.get_file_corrupted_text()
	502
	503	self.assertEqual('hello\n', w.get_text('v1'))
	504	self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
	505	self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
	506	self.assertRaises(errors.WeaveInvalidChecksum, w.check)
	507
	508	w = self.get_file_corrupted_checksum()
	509
	510	self.assertEqual('hello\n', w.get_text('v1'))
	511	self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
	512	self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
	513	self.assertRaises(errors.WeaveInvalidChecksum, w.check)
	514
	515	def get_file_corrupted_text(self):
	516	"""Return a versioned file with corrupt text but valid metadata."""
	517	raise NotImplementedError(self.get_file_corrupted_text)
	518
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	519	def reopen_file(self, name='foo'):
	520	"""Open the versioned file from disk again."""
	521	raise NotImplementedError(self.reopen_file)
	522
2592.3.43 by Robert Collins A knit iter_parents API.	523	def test_iter_parents(self):
	524	"""iter_parents returns the parents for many nodes."""
	525	f = self.get_file()
	526	# sample data:
	527	# no parents
	528	f.add_lines('r0', [], ['a\n', 'b\n'])
	529	# 1 parents
	530	f.add_lines('r1', ['r0'], ['a\n', 'b\n'])
	531	# 2 parents
	532	f.add_lines('r2', ['r1', 'r0'], ['a\n', 'b\n'])
	533	# XXX TODO a ghost
	534	# cases: each sample data individually:
	535	self.assertEqual(set([('r0', ())]),
3316.2.8 by Robert Collins * ``VersionedFile.iter_parents`` is now deprecated in favour of	536	set(self.applyDeprecated(one_four, f.iter_parents, ['r0'])))
2592.3.43 by Robert Collins A knit iter_parents API.	537	self.assertEqual(set([('r1', ('r0', ))]),
3316.2.8 by Robert Collins * ``VersionedFile.iter_parents`` is now deprecated in favour of	538	set(self.applyDeprecated(one_four, f.iter_parents, ['r1'])))
2592.3.43 by Robert Collins A knit iter_parents API.	539	self.assertEqual(set([('r2', ('r1', 'r0'))]),
3316.2.8 by Robert Collins * ``VersionedFile.iter_parents`` is now deprecated in favour of	540	set(self.applyDeprecated(one_four, f.iter_parents, ['r2'])))
2592.3.43 by Robert Collins A knit iter_parents API.	541	# no nodes returned for a missing node
2592.3.43 by Robert Collins A knit iter_parents API.	542	self.assertEqual(set(),
3316.2.8 by Robert Collins * ``VersionedFile.iter_parents`` is now deprecated in favour of	543	set(self.applyDeprecated(one_four, f.iter_parents, ['missing'])))
2592.3.43 by Robert Collins A knit iter_parents API.	544	# 1 node returned with missing nodes skipped
2592.3.43 by Robert Collins A knit iter_parents API.	545	self.assertEqual(set([('r1', ('r0', ))]),
3316.2.8 by Robert Collins * ``VersionedFile.iter_parents`` is now deprecated in favour of	546	set(self.applyDeprecated(one_four, f.iter_parents, ['ghost1', 'r1',
	547	'ghost'])))
2592.3.43 by Robert Collins A knit iter_parents API.	548	# 2 nodes returned
2592.3.43 by Robert Collins A knit iter_parents API.	549	self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
3316.2.8 by Robert Collins * ``VersionedFile.iter_parents`` is now deprecated in favour of	550	set(self.applyDeprecated(one_four, f.iter_parents, ['r0', 'r1'])))
2592.3.43 by Robert Collins A knit iter_parents API.	551	# 2 nodes returned, missing skipped
2592.3.43 by Robert Collins A knit iter_parents API.	552	self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
3316.2.8 by Robert Collins * ``VersionedFile.iter_parents`` is now deprecated in favour of	553	set(self.applyDeprecated(one_four, f.iter_parents,
	554	['a', 'r0', 'b', 'r1', 'c'])))
2592.3.43 by Robert Collins A knit iter_parents API.	555
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	556	def test_iter_lines_added_or_present_in_versions(self):
	557	# test that we get at least an equalset of the lines added by
	558	# versions in the weave
	559	# the ordering here is to make a tree so that dumb searches have
	560	# more changes to muck up.
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	561
	562	class InstrumentedProgress(progress.DummyProgress):
	563
	564	def __init__(self):
	565
	566	progress.DummyProgress.__init__(self)
	567	self.updates = []
	568
	569	def update(self, msg=None, current=None, total=None):
	570	self.updates.append((msg, current, total))
	571
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	572	vf = self.get_file()
	573	# add a base to get included
	574	vf.add_lines('base', [], ['base\n'])
	575	# add a ancestor to be included on one side
	576	vf.add_lines('lancestor', [], ['lancestor\n'])
	577	# add a ancestor to be included on the other side
	578	vf.add_lines('rancestor', ['base'], ['rancestor\n'])
	579	# add a child of rancestor with no eofile-nl
	580	vf.add_lines('child', ['rancestor'], ['base\n', 'child\n'])
	581	# add a child of lancestor and base to join the two roots
	582	vf.add_lines('otherchild',
	583	['lancestor', 'base'],
	584	['base\n', 'lancestor\n', 'otherchild\n'])
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	585	def iter_with_versions(versions, expected):
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	586	# now we need to see what lines are returned, and how often.
2975.3.1 by Robert Collins Change (without backwards compatibility) the	587	lines = {}
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	588	progress = InstrumentedProgress()
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	589	# iterate over the lines
2975.3.1 by Robert Collins Change (without backwards compatibility) the	590	for line in vf.iter_lines_added_or_present_in_versions(versions,
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	591	pb=progress):
2975.3.1 by Robert Collins Change (without backwards compatibility) the	592	lines.setdefault(line, 0)
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	593	lines[line] += 1
2975.3.1 by Robert Collins Change (without backwards compatibility) the	594	if []!= progress.updates:
2039.1.2 by Aaron Bentley Tweak test to avoid catching assert	595	self.assertEqual(expected, progress.updates)
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	596	return lines
2147.1.3 by John Arbash Meinel In knit.py we were re-using a variable in 2 loops, causing bogus progress messages to be generated.	597	lines = iter_with_versions(['child', 'otherchild'],
	598	[('Walking content.', 0, 2),
	599	('Walking content.', 1, 2),
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	600	('Walking content.', 2, 2)])
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	601	# we must see child and otherchild
2975.3.1 by Robert Collins Change (without backwards compatibility) the	602	self.assertTrue(lines[('child\n', 'child')] > 0)
	603	self.assertTrue(lines[('otherchild\n', 'otherchild')] > 0)
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	604	# we dont care if we got more than that.
	605
	606	# test all lines
2147.1.3 by John Arbash Meinel In knit.py we were re-using a variable in 2 loops, causing bogus progress messages to be generated.	607	lines = iter_with_versions(None, [('Walking content.', 0, 5),
	608	('Walking content.', 1, 5),
	609	('Walking content.', 2, 5),
	610	('Walking content.', 3, 5),
	611	('Walking content.', 4, 5),
2039.1.1 by Aaron Bentley Clean up progress properly when interrupted during fetch (#54000)	612	('Walking content.', 5, 5)])
1594.2.6 by Robert Collins Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.	613	# all lines must be seen at least once
2975.3.1 by Robert Collins Change (without backwards compatibility) the	614	self.assertTrue(lines[('base\n', 'base')] > 0)
	615	self.assertTrue(lines[('lancestor\n', 'lancestor')] > 0)
	616	self.assertTrue(lines[('rancestor\n', 'rancestor')] > 0)
	617	self.assertTrue(lines[('child\n', 'child')] > 0)
	618	self.assertTrue(lines[('otherchild\n', 'otherchild')] > 0)
1594.2.7 by Robert Collins Add versionedfile.fix_parents api for correcting data post hoc.	619
1594.2.8 by Robert Collins add ghost aware apis to knits.	620	def test_add_lines_with_ghosts(self):
	621	# some versioned file formats allow lines to be added with parent
	622	# information that is > than that in the format. Formats that do
	623	# not support this need to raise NotImplementedError on the
	624	# add_lines_with_ghosts api.
	625	vf = self.get_file()
	626	# add a revision with ghost parents
2249.5.12 by John Arbash Meinel Change the APIs for VersionedFile, Store, and some of Repository into utf-8	627	# The preferred form is utf8, but we should translate when needed
	628	parent_id_unicode = u'b\xbfse'
	629	parent_id_utf8 = parent_id_unicode.encode('utf8')
1594.2.8 by Robert Collins add ghost aware apis to knits.	630	try:
2309.4.7 by John Arbash Meinel Update VersionedFile tests to ensure that they can take Unicode,	631	vf.add_lines_with_ghosts('notbxbfse', [parent_id_utf8], [])
1594.2.8 by Robert Collins add ghost aware apis to knits.	632	except NotImplementedError:
	633	# check the other ghost apis are also not implemented
	634	self.assertRaises(NotImplementedError, vf.get_ancestry_with_ghosts, ['foo'])
	635	self.assertRaises(NotImplementedError, vf.get_parents_with_ghosts, 'foo')
	636	return
2150.2.1 by Robert Collins Correctly decode utf8 revision ids from knits when parsing, fixes a regression where a unicode revision id is stored correctly, but then indexed by the utf8 value on the next invocation of bzr, rather than the unicode value.	637	vf = self.reopen_file()
1594.2.8 by Robert Collins add ghost aware apis to knits.	638	# test key graph related apis: getncestry, _graph, get_parents
	639	# has_version
	640	# - these are ghost unaware and must not be reflect ghosts
2249.5.12 by John Arbash Meinel Change the APIs for VersionedFile, Store, and some of Repository into utf-8	641	self.assertEqual(['notbxbfse'], vf.get_ancestry('notbxbfse'))
3287.5.2 by Robert Collins Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.	642	self.assertEqual([],
3287.5.4 by Robert Collins Bump the deprecation to 1.4.	643	self.applyDeprecated(one_four, vf.get_parents, 'notbxbfse'))
3316.2.7 by Robert Collins Actually deprecated VersionedFile.get_graph.	644	self.assertEqual({'notbxbfse':()}, self.applyDeprecated(one_four,
	645	vf.get_graph))
2249.5.12 by John Arbash Meinel Change the APIs for VersionedFile, Store, and some of Repository into utf-8	646	self.assertFalse(vf.has_version(parent_id_utf8))
1594.2.8 by Robert Collins add ghost aware apis to knits.	647	# we have _with_ghost apis to give us ghost information.
2249.5.12 by John Arbash Meinel Change the APIs for VersionedFile, Store, and some of Repository into utf-8	648	self.assertEqual([parent_id_utf8, 'notbxbfse'], vf.get_ancestry_with_ghosts(['notbxbfse']))
	649	self.assertEqual([parent_id_utf8], vf.get_parents_with_ghosts('notbxbfse'))
3287.6.7 by Robert Collins * ``VersionedFile.get_graph_with_ghosts`` is deprecated, with no	650	self.assertEqual({'notbxbfse':(parent_id_utf8,)},
	651	self.applyDeprecated(one_four, vf.get_graph_with_ghosts))
3287.6.5 by Robert Collins Deprecate VersionedFile.has_ghost.	652	self.assertTrue(self.applyDeprecated(one_four, vf.has_ghost,
	653	parent_id_utf8))
1594.2.8 by Robert Collins add ghost aware apis to knits.	654	# if we add something that is a ghost of another, it should correct the
1594.2.8 by Robert Collins add ghost aware apis to knits.	655	# results of the prior apis
2858.2.1 by Martin Pool Remove most calls to safe_file_id and safe_revision_id.	656	vf.add_lines(parent_id_utf8, [], [])
2249.5.12 by John Arbash Meinel Change the APIs for VersionedFile, Store, and some of Repository into utf-8	657	self.assertEqual([parent_id_utf8, 'notbxbfse'], vf.get_ancestry(['notbxbfse']))
3287.5.2 by Robert Collins Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.	658	self.assertEqual({'notbxbfse':(parent_id_utf8,)},
	659	vf.get_parent_map(['notbxbfse']))
2592.3.43 by Robert Collins A knit iter_parents API.	660	self.assertEqual({parent_id_utf8:(),
2592.3.43 by Robert Collins A knit iter_parents API.	661	'notbxbfse':(parent_id_utf8, ),
1594.2.8 by Robert Collins add ghost aware apis to knits.	662	},
3316.2.7 by Robert Collins Actually deprecated VersionedFile.get_graph.	663	self.applyDeprecated(one_four, vf.get_graph))
2249.5.12 by John Arbash Meinel Change the APIs for VersionedFile, Store, and some of Repository into utf-8	664	self.assertTrue(vf.has_version(parent_id_utf8))
1594.2.8 by Robert Collins add ghost aware apis to knits.	665	# we have _with_ghost apis to give us ghost information.
2858.2.1 by Martin Pool Remove most calls to safe_file_id and safe_revision_id.	666	self.assertEqual([parent_id_utf8, 'notbxbfse'],
	667	vf.get_ancestry_with_ghosts(['notbxbfse']))
2249.5.12 by John Arbash Meinel Change the APIs for VersionedFile, Store, and some of Repository into utf-8	668	self.assertEqual([parent_id_utf8], vf.get_parents_with_ghosts('notbxbfse'))
3287.5.5 by Robert Collins Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.	669	self.assertEqual({parent_id_utf8:(),
	670	'notbxbfse':(parent_id_utf8,),
1594.2.8 by Robert Collins add ghost aware apis to knits.	671	},
3287.6.7 by Robert Collins * ``VersionedFile.get_graph_with_ghosts`` is deprecated, with no	672	self.applyDeprecated(one_four, vf.get_graph_with_ghosts))
3287.6.5 by Robert Collins Deprecate VersionedFile.has_ghost.	673	self.assertFalse(self.applyDeprecated(one_four, vf.has_ghost,
	674	parent_id_utf8))
1594.2.8 by Robert Collins add ghost aware apis to knits.	675
1594.2.9 by Robert Collins Teach Knit repositories how to handle ghosts without corrupting at all.	676	def test_add_lines_with_ghosts_after_normal_revs(self):
	677	# some versioned file formats allow lines to be added with parent
	678	# information that is > than that in the format. Formats that do
	679	# not support this need to raise NotImplementedError on the
	680	# add_lines_with_ghosts api.
	681	vf = self.get_file()
	682	# probe for ghost support
	683	try:
3287.6.5 by Robert Collins Deprecate VersionedFile.has_ghost.	684	vf.add_lines_with_ghosts('base', [], ['line\n', 'line_b\n'])
1594.2.9 by Robert Collins Teach Knit repositories how to handle ghosts without corrupting at all.	685	except NotImplementedError:
	686	return
	687	vf.add_lines_with_ghosts('references_ghost',
	688	['base', 'a_ghost'],
	689	['line\n', 'line_b\n', 'line_c\n'])
	690	origins = vf.annotate('references_ghost')
	691	self.assertEquals(('base', 'line\n'), origins[0])
	692	self.assertEquals(('base', 'line_b\n'), origins[1])
	693	self.assertEquals(('references_ghost', 'line_c\n'), origins[2])
1594.2.23 by Robert Collins Test versioned file storage handling of clean/dirty status for accessed versioned files.	694
	695	def test_readonly_mode(self):
	696	transport = get_transport(self.get_url('.'))
	697	factory = self.get_factory()
	698	vf = factory('id', transport, 0777, create=True, access_mode='w')
	699	vf = factory('id', transport, access_mode='r')
	700	self.assertRaises(errors.ReadOnlyError, vf.add_lines, 'base', [], [])
	701	self.assertRaises(errors.ReadOnlyError,
	702	vf.add_lines_with_ghosts,
	703	'base',
	704	[],
	705	[])
	706	self.assertRaises(errors.ReadOnlyError, vf.join, 'base')
1594.2.24 by Robert Collins Make use of the transaction finalisation warning support to implement in-knit caching.	707	self.assertRaises(errors.ReadOnlyError, vf.clone_text, 'base', 'bar', ['foo'])
1666.1.6 by Robert Collins Make knit the default format.	708
	709	def test_get_sha1(self):
	710	# check the sha1 data is available
	711	vf = self.get_file()
	712	# a simple file
	713	vf.add_lines('a', [], ['a\n'])
	714	# the same file, different metadata
	715	vf.add_lines('b', ['a'], ['a\n'])
	716	# a file differing only in last newline.
	717	vf.add_lines('c', [], ['a'])
	718	self.assertEqual(
	719	'3f786850e387550fdab836ed7e6dc881de23001b', vf.get_sha1('a'))
	720	self.assertEqual(
	721	'3f786850e387550fdab836ed7e6dc881de23001b', vf.get_sha1('b'))
	722	self.assertEqual(
	723	'86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', vf.get_sha1('c'))
2520.4.89 by Aaron Bentley Add get_sha1s to weaves	724
	725	self.assertEqual(['3f786850e387550fdab836ed7e6dc881de23001b',
	726	'86f7e437faa5a7fce15d1ddcb9eaeaea377667b8',
	727	'3f786850e387550fdab836ed7e6dc881de23001b'],
	728	vf.get_sha1s(['a', 'c', 'b']))
1594.2.9 by Robert Collins Teach Knit repositories how to handle ghosts without corrupting at all.	729
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	730
2535.3.1 by Andrew Bennetts Add get_format_signature to VersionedFile	731	class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn):
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	732
	733	def get_file(self, name='foo'):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	734	return WeaveFile(name, get_transport(self.get_url('.')), create=True,
	735	get_scope=self.get_transaction)
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	736
1563.2.6 by Robert Collins Start check tests for knits (pending), and remove dead code.	737	def get_file_corrupted_text(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	738	w = WeaveFile('foo', get_transport(self.get_url('.')), create=True,
	739	get_scope=self.get_transaction)
1563.2.13 by Robert Collins InterVersionedFile implemented.	740	w.add_lines('v1', [], ['hello\n'])
1563.2.13 by Robert Collins InterVersionedFile implemented.	741	w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
1563.2.6 by Robert Collins Start check tests for knits (pending), and remove dead code.	742
	743	# We are going to invasively corrupt the text
	744	# Make sure the internals of weave are the same
	745	self.assertEqual([('{', 0)
	746	, 'hello\n'
	747	, ('}', None)
	748	, ('{', 1)
	749	, 'there\n'
	750	, ('}', None)
	751	], w._weave)
	752
	753	self.assertEqual(['f572d396fae9206628714fb2ce00f72e94f2258f'
	754	, '90f265c6e75f1c8f9ab76dcf85528352c5f215ef'
	755	], w._sha1s)
	756	w.check()
	757
	758	# Corrupted
	759	w._weave[4] = 'There\n'
	760	return w
	761
	762	def get_file_corrupted_checksum(self):
	763	w = self.get_file_corrupted_text()
	764	# Corrected
	765	w._weave[4] = 'there\n'
	766	self.assertEqual('hello\nthere\n', w.get_text('v2'))
	767
	768	#Invalid checksum, first digit changed
	769	w._sha1s[1] = 'f0f265c6e75f1c8f9ab76dcf85528352c5f215ef'
	770	return w
	771
1666.1.6 by Robert Collins Make knit the default format.	772	def reopen_file(self, name='foo', create=False):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	773	return WeaveFile(name, get_transport(self.get_url('.')), create=create,
	774	get_scope=self.get_transaction)
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	775
1563.2.25 by Robert Collins Merge in upstream.	776	def test_no_implicit_create(self):
	777	self.assertRaises(errors.NoSuchFile,
	778	WeaveFile,
	779	'foo',
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	780	get_transport(self.get_url('.')),
	781	get_scope=self.get_transaction)
1563.2.25 by Robert Collins Merge in upstream.	782
1594.2.23 by Robert Collins Test versioned file storage handling of clean/dirty status for accessed versioned files.	783	def get_factory(self):
	784	return WeaveFile
	785
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	786
2535.3.1 by Andrew Bennetts Add get_format_signature to VersionedFile	787	class TestKnit(TestCaseWithMemoryTransport, VersionedFileTestMixIn):
1563.2.4 by Robert Collins First cut at including the knit implementation of versioned_file.	788
	789	def get_file(self, name='foo'):
2770.1.1 by Aaron Bentley Initial implmentation of plain knit annotation	790	return self.get_factory()(name, get_transport(self.get_url('.')),
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	791	delta=True, create=True, get_scope=self.get_transaction)
1563.2.6 by Robert Collins Start check tests for knits (pending), and remove dead code.	792
1594.2.23 by Robert Collins Test versioned file storage handling of clean/dirty status for accessed versioned files.	793	def get_factory(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	794	return make_file_knit
1594.2.23 by Robert Collins Test versioned file storage handling of clean/dirty status for accessed versioned files.	795
1563.2.6 by Robert Collins Start check tests for knits (pending), and remove dead code.	796	def get_file_corrupted_text(self):
	797	knit = self.get_file()
	798	knit.add_lines('v1', [], ['hello\n'])
	799	knit.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
	800	return knit
1563.2.9 by Robert Collins Update versionedfile api tests to ensure that data is available after every operation.	801
1666.1.6 by Robert Collins Make knit the default format.	802	def reopen_file(self, name='foo', create=False):
2770.1.1 by Aaron Bentley Initial implmentation of plain knit annotation	803	return self.get_factory()(name, get_transport(self.get_url('.')),
1666.1.6 by Robert Collins Make knit the default format.	804	delta=True,
1666.1.6 by Robert Collins Make knit the default format.	805	create=create)
1563.2.10 by Robert Collins Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.	806
	807	def test_detection(self):
1563.2.19 by Robert Collins stub out a check for knits.	808	knit = self.get_file()
1563.2.19 by Robert Collins stub out a check for knits.	809	knit.check()
1563.2.12 by Robert Collins Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.	810
1563.2.25 by Robert Collins Merge in upstream.	811	def test_no_implicit_create(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	812	self.assertRaises(errors.NoSuchFile, self.get_factory(), 'foo',
	813	get_transport(self.get_url('.')))
1563.2.25 by Robert Collins Merge in upstream.	814
1563.2.12 by Robert Collins Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.	815
2770.1.1 by Aaron Bentley Initial implmentation of plain knit annotation	816	class TestPlaintextKnit(TestKnit):
	817	"""Test a knit with no cached annotations"""
	818
	819	def get_factory(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	820	return make_file_knit
2770.1.1 by Aaron Bentley Initial implmentation of plain knit annotation	821
	822
3062.1.9 by Aaron Bentley Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile	823	class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):
	824
	825	def setUp(self):
	826	TestCaseWithMemoryTransport.setUp(self)
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	827	self.vf1 = make_file_knit('root', self.get_transport(), create=True)
	828	self.vf2 = make_file_knit('root', self.get_transport(), create=True)
3062.1.9 by Aaron Bentley Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile	829	self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root',
	830	[self.vf1, self.vf2])
	831
	832	def test_add_lines(self):
	833	self.plan_merge_vf.add_lines('a:', [], [])
	834	self.assertRaises(ValueError, self.plan_merge_vf.add_lines, 'a', [],
	835	[])
	836	self.assertRaises(ValueError, self.plan_merge_vf.add_lines, 'a:', None,
	837	[])
	838	self.assertRaises(ValueError, self.plan_merge_vf.add_lines, 'a:', [],
	839	None)
	840
	841	def test_ancestry(self):
	842	self.vf1.add_lines('A', [], [])
	843	self.vf1.add_lines('B', ['A'], [])
	844	self.plan_merge_vf.add_lines('C:', ['B'], [])
	845	self.plan_merge_vf.add_lines('D:', ['C:'], [])
	846	self.assertEqual(set(['A', 'B', 'C:', 'D:']),
3062.1.14 by Aaron Bentley Use topo_sorted=False with get_ancestry	847	self.plan_merge_vf.get_ancestry('D:', topo_sorted=False))
3062.1.9 by Aaron Bentley Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile	848
	849	def setup_abcde(self):
	850	self.vf1.add_lines('A', [], ['a'])
	851	self.vf1.add_lines('B', ['A'], ['b'])
	852	self.vf2.add_lines('C', [], ['c'])
	853	self.vf2.add_lines('D', ['C'], ['d'])
	854	self.plan_merge_vf.add_lines('E:', ['B', 'D'], ['e'])
	855
	856	def test_ancestry_uses_all_versionedfiles(self):
	857	self.setup_abcde()
	858	self.assertEqual(set(['A', 'B', 'C', 'D', 'E:']),
3062.1.14 by Aaron Bentley Use topo_sorted=False with get_ancestry	859	self.plan_merge_vf.get_ancestry('E:', topo_sorted=False))
3062.1.9 by Aaron Bentley Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile	860
	861	def test_ancestry_raises_revision_not_present(self):
	862	error = self.assertRaises(errors.RevisionNotPresent,
3062.1.14 by Aaron Bentley Use topo_sorted=False with get_ancestry	863	self.plan_merge_vf.get_ancestry, 'E:', False)
3062.1.9 by Aaron Bentley Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile	864	self.assertContainsRe(str(error), '{E:} not present in "root"')
	865
	866	def test_get_parents(self):
	867	self.setup_abcde()
3287.5.2 by Robert Collins Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.	868	self.assertEqual({'B':('A',)}, self.plan_merge_vf.get_parent_map(['B']))
	869	self.assertEqual({'D':('C',)}, self.plan_merge_vf.get_parent_map(['D']))
	870	self.assertEqual({'E:':('B', 'D')},
	871	self.plan_merge_vf.get_parent_map(['E:']))
	872	self.assertEqual({}, self.plan_merge_vf.get_parent_map(['F']))
	873	self.assertEqual({
	874	'B':('A',),
	875	'D':('C',),
	876	'E:':('B', 'D'),
	877	}, self.plan_merge_vf.get_parent_map(['B', 'D', 'E:', 'F']))
3062.1.9 by Aaron Bentley Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile	878
	879	def test_get_lines(self):
	880	self.setup_abcde()
	881	self.assertEqual(['a'], self.plan_merge_vf.get_lines('A'))
	882	self.assertEqual(['c'], self.plan_merge_vf.get_lines('C'))
	883	self.assertEqual(['e'], self.plan_merge_vf.get_lines('E:'))
	884	error = self.assertRaises(errors.RevisionNotPresent,
	885	self.plan_merge_vf.get_lines, 'F')
	886	self.assertContainsRe(str(error), '{F} not present in "root"')
	887
	888
1563.2.12 by Robert Collins Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.	889	class InterString(versionedfile.InterVersionedFile):
	890	"""An inter-versionedfile optimised code path for strings.
	891
	892	This is for use during testing where we use strings as versionedfiles
	893	so that none of the default regsitered interversionedfile classes will
	894	match - which lets us test the match logic.
	895	"""
	896
	897	@staticmethod
	898	def is_compatible(source, target):
	899	"""InterString is compatible with strings-as-versionedfiles."""
	900	return isinstance(source, str) and isinstance(target, str)
	901
	902
	903	# TODO this and the InterRepository core logic should be consolidatable
	904	# if we make the registry a separate class though we still need to
	905	# test the behaviour in the active registry to catch failure-to-handle-
	906	# stange-objects
2535.3.1 by Andrew Bennetts Add get_format_signature to VersionedFile	907	class TestInterVersionedFile(TestCaseWithMemoryTransport):
1563.2.12 by Robert Collins Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.	908
	909	def test_get_default_inter_versionedfile(self):
	910	# test that the InterVersionedFile.get(a, b) probes
	911	# for a class where is_compatible(a, b) returns
	912	# true and returns a default interversionedfile otherwise.
	913	# This also tests that the default registered optimised interversionedfile
	914	# classes do not barf inappropriately when a surprising versionedfile type
	915	# is handed to them.
	916	dummy_a = "VersionedFile 1."
	917	dummy_b = "VersionedFile 2."
	918	self.assertGetsDefaultInterVersionedFile(dummy_a, dummy_b)
	919
	920	def assertGetsDefaultInterVersionedFile(self, a, b):
	921	"""Asserts that InterVersionedFile.get(a, b) -> the default."""
	922	inter = versionedfile.InterVersionedFile.get(a, b)
	923	self.assertEqual(versionedfile.InterVersionedFile,
	924	inter.__class__)
	925	self.assertEqual(a, inter.source)
	926	self.assertEqual(b, inter.target)
	927
	928	def test_register_inter_versionedfile_class(self):
	929	# test that a optimised code path provider - a
	930	# InterVersionedFile subclass can be registered and unregistered
	931	# and that it is correctly selected when given a versionedfile
	932	# pair that it returns true on for the is_compatible static method
	933	# check
	934	dummy_a = "VersionedFile 1."
	935	dummy_b = "VersionedFile 2."
	936	versionedfile.InterVersionedFile.register_optimiser(InterString)
	937	try:
	938	# we should get the default for something InterString returns False
	939	# to
	940	self.assertFalse(InterString.is_compatible(dummy_a, None))
	941	self.assertGetsDefaultInterVersionedFile(dummy_a, None)
	942	# and we should get an InterString for a pair it 'likes'
	943	self.assertTrue(InterString.is_compatible(dummy_a, dummy_b))
	944	inter = versionedfile.InterVersionedFile.get(dummy_a, dummy_b)
	945	self.assertEqual(InterString, inter.__class__)
	946	self.assertEqual(dummy_a, inter.source)
	947	self.assertEqual(dummy_b, inter.target)
	948	finally:
	949	versionedfile.InterVersionedFile.unregister_optimiser(InterString)
	950	# now we should get the default InterVersionedFile object again.
	951	self.assertGetsDefaultInterVersionedFile(dummy_a, dummy_b)
1666.1.1 by Robert Collins Add trivial http-using test for versioned files.	952
	953
	954	class TestReadonlyHttpMixin(object):
	955
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	956	def get_transaction(self):
	957	return 1
	958
1666.1.1 by Robert Collins Add trivial http-using test for versioned files.	959	def test_readonly_http_works(self):
	960	# we should be able to read from http with a versioned file.
	961	vf = self.get_file()
1666.1.6 by Robert Collins Make knit the default format.	962	# try an empty file access
	963	readonly_vf = self.get_factory()('foo', get_transport(self.get_readonly_url('.')))
	964	self.assertEqual([], readonly_vf.versions())
	965	# now with feeling.
1666.1.1 by Robert Collins Add trivial http-using test for versioned files.	966	vf.add_lines('1', [], ['a\n'])
	967	vf.add_lines('2', ['1'], ['b\n', 'a\n'])
	968	readonly_vf = self.get_factory()('foo', get_transport(self.get_readonly_url('.')))
1666.1.6 by Robert Collins Make knit the default format.	969	self.assertEqual(['1', '2'], vf.versions())
1666.1.1 by Robert Collins Add trivial http-using test for versioned files.	970	for version in readonly_vf.versions():
	971	readonly_vf.get_lines(version)
	972
	973
	974	class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin):
	975
	976	def get_file(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	977	return WeaveFile('foo', get_transport(self.get_url('.')), create=True,
	978	get_scope=self.get_transaction)
1666.1.1 by Robert Collins Add trivial http-using test for versioned files.	979
	980	def get_factory(self):
	981	return WeaveFile
	982
	983
	984	class TestKnitHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin):
	985
	986	def get_file(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	987	return make_file_knit('foo', get_transport(self.get_url('.')),
	988	delta=True, create=True, get_scope=self.get_transaction)
1666.1.1 by Robert Collins Add trivial http-using test for versioned files.	989
	990	def get_factory(self):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	991	return make_file_knit
1664.2.9 by Aaron Bentley Ported weave merge test to versionedfile	992
	993
	994	class MergeCasesMixin(object):
	995
	996	def doMerge(self, base, a, b, mp):
	997	from cStringIO import StringIO
	998	from textwrap import dedent
	999
	1000	def addcrlf(x):
	1001	return x + '\n'
	1002
	1003	w = self.get_file()
	1004	w.add_lines('text0', [], map(addcrlf, base))
	1005	w.add_lines('text1', ['text0'], map(addcrlf, a))
	1006	w.add_lines('text2', ['text0'], map(addcrlf, b))
	1007
	1008	self.log_contents(w)
	1009
	1010	self.log('merge plan:')
	1011	p = list(w.plan_merge('text1', 'text2'))
	1012	for state, line in p:
	1013	if line:
	1014	self.log('%12s \| %s' % (state, line[:-1]))
	1015
	1016	self.log('merge:')
	1017	mt = StringIO()
	1018	mt.writelines(w.weave_merge(p))
	1019	mt.seek(0)
	1020	self.log(mt.getvalue())
	1021
	1022	mp = map(addcrlf, mp)
	1023	self.assertEqual(mt.readlines(), mp)
	1024
	1025
	1026	def testOneInsert(self):
	1027	self.doMerge([],
	1028	['aa'],
	1029	[],
	1030	['aa'])
	1031
	1032	def testSeparateInserts(self):
	1033	self.doMerge(['aaa', 'bbb', 'ccc'],
	1034	['aaa', 'xxx', 'bbb', 'ccc'],
	1035	['aaa', 'bbb', 'yyy', 'ccc'],
	1036	['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
	1037
	1038	def testSameInsert(self):
	1039	self.doMerge(['aaa', 'bbb', 'ccc'],
	1040	['aaa', 'xxx', 'bbb', 'ccc'],
	1041	['aaa', 'xxx', 'bbb', 'yyy', 'ccc'],
	1042	['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
	1043	overlappedInsertExpected = ['aaa', 'xxx', 'yyy', 'bbb']
	1044	def testOverlappedInsert(self):
	1045	self.doMerge(['aaa', 'bbb'],
	1046	['aaa', 'xxx', 'yyy', 'bbb'],
	1047	['aaa', 'xxx', 'bbb'], self.overlappedInsertExpected)
	1048
	1049	# really it ought to reduce this to
	1050	# ['aaa', 'xxx', 'yyy', 'bbb']
	1051
	1052
	1053	def testClashReplace(self):
	1054	self.doMerge(['aaa'],
	1055	['xxx'],
1056	['yyy', 'zzz'],
1057	['<<<<<<< ', 'xxx', '=======', 'yyy', 'zzz',
1058	'>>>>>>> '])
1059
1060	def testNonClashInsert1(self):
1061	self.doMerge(['aaa'],
1062	['xxx', 'aaa'],
1063	['yyy', 'zzz'],
1064	['<<<<<<< ', 'xxx', 'aaa', '=======', 'yyy', 'zzz',
1065	'>>>>>>> '])
1066
1067	def testNonClashInsert2(self):
1068	self.doMerge(['aaa'],
1069	['aaa'],
1070	['yyy', 'zzz'],
1071	['yyy', 'zzz'])
1072
1073
1074	def testDeleteAndModify(self):
1075	"""Clashing delete and modification.
1076
1077	If one side modifies a region and the other deletes it then
1078	there should be a conflict with one side blank.
1079	"""
1080
1081	#######################################
1082	# skippd, not working yet
1083	return
1084
1085	self.doMerge(['aaa', 'bbb', 'ccc'],
1086	['aaa', 'ddd', 'ccc'],
1087	['aaa', 'ccc'],
1088	['<<<<<<<< ', 'aaa', '=======', '>>>>>>> ', 'ccc'])
1089
1090	def _test_merge_from_strings(self, base, a, b, expected):
1091	w = self.get_file()
1092	w.add_lines('text0', [], base.splitlines(True))
1093	w.add_lines('text1', ['text0'], a.splitlines(True))
1094	w.add_lines('text2', ['text0'], b.splitlines(True))
1095	self.log('merge plan:')
1096	p = list(w.plan_merge('text1', 'text2'))
1097	for state, line in p:
1098	if line:
1099	self.log('%12s \| %s' % (state, line[:-1]))
1100	self.log('merge result:')
1101	result_text = ''.join(w.weave_merge(p))
1102	self.log(result_text)
1103	self.assertEqualDiff(result_text, expected)
1104
1105	def test_weave_merge_conflicts(self):
1106	# does weave merge properly handle plans that end with unchanged?
1107	result = ''.join(self.get_file().weave_merge([('new-a', 'hello\n')]))
1108	self.assertEqual(result, 'hello\n')
1109
1110	def test_deletion_extended(self):
1111	"""One side deletes, the other deletes more.
1112	"""
1113	base = """\
1114	line 1
1115	line 2
1116	line 3
1117	"""
1118	a = """\
1119	line 1
1120	line 2
1121	"""
1122	b = """\
1123	line 1
1124	"""
1125	result = """\
1126	line 1
1127	"""
1128	self._test_merge_from_strings(base, a, b, result)
1129
1130	def test_deletion_overlap(self):
1131	"""Delete overlapping regions with no other conflict.
1132
1133	Arguably it'd be better to treat these as agreement, rather than
1134	conflict, but for now conflict is safer.
1135	"""
1136	base = """\
1137	start context
1138	int a() {}
1139	int b() {}
1140	int c() {}
1141	end context
1142	"""
1143	a = """\
1144	start context
1145	int a() {}
1146	end context
1147	"""
1148	b = """\
1149	start context
1150	int c() {}
1151	end context
1152	"""
1153	result = """\
1154	start context
1155	<<<<<<<
1156	int a() {}
1157	=======
1158	int c() {}
1159	>>>>>>>
1160	end context
1161	"""
1162	self._test_merge_from_strings(base, a, b, result)
1163
1164	def test_agreement_deletion(self):
1165	"""Agree to delete some lines, without conflicts."""
1166	base = """\
1167	start context
1168	base line 1
1169	base line 2
1170	end context
1171	"""
1172	a = """\
1173	start context
1174	base line 1
1175	end context
1176	"""
1177	b = """\
1178	start context
1179	base line 1
1180	end context
1181	"""
1182	result = """\
1183	start context
1184	base line 1
1185	end context
1186	"""
1187	self._test_merge_from_strings(base, a, b, result)
1188
1189	def test_sync_on_deletion(self):
1190	"""Specific case of merge where we can synchronize incorrectly.
1191
1192	A previous version of the weave merge concluded that the two versions
1193	agreed on deleting line 2, and this could be a synchronization point.
1194	Line 1 was then considered in isolation, and thought to be deleted on
1195	both sides.
1196
1197	It's better to consider the whole thing as a disagreement region.
1198	"""
1199	base = """\
1200	start context
1201	base line 1
1202	base line 2
1203	end context
1204	"""
1205	a = """\
1206	start context
1207	base line 1
1208	a's replacement line 2
1209	end context
1210	"""
1211	b = """\
1212	start context
1213	b replaces
1214	both lines
1215	end context
1216	"""
1217	result = """\
1218	start context
1219	<<<<<<<
1220	base line 1
1221	a's replacement line 2
1222	=======
1223	b replaces
1224	both lines
1225	>>>>>>>
1226	end context
1227	"""
1228	self._test_merge_from_strings(base, a, b, result)
1229
1230
2535.3.1 by Andrew Bennetts Add get_format_signature to VersionedFile	1231	class TestKnitMerge(TestCaseWithMemoryTransport, MergeCasesMixin):
1664.2.9 by Aaron Bentley Ported weave merge test to versionedfile	1232
	1233	def get_file(self, name='foo'):
3316.2.3 by Robert Collins Remove manual notification of transaction finishing on versioned files.	1234	return make_file_knit(name, get_transport(self.get_url('.')),
1664.2.9 by Aaron Bentley Ported weave merge test to versionedfile	1235	delta=True, create=True)
	1236
	1237	def log_contents(self, w):
	1238	pass
	1239
	1240
2535.3.1 by Andrew Bennetts Add get_format_signature to VersionedFile	1241	class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin):
1664.2.9 by Aaron Bentley Ported weave merge test to versionedfile	1242
	1243	def get_file(self, name='foo'):
	1244	return WeaveFile(name, get_transport(self.get_url('.')), create=True)
	1245
	1246	def log_contents(self, w):
	1247	self.log('weave is:')
	1248	tmpf = StringIO()
	1249	write_weave(w, tmpf)
	1250	self.log(tmpf.getvalue())
	1251
	1252	overlappedInsertExpected = ['aaa', '<<<<<<< ', 'xxx', 'yyy', '=======',
	1253	'xxx', '>>>>>>> ', 'bbb']