Breezy

Merge lp:~jelmer/brz/python3-weave into lp:brz

  1. python3-weave
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 6984
Proposed branch: lp:~jelmer/brz/python3-weave
Merge into: lp:brz
Prerequisite: lp:~jelmer/brz/python3-b
Diff against target: 1142 lines (+376/-257)
3 files modified
breezy/bzr/weavefile.py (+1/-1)
breezy/tests/test_weave.py (+256/-256)
python3.passing (+119/-0)
To merge this branch: bzr merge lp:~jelmer/brz/python3-weave
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+346431@code.launchpad.net

Commit message

Port breezy.bzr.weave to Python3.

Description of the change

Port breezy.bzr.weave to Python3.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/weavefile.py'
2--- breezy/bzr/weavefile.py 2018-05-22 01:41:54 +0000
3+++ breezy/bzr/weavefile.py 2018-05-22 01:41:54 +0000
4@@ -80,7 +80,7 @@
5 else: # text line
6 if not l:
7 f.write(b', \n')
8- elif l[-1] == b'\n':
9+ elif l.endswith(b'\n'):
10 f.write(b'. ' + l)
11 else:
12 f.write(b', ' + l + b'\n')
13
14=== modified file 'breezy/tests/test_weave.py'
15--- breezy/tests/test_weave.py 2018-02-18 19:18:40 +0000
16+++ breezy/tests/test_weave.py 2018-05-22 01:41:54 +0000
17@@ -36,9 +36,9 @@
18
19
20 # texts for use in testing
21-TEXT_0 = ["Hello world"]
22-TEXT_1 = ["Hello world",
23- "A second line"]
24+TEXT_0 = [b"Hello world"]
25+TEXT_1 = [b"Hello world",
26+ b"A second line"]
27
28
29 class TestBase(TestCase):
30@@ -70,9 +70,9 @@
31
32 def runTest(self):
33 k = Weave(get_scope=lambda:None)
34- self.assertFalse('foo' in k)
35- k.add_lines('foo', [], TEXT_1)
36- self.assertTrue('foo' in k)
37+ self.assertFalse(b'foo' in k)
38+ k.add_lines(b'foo', [], TEXT_1)
39+ self.assertTrue(b'foo' in k)
40
41
42 class Easy(TestBase):
43@@ -85,9 +85,9 @@
44
45 def runTest(self):
46 k = Weave()
47- k.add_lines('text0', [], TEXT_0)
48- self.assertEqual(k.annotate('text0'),
49- [('text0', TEXT_0[0])])
50+ k.add_lines(b'text0', [], TEXT_0)
51+ self.assertEqual(k.annotate(b'text0'),
52+ [(b'text0', TEXT_0[0])])
53
54
55 class InvalidAdd(TestBase):
56@@ -98,9 +98,9 @@
57
58 self.assertRaises(errors.RevisionNotPresent,
59 k.add_lines,
60- 'text0',
61- ['69'],
62- ['new text!'])
63+ b'text0',
64+ [b'69'],
65+ [b'new text!'])
66
67
68 class RepeatedAdd(TestBase):
69@@ -108,8 +108,8 @@
70
71 def test_duplicate_add(self):
72 k = Weave()
73- idx = k.add_lines('text0', [], TEXT_0)
74- idx2 = k.add_lines('text0', [], TEXT_0)
75+ idx = k.add_lines(b'text0', [], TEXT_0)
76+ idx2 = k.add_lines(b'text0', [], TEXT_0)
77 self.assertEqual(idx, idx2)
78
79
80@@ -117,17 +117,17 @@
81
82 def runTest(self):
83 k = Weave()
84- k.add_lines('basis', [], TEXT_0)
85- idx = k.add_lines('text0', [], TEXT_0)
86+ k.add_lines(b'basis', [], TEXT_0)
87+ idx = k.add_lines(b'text0', [], TEXT_0)
88 self.assertRaises(errors.RevisionAlreadyPresent,
89 k.add_lines,
90- 'text0',
91+ b'text0',
92 [],
93- ['not the same text'])
94+ [b'not the same text'])
95 self.assertRaises(errors.RevisionAlreadyPresent,
96 k.add_lines,
97- 'text0',
98- ['basis'], # not the right parents
99+ b'text0',
100+ [b'basis'], # not the right parents
101 TEXT_0)
102
103
104@@ -139,52 +139,52 @@
105 def runTest(self):
106 k = Weave()
107
108- k.add_lines('text0', [], ['line 1'])
109- k.add_lines('text1', ['text0'], ['line 1', 'line 2'])
110+ k.add_lines(b'text0', [], [b'line 1'])
111+ k.add_lines(b'text1', [b'text0'], [b'line 1', b'line 2'])
112
113- self.assertEqual(k.annotate('text0'),
114- [('text0', 'line 1')])
115+ self.assertEqual(k.annotate(b'text0'),
116+ [(b'text0', b'line 1')])
117
118 self.assertEqual(k.get_lines(1),
119- ['line 1',
120- 'line 2'])
121-
122- self.assertEqual(k.annotate('text1'),
123- [('text0', 'line 1'),
124- ('text1', 'line 2')])
125-
126- k.add_lines('text2', ['text0'], ['line 1', 'diverged line'])
127-
128- self.assertEqual(k.annotate('text2'),
129- [('text0', 'line 1'),
130- ('text2', 'diverged line')])
131-
132- text3 = ['line 1', 'middle line', 'line 2']
133- k.add_lines('text3',
134- ['text0', 'text1'],
135+ [b'line 1',
136+ b'line 2'])
137+
138+ self.assertEqual(k.annotate(b'text1'),
139+ [(b'text0', b'line 1'),
140+ (b'text1', b'line 2')])
141+
142+ k.add_lines(b'text2', [b'text0'], [b'line 1', b'diverged line'])
143+
144+ self.assertEqual(k.annotate(b'text2'),
145+ [(b'text0', b'line 1'),
146+ (b'text2', b'diverged line')])
147+
148+ text3 = [b'line 1', b'middle line', b'line 2']
149+ k.add_lines(b'text3',
150+ [b'text0', b'text1'],
151 text3)
152
153 # self.log("changes to text3: " + pformat(list(k._delta(set([0, 1]), text3))))
154
155 self.log("k._weave=" + pformat(k._weave))
156
157- self.assertEqual(k.annotate('text3'),
158- [('text0', 'line 1'),
159- ('text3', 'middle line'),
160- ('text1', 'line 2')])
161+ self.assertEqual(k.annotate(b'text3'),
162+ [(b'text0', b'line 1'),
163+ (b'text3', b'middle line'),
164+ (b'text1', b'line 2')])
165
166 # now multiple insertions at different places
167- k.add_lines('text4',
168- ['text0', 'text1', 'text3'],
169- ['line 1', 'aaa', 'middle line', 'bbb', 'line 2', 'ccc'])
170+ k.add_lines(b'text4',
171+ [b'text0', b'text1', b'text3'],
172+ [b'line 1', b'aaa', b'middle line', b'bbb', b'line 2', b'ccc'])
173
174- self.assertEqual(k.annotate('text4'),
175- [('text0', 'line 1'),
176- ('text4', 'aaa'),
177- ('text3', 'middle line'),
178- ('text4', 'bbb'),
179- ('text1', 'line 2'),
180- ('text4', 'ccc')])
181+ self.assertEqual(k.annotate(b'text4'),
182+ [(b'text0', b'line 1'),
183+ (b'text4', b'aaa'),
184+ (b'text3', b'middle line'),
185+ (b'text4', b'bbb'),
186+ (b'text1', b'line 2'),
187+ (b'text4', b'ccc')])
188
189
190 class DeleteLines(TestBase):
191@@ -194,20 +194,20 @@
192 def runTest(self):
193 k = Weave()
194
195- base_text = ['one', 'two', 'three', 'four']
196-
197- k.add_lines('text0', [], base_text)
198-
199- texts = [['one', 'two', 'three'],
200- ['two', 'three', 'four'],
201- ['one', 'four'],
202- ['one', 'two', 'three', 'four'],
203+ base_text = [b'one', b'two', b'three', b'four']
204+
205+ k.add_lines(b'text0', [], base_text)
206+
207+ texts = [[b'one', b'two', b'three'],
208+ [b'two', b'three', b'four'],
209+ [b'one', b'four'],
210+ [b'one', b'two', b'three', b'four'],
211 ]
212
213 i = 1
214 for t in texts:
215- ver = k.add_lines('text%d' % i,
216- ['text0'], t)
217+ ver = k.add_lines(b'text%d' % i,
218+ [b'text0'], t)
219 i += 1
220
221 self.log('final weave:')
222@@ -225,12 +225,12 @@
223
224 k._parents = [(),
225 ]
226- k._weave = [('{', 0),
227- 'first line',
228- ('[', 0),
229- 'deleted in 0',
230- (']', 0),
231- ('}', 0),
232+ k._weave = [(b'{', 0),
233+ b'first line',
234+ (b'[', 0),
235+ b'deleted in 0',
236+ (b']', 0),
237+ (b'}', 0),
238 ]
239 ################################### SKIPPED
240 # Weave.get doesn't trap this anymore
241@@ -249,26 +249,26 @@
242 k._parents = [(),
243 frozenset([0]),
244 ]
245- k._weave = [('{', 0),
246- 'first line',
247- ('[', 1),
248- 'line to be deleted',
249- (']', 1),
250- 'last line',
251- ('}', 0),
252+ k._weave = [(b'{', 0),
253+ b'first line',
254+ (b'[', 1),
255+ b'line to be deleted',
256+ (b']', 1),
257+ b'last line',
258+ (b'}', 0),
259 ]
260- k._sha1s = [sha_string('first lineline to be deletedlast line')
261- , sha_string('first linelast line')]
262+ k._sha1s = [sha_string(b'first lineline to be deletedlast line')
263+ , sha_string(b'first linelast line')]
264
265 self.assertEqual(k.get_lines(0),
266- ['first line',
267- 'line to be deleted',
268- 'last line',
269+ [b'first line',
270+ b'line to be deleted',
271+ b'last line',
272 ])
273
274 self.assertEqual(k.get_lines(1),
275- ['first line',
276- 'last line',
277+ [b'first line',
278+ b'last line',
279 ])
280
281
282@@ -280,30 +280,30 @@
283 k._parents = [frozenset(),
284 frozenset([0]),
285 ]
286- k._weave = [('{', 0),
287- 'first line',
288- ('[', 1),
289- 'line to be deleted',
290- (']', 1),
291- ('{', 1),
292- 'replacement line',
293- ('}', 1),
294- 'last line',
295- ('}', 0),
296+ k._weave = [(b'{', 0),
297+ b'first line',
298+ (b'[', 1),
299+ b'line to be deleted',
300+ (b']', 1),
301+ (b'{', 1),
302+ b'replacement line',
303+ (b'}', 1),
304+ b'last line',
305+ (b'}', 0),
306 ]
307- k._sha1s = [sha_string('first lineline to be deletedlast line')
308- , sha_string('first linereplacement linelast line')]
309+ k._sha1s = [sha_string(b'first lineline to be deletedlast line')
310+ , sha_string(b'first linereplacement linelast line')]
311
312 self.assertEqual(k.get_lines(0),
313- ['first line',
314- 'line to be deleted',
315- 'last line',
316+ [b'first line',
317+ b'line to be deleted',
318+ b'last line',
319 ])
320
321 self.assertEqual(k.get_lines(1),
322- ['first line',
323- 'replacement line',
324- 'last line',
325+ [b'first line',
326+ b'replacement line',
327+ b'last line',
328 ])
329
330
331@@ -314,18 +314,18 @@
332
333 k._parents = [frozenset(),
334 ]
335- k._weave = ['bad line',
336- ('{', 0),
337- 'foo {',
338- ('{', 1),
339- ' added in version 1',
340- ('{', 2),
341- ' added in v2',
342- ('}', 2),
343- ' also from v1',
344- ('}', 1),
345- '}',
346- ('}', 0)]
347+ k._weave = [b'bad line',
348+ (b'{', 0),
349+ b'foo {',
350+ (b'{', 1),
351+ b' added in version 1',
352+ (b'{', 2),
353+ b' added in v2',
354+ (b'}', 2),
355+ b' also from v1',
356+ (b'}', 1),
357+ b'}',
358+ (b'}', 0)]
359
360 ################################### SKIPPED
361 # Weave.get doesn't trap this anymore
362@@ -347,15 +347,15 @@
363 frozenset([0]),
364 frozenset([0, 1, 2]),
365 ]
366- k._weave = [('{', 0),
367- 'foo {',
368- ('{', 1),
369- ' added in version 1',
370- ('{', 1),
371- ' more in 1',
372- ('}', 1),
373- ('}', 1),
374- ('}', 0)]
375+ k._weave = [(b'{', 0),
376+ b'foo {',
377+ (b'{', 1),
378+ b' added in version 1',
379+ (b'{', 1),
380+ b' more in 1',
381+ (b'}', 1),
382+ (b'}', 1),
383+ (b'}', 0)]
384
385
386 # this is not currently enforced by get
387@@ -380,45 +380,45 @@
388 frozenset([0]),
389 frozenset([0, 1, 2]),
390 ]
391- k._weave = [('{', 0),
392- 'foo {',
393- ('{', 1),
394- ' added in version 1',
395- ('{', 2),
396- ' added in v2',
397- ('}', 2),
398- ' also from v1',
399- ('}', 1),
400- '}',
401- ('}', 0)]
402+ k._weave = [(b'{', 0),
403+ b'foo {',
404+ (b'{', 1),
405+ b' added in version 1',
406+ (b'{', 2),
407+ b' added in v2',
408+ (b'}', 2),
409+ b' also from v1',
410+ (b'}', 1),
411+ b'}',
412+ (b'}', 0)]
413
414- k._sha1s = [sha_string('foo {}')
415- , sha_string('foo { added in version 1 also from v1}')
416- , sha_string('foo { added in v2}')
417- , sha_string('foo { added in version 1 added in v2 also from v1}')
418+ k._sha1s = [sha_string(b'foo {}')
419+ , sha_string(b'foo { added in version 1 also from v1}')
420+ , sha_string(b'foo { added in v2}')
421+ , sha_string(b'foo { added in version 1 added in v2 also from v1}')
422 ]
423
424 self.assertEqual(k.get_lines(0),
425- ['foo {',
426- '}'])
427+ [b'foo {',
428+ b'}'])
429
430 self.assertEqual(k.get_lines(1),
431- ['foo {',
432- ' added in version 1',
433- ' also from v1',
434- '}'])
435+ [b'foo {',
436+ b' added in version 1',
437+ b' also from v1',
438+ b'}'])
439
440 self.assertEqual(k.get_lines(2),
441- ['foo {',
442- ' added in v2',
443- '}'])
444+ [b'foo {',
445+ b' added in v2',
446+ b'}'])
447
448 self.assertEqual(k.get_lines(3),
449- ['foo {',
450- ' added in version 1',
451- ' added in v2',
452- ' also from v1',
453- '}'])
454+ [b'foo {',
455+ b' added in version 1',
456+ b' added in v2',
457+ b' also from v1',
458+ b'}'])
459
460
461 class DeleteLines2(TestBase):
462@@ -429,23 +429,23 @@
463 def runTest(self):
464 k = Weave()
465
466- k.add_lines('text0', [], ["line the first",
467- "line 2",
468- "line 3",
469- "fine"])
470+ k.add_lines(b'text0', [], [b"line the first",
471+ b"line 2",
472+ b"line 3",
473+ b"fine"])
474
475 self.assertEqual(len(k.get_lines(0)), 4)
476
477- k.add_lines('text1', ['text0'], ["line the first",
478- "fine"])
479+ k.add_lines(b'text1', [b'text0'], [b"line the first",
480+ b"fine"])
481
482 self.assertEqual(k.get_lines(1),
483- ["line the first",
484- "fine"])
485+ [b"line the first",
486+ b"fine"])
487
488- self.assertEqual(k.annotate('text1'),
489- [('text0', "line the first"),
490- ('text0', "fine")])
491+ self.assertEqual(k.annotate(b'text1'),
492+ [(b'text0', b"line the first"),
493+ (b'text0', b"fine")])
494
495
496 class IncludeVersions(TestBase):
497@@ -462,22 +462,22 @@
498 k = Weave()
499
500 k._parents = [frozenset(), frozenset([0])]
501- k._weave = [('{', 0),
502- "first line",
503- ('}', 0),
504- ('{', 1),
505- "second line",
506- ('}', 1)]
507+ k._weave = [(b'{', 0),
508+ b"first line",
509+ (b'}', 0),
510+ (b'{', 1),
511+ b"second line",
512+ (b'}', 1)]
513
514- k._sha1s = [sha_string('first line')
515- , sha_string('first linesecond line')]
516+ k._sha1s = [sha_string(b'first line')
517+ , sha_string(b'first linesecond line')]
518
519 self.assertEqual(k.get_lines(1),
520- ["first line",
521- "second line"])
522+ [b"first line",
523+ b"second line"])
524
525 self.assertEqual(k.get_lines(0),
526- ["first line"])
527+ [b"first line"])
528
529
530 class DivergedIncludes(TestBase):
531@@ -487,51 +487,51 @@
532 # FIXME make the weave, dont poke at it.
533 k = Weave()
534
535- k._names = ['0', '1', '2']
536- k._name_map = {'0':0, '1':1, '2':2}
537+ k._names = [b'0', b'1', b'2']
538+ k._name_map = {b'0':0, b'1':1, b'2':2}
539 k._parents = [frozenset(),
540 frozenset([0]),
541 frozenset([0]),
542 ]
543- k._weave = [('{', 0),
544- "first line",
545- ('}', 0),
546- ('{', 1),
547- "second line",
548- ('}', 1),
549- ('{', 2),
550- "alternative second line",
551- ('}', 2),
552+ k._weave = [(b'{', 0),
553+ b"first line",
554+ (b'}', 0),
555+ (b'{', 1),
556+ b"second line",
557+ (b'}', 1),
558+ (b'{', 2),
559+ b"alternative second line",
560+ (b'}', 2),
561 ]
562
563- k._sha1s = [sha_string('first line')
564- , sha_string('first linesecond line')
565- , sha_string('first linealternative second line')]
566+ k._sha1s = [sha_string(b'first line')
567+ , sha_string(b'first linesecond line')
568+ , sha_string(b'first linealternative second line')]
569
570 self.assertEqual(k.get_lines(0),
571- ["first line"])
572+ [b"first line"])
573
574 self.assertEqual(k.get_lines(1),
575- ["first line",
576- "second line"])
577-
578- self.assertEqual(k.get_lines('2'),
579- ["first line",
580- "alternative second line"])
581-
582- self.assertEqual(list(k.get_ancestry(['2'])),
583- ['0', '2'])
584+ [b"first line",
585+ b"second line"])
586+
587+ self.assertEqual(k.get_lines(b'2'),
588+ [b"first line",
589+ b"alternative second line"])
590+
591+ self.assertEqual(list(k.get_ancestry([b'2'])),
592+ [b'0', b'2'])
593
594
595 class ReplaceLine(TestBase):
596 def runTest(self):
597 k = Weave()
598
599- text0 = ['cheddar', 'stilton', 'gruyere']
600- text1 = ['cheddar', 'blue vein', 'neufchatel', 'chevre']
601+ text0 = [b'cheddar', b'stilton', b'gruyere']
602+ text1 = [b'cheddar', b'blue vein', b'neufchatel', b'chevre']
603
604- k.add_lines('text0', [], text0)
605- k.add_lines('text1', ['text0'], text1)
606+ k.add_lines(b'text0', [], text0)
607+ k.add_lines(b'text1', [b'text0'], text1)
608
609 self.log('k._weave=' + pformat(k._weave))
610
611@@ -545,30 +545,30 @@
612 def runTest(self):
613 k = Weave()
614
615- texts = [['header'],
616- ['header', '', 'line from 1'],
617- ['header', '', 'line from 2', 'more from 2'],
618- ['header', '', 'line from 1', 'fixup line', 'line from 2'],
619+ texts = [[b'header'],
620+ [b'header', b'', b'line from 1'],
621+ [b'header', b'', b'line from 2', b'more from 2'],
622+ [b'header', b'', b'line from 1', b'fixup line', b'line from 2'],
623 ]
624
625- k.add_lines('text0', [], texts[0])
626- k.add_lines('text1', ['text0'], texts[1])
627- k.add_lines('text2', ['text0'], texts[2])
628- k.add_lines('merge', ['text0', 'text1', 'text2'], texts[3])
629+ k.add_lines(b'text0', [], texts[0])
630+ k.add_lines(b'text1', [b'text0'], texts[1])
631+ k.add_lines(b'text2', [b'text0'], texts[2])
632+ k.add_lines(b'merge', [b'text0', b'text1', b'text2'], texts[3])
633
634 for i, t in enumerate(texts):
635 self.assertEqual(k.get_lines(i), t)
636
637- self.assertEqual(k.annotate('merge'),
638- [('text0', 'header'),
639- ('text1', ''),
640- ('text1', 'line from 1'),
641- ('merge', 'fixup line'),
642- ('text2', 'line from 2'),
643+ self.assertEqual(k.annotate(b'merge'),
644+ [(b'text0', b'header'),
645+ (b'text1', b''),
646+ (b'text1', b'line from 1'),
647+ (b'merge', b'fixup line'),
648+ (b'text2', b'line from 2'),
649 ])
650
651- self.assertEqual(list(k.get_ancestry(['merge'])),
652- ['text0', 'text1', 'text2', 'merge'])
653+ self.assertEqual(list(k.get_ancestry([b'merge'])),
654+ [b'text0', b'text1', b'text2', b'merge'])
655
656 self.log('k._weave=' + pformat(k._weave))
657
658@@ -585,15 +585,15 @@
659 return # NOT RUN
660 k = Weave()
661
662- k.add_lines([], ['aaa', 'bbb'])
663- k.add_lines([0], ['aaa', '111', 'bbb'])
664- k.add_lines([1], ['aaa', '222', 'bbb'])
665+ k.add_lines([], [b'aaa', b'bbb'])
666+ k.add_lines([0], [b'aaa', b'111', b'bbb'])
667+ k.add_lines([1], [b'aaa', b'222', b'bbb'])
668
669 merged = k.merge([1, 2])
670
671- self.assertEqual([[['aaa']],
672- [['111'], ['222']],
673- [['bbb']]])
674+ self.assertEqual([[[b'aaa']],
675+ [[b'111'], [b'222']],
676+ [[b'bbb']]])
677
678
679 class NonConflict(TestBase):
680@@ -604,9 +604,9 @@
681 return # NOT RUN
682 k = Weave()
683
684- k.add_lines([], ['aaa', 'bbb'])
685- k.add_lines([0], ['111', 'aaa', 'ccc', 'bbb'])
686- k.add_lines([1], ['aaa', 'ccc', 'bbb', '222'])
687+ k.add_lines([], [b'aaa', b'bbb'])
688+ k.add_lines([0], [b'111', b'aaa', b'ccc', b'bbb'])
689+ k.add_lines([1], [b'aaa', b'ccc', b'bbb', b'222'])
690
691
692 class Khayyam(TestBase):
693@@ -614,17 +614,17 @@
694
695 def test_multi_line_merge(self):
696 rawtexts = [
697- """A Book of Verses underneath the Bough,
698+ b"""A Book of Verses underneath the Bough,
699 A Jug of Wine, a Loaf of Bread, -- and Thou
700 Beside me singing in the Wilderness --
701 Oh, Wilderness were Paradise enow!""",
702
703- """A Book of Verses underneath the Bough,
704+ b"""A Book of Verses underneath the Bough,
705 A Jug of Wine, a Loaf of Bread, -- and Thou
706 Beside me singing in the Wilderness --
707 Oh, Wilderness were Paradise now!""",
708
709- """A Book of poems underneath the tree,
710+ b"""A Book of poems underneath the tree,
711 A Jug of Wine, a Loaf of Bread,
712 and Thou
713 Beside me singing in the Wilderness --
714@@ -632,21 +632,21 @@
715
716 -- O. Khayyam""",
717
718- """A Book of Verses underneath the Bough,
719+ b"""A Book of Verses underneath the Bough,
720 A Jug of Wine, a Loaf of Bread,
721 and Thou
722 Beside me singing in the Wilderness --
723 Oh, Wilderness were Paradise now!""",
724 ]
725- texts = [[l.strip() for l in t.split('\n')] for t in rawtexts]
726+ texts = [[l.strip() for l in t.split(b'\n')] for t in rawtexts]
727
728 k = Weave()
729 parents = set()
730 i = 0
731 for t in texts:
732- ver = k.add_lines('text%d' % i,
733+ ver = k.add_lines(b'text%d' % i,
734 list(parents), t)
735- parents.add('text%d' % i)
736+ parents.add(b'text%d' % i)
737 i += 1
738
739 self.log("k._weave=" + pformat(k._weave))
740@@ -662,11 +662,11 @@
741 def setUp(self):
742 super(JoinWeavesTests, self).setUp()
743 self.weave1 = Weave()
744- self.lines1 = ['hello\n']
745- self.lines3 = ['hello\n', 'cruel\n', 'world\n']
746- self.weave1.add_lines('v1', [], self.lines1)
747- self.weave1.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
748- self.weave1.add_lines('v3', ['v2'], self.lines3)
749+ self.lines1 = [b'hello\n']
750+ self.lines3 = [b'hello\n', b'cruel\n', b'world\n']
751+ self.weave1.add_lines(b'v1', [], self.lines1)
752+ self.weave1.add_lines(b'v2', [b'v1'], [b'hello\n', b'world\n'])
753+ self.weave1.add_lines(b'v3', [b'v2'], self.lines3)
754
755 def test_written_detection(self):
756 # Test detection of weave file corruption.
757@@ -676,18 +676,18 @@
758 # but it at least helps verify the data you get, is what you want.
759
760 w = Weave()
761- w.add_lines('v1', [], ['hello\n'])
762- w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
763+ w.add_lines(b'v1', [], [b'hello\n'])
764+ w.add_lines(b'v2', [b'v1'], [b'hello\n', b'there\n'])
765
766 tmpf = BytesIO()
767 write_weave(w, tmpf)
768
769 # Because we are corrupting, we need to make sure we have the exact text
770- self.assertEqual('# bzr weave file v5\n'
771- 'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
772- 'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
773- 'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n',
774- tmpf.getvalue())
775+ self.assertEqual(b'# bzr weave file v5\n'
776+ b'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
777+ b'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
778+ b'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n',
779+ tmpf.getvalue())
780
781 # Change a single letter
782 tmpf = BytesIO(b'# bzr weave file v5\n'
783@@ -697,9 +697,9 @@
784
785 w = read_weave(tmpf)
786
787- self.assertEqual('hello\n', w.get_text('v1'))
788- self.assertRaises(WeaveInvalidChecksum, w.get_text, 'v2')
789- self.assertRaises(WeaveInvalidChecksum, w.get_lines, 'v2')
790+ self.assertEqual(b'hello\n', w.get_text(b'v1'))
791+ self.assertRaises(WeaveInvalidChecksum, w.get_text, b'v2')
792+ self.assertRaises(WeaveInvalidChecksum, w.get_lines, b'v2')
793 self.assertRaises(WeaveInvalidChecksum, w.check)
794
795 # Change the sha checksum
796@@ -710,9 +710,9 @@
797
798 w = read_weave(tmpf)
799
800- self.assertEqual('hello\n', w.get_text('v1'))
801- self.assertRaises(WeaveInvalidChecksum, w.get_text, 'v2')
802- self.assertRaises(WeaveInvalidChecksum, w.get_lines, 'v2')
803+ self.assertEqual(b'hello\n', w.get_text(b'v1'))
804+ self.assertRaises(WeaveInvalidChecksum, w.get_text, b'v2')
805+ self.assertRaises(WeaveInvalidChecksum, w.get_lines, b'v2')
806 self.assertRaises(WeaveInvalidChecksum, w.check)
807
808
809@@ -721,14 +721,14 @@
810 def test_allow_reserved_false(self):
811 w = Weave('name', allow_reserved=False)
812 # Add lines is checked at the WeaveFile level, not at the Weave level
813- w.add_lines('name:', [], TEXT_1)
814+ w.add_lines(b'name:', [], TEXT_1)
815 # But get_lines is checked at this level
816- self.assertRaises(errors.ReservedId, w.get_lines, 'name:')
817+ self.assertRaises(errors.ReservedId, w.get_lines, b'name:')
818
819 def test_allow_reserved_true(self):
820 w = Weave('name', allow_reserved=True)
821- w.add_lines('name:', [], TEXT_1)
822- self.assertEqual(TEXT_1, w.get_lines('name:'))
823+ w.add_lines(b'name:', [], TEXT_1)
824+ self.assertEqual(TEXT_1, w.get_lines(b'name:'))
825
826
827 class InstrumentedWeave(Weave):
828
829=== modified file 'python3.passing'
830--- python3.passing 2018-05-22 01:41:54 +0000
831+++ python3.passing 2018-05-22 01:41:54 +0000
832@@ -56,9 +56,33 @@
833 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BranchReferenceFormat)
834 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat7)
835 breezy.plugins.weave_fmt.test_bzrdir.TestBranchFormat4.test_no_metadir_support
836+breezy.plugins.weave_fmt.test_bzrdir.TestBranchFormat4.test_supports_bzrdir_6
837+breezy.plugins.weave_fmt.test_bzrdir.TestFormat5.test_can_convert
838+breezy.plugins.weave_fmt.test_bzrdir.TestFormat5.test_needs_conversion
839+breezy.plugins.weave_fmt.test_bzrdir.TestFormat5.test_same_lockfiles_between_tree_repo_branch
840+breezy.plugins.weave_fmt.test_bzrdir.TestFormat6.test_can_convert
841+breezy.plugins.weave_fmt.test_bzrdir.TestFormat6.test_needs_conversion
842+breezy.plugins.weave_fmt.test_bzrdir.TestFormat6.test_same_lockfiles_between_tree_repo_branch
843+breezy.plugins.weave_fmt.test_bzrdir.V4WeaveBundleTester.test_crlf_bundle
844+breezy.plugins.weave_fmt.test_bzrdir.V4WeaveBundleTester.test_malformed
845+breezy.plugins.weave_fmt.test_bzrdir.V4WeaveBundleTester.test_non_bundle
846+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_attribute__fetch_order
847+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_attribute__fetch_reconcile
848+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_attribute__fetch_uses_deltas
849+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_no_ancestry_weave
850+breezy.plugins.weave_fmt.test_repository.TestFormat6.test_supports_external_lookups
851+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_order
852+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_reconcile
853+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_uses_deltas
854+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_creates_lockdir
855+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_supports_external_lookups
856+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_uses_lockdir
857 breezy.plugins.weave_fmt.test_repository.TestInterWeaveRepo.test_is_compatible_and_registered
858+breezy.plugins.weave_fmt.test_repository.TestSerializer.test_canned_inventory
859 breezy.plugins.weave_fmt.test_repository.TestSerializer.test_registry
860+breezy.plugins.weave_fmt.test_repository.TestSerializer.test_unpack_revision
861 breezy.plugins.weave_fmt.test_store.TestCompressedTextStore.test_multiple_add
862+breezy.plugins.weave_fmt.test_store.TestCompressedTextStore.test__relpath_suffixed
863 breezy.plugins.weave_fmt.test_store.TestCompressedTextStore.test_total_size
864 breezy.plugins.weave_fmt.test_store.TestInstrumentedTransportStore.test__add_records
865 breezy.plugins.weave_fmt.test_store.TestMemoryStore.test_adding_fails_when_present
866@@ -70,12 +94,15 @@
867 breezy.plugins.weave_fmt.test_store.TestMockTransport.test_mkdir
868 breezy.plugins.weave_fmt.test_store.TestTextStore.test_multiple_add
869 breezy.plugins.weave_fmt.test_store.TestTextStore.test_total_size
870+breezy.plugins.weave_fmt.test_store.TestTransportStore.test_add_prefixed
871 breezy.plugins.weave_fmt.test_store.TestTransportStore.test_add_simple
872+breezy.plugins.weave_fmt.test_store.TestTransportStore.test_escaped_uppercase
873 breezy.plugins.weave_fmt.test_store.TestTransportStore.test___iter__no_suffix
874 breezy.plugins.weave_fmt.test_store.TestTransportStore.test___len__
875 breezy.plugins.weave_fmt.test_store.TestTransportStore.test_register_invalid_suffixes
876 breezy.plugins.weave_fmt.test_store.TestTransportStore.test_relpath_escaped
877 breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_invalid
878+breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_prefixed
879 breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_simple
880 breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_simple_suffixed
881 breezy.plugins.weave_fmt.test_store.TestTransportStore.test__relpath_unregister_suffixes
882@@ -6002,18 +6029,28 @@
883 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_no_key_generates_chk_key(groupcompress)
884 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_no_key_generates_chk_key(groupcompress-nograph)
885 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_no_key_generates_chk_key(named-knit)
886+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_no_key_generates_chk_key(weave-named)
887+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_no_key_generates_chk_key(weave-prefix)
888 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_nostoresha(annotated-knit-escape)
889 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_nostoresha(groupcompress)
890 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_nostoresha(groupcompress-nograph)
891 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_nostoresha(named-knit)
892+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_nostoresha(weave-named)
893+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_nostoresha(weave-prefix)
894 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_return(annotated-knit-escape)
895 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_return(groupcompress)
896 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_return(groupcompress-nograph)
897 breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_return(named-knit)
898+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_return(weave-named)
899+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines_return(weave-prefix)
900+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines(weave-named)
901+breezy.tests.per_versionedfile.TestVersionedFiles.test_add_lines(weave-prefix)
902 breezy.tests.per_versionedfile.TestVersionedFiles.test_annotate(annotated-knit-escape)
903 breezy.tests.per_versionedfile.TestVersionedFiles.test_annotate(groupcompress)
904 breezy.tests.per_versionedfile.TestVersionedFiles.test_annotate(groupcompress-nograph)
905 breezy.tests.per_versionedfile.TestVersionedFiles.test_annotate(named-knit)
906+breezy.tests.per_versionedfile.TestVersionedFiles.test_annotate(weave-named)
907+breezy.tests.per_versionedfile.TestVersionedFiles.test_annotate(weave-prefix)
908 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_no_parameters(annotated-knit-escape)
909 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_no_parameters(groupcompress)
910 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_no_parameters(groupcompress-nograph)
911@@ -6037,6 +6074,8 @@
912 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_with_keys_becomes_generator(groupcompress)
913 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_with_keys_becomes_generator(groupcompress-nograph)
914 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_with_keys_becomes_generator(named-knit)
915+breezy.tests.per_versionedfile.TestVersionedFiles.test_check_with_keys_becomes_generator(weave-named)
916+breezy.tests.per_versionedfile.TestVersionedFiles.test_check_with_keys_becomes_generator(weave-prefix)
917 breezy.tests.per_versionedfile.TestVersionedFiles.test_clear_cache(annotated-knit-escape)
918 breezy.tests.per_versionedfile.TestVersionedFiles.test_clear_cache(groupcompress)
919 breezy.tests.per_versionedfile.TestVersionedFiles.test_clear_cache(groupcompress-nograph)
920@@ -6067,15 +6106,21 @@
921 breezy.tests.per_versionedfile.TestVersionedFiles.test_filter_absent_records(groupcompress)
922 breezy.tests.per_versionedfile.TestVersionedFiles.test_filter_absent_records(groupcompress-nograph)
923 breezy.tests.per_versionedfile.TestVersionedFiles.test_filter_absent_records(named-knit)
924+breezy.tests.per_versionedfile.TestVersionedFiles.test_filter_absent_records(weave-named)
925+breezy.tests.per_versionedfile.TestVersionedFiles.test_filter_absent_records(weave-prefix)
926 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_annotator(annotated-knit-escape)
927 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_annotator(groupcompress)
928 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_annotator(groupcompress-nograph)
929 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_annotator(named-knit)
930+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_annotator(weave-named)
931+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_annotator(weave-prefix)
932 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_known_graph_ancestry(annotated-knit-escape)
933 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_known_graph_ancestry(groupcompress)
934 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_known_graph_ancestry(groupcompress-nograph)
935 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_known_graph_ancestry(named-knit)
936 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_known_graph_ancestry(named-nograph-nodelta-knit-pack)
937+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_known_graph_ancestry(weave-named)
938+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_known_graph_ancestry(weave-prefix)
939 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_parent_map(annotated-knit-escape)
940 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_parent_map(groupcompress)
941 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_parent_map(groupcompress-nograph)
942@@ -6099,41 +6144,65 @@
943 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_groupcompress(groupcompress-nograph)
944 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_groupcompress(named-knit)
945 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface(groupcompress-nograph)
946+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_groupcompress(weave-named)
947+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_groupcompress(weave-prefix)
948 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface(named-knit)
949 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered(annotated-knit-escape)
950 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered(groupcompress)
951 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered(groupcompress-nograph)
952 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered(named-knit)
953+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered(weave-named)
954+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered(weave-prefix)
955 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered_with_delta_closure(annotated-knit-escape)
956 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered_with_delta_closure(groupcompress)
957 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered_with_delta_closure(groupcompress-nograph)
958 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered_with_delta_closure(named-knit)
959+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered_with_delta_closure(weave-named)
960+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface_ordered_with_delta_closure(weave-prefix)
961+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface(weave-named)
962+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_interface(weave-prefix)
963 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_missing_records_are_absent(annotated-knit-escape)
964 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_missing_records_are_absent(groupcompress)
965 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_missing_records_are_absent(groupcompress-nograph)
966 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_missing_records_are_absent(named-knit)
967+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_missing_records_are_absent(weave-named)
968+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_missing_records_are_absent(weave-prefix)
969 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_delta(groupcompress)
970 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_delta(groupcompress-nograph)
971+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_delta(weave-named)
972+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_delta(weave-prefix)
973 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_ft_delta(groupcompress)
974 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_ft_delta(groupcompress-nograph)
975+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_ft_delta(weave-named)
976+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_ft_delta(weave-prefix)
977 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_one_ft(annotated-knit-escape)
978 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_one_ft(groupcompress)
979 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_one_ft(groupcompress-nograph)
980 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_one_ft(named-knit)
981+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_one_ft(weave-named)
982+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_native_formats_are_wire_ready_one_ft(weave-prefix)
983 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_unknown_storage_kind_raises(annotated-knit-escape)
984 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_unknown_storage_kind_raises(groupcompress)
985 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_unknown_storage_kind_raises(groupcompress-nograph)
986 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_unknown_storage_kind_raises(named-knit)
987+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_unknown_storage_kind_raises(weave-named)
988+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_unknown_storage_kind_raises(weave-prefix)
989 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_wire_ready_delta_closure_included(groupcompress)
990 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_wire_ready_delta_closure_included(groupcompress-nograph)
991+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_wire_ready_delta_closure_included(weave-named)
992+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_record_stream_wire_ready_delta_closure_included(weave-prefix)
993 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_sha1s(annotated-knit-escape)
994 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_sha1s(groupcompress)
995 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_sha1s(groupcompress-nograph)
996 breezy.tests.per_versionedfile.TestVersionedFiles.test_get_sha1s(named-knit)
997+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_sha1s(weave-named)
998+breezy.tests.per_versionedfile.TestVersionedFiles.test_get_sha1s(weave-prefix)
999 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_annotated_knits(groupcompress)
1000 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_annotated_knits(groupcompress-nograph)
1001 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_annotated_knits_noeol(groupcompress)
1002 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_annotated_knits_noeol(groupcompress-nograph)
1003+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_annotated_knits_noeol(weave-named)
1004+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_annotated_knits(weave-named)
1005 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_can_be_added_later(annotated-knit-escape)
1006 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_can_be_added_later(groupcompress)
1007 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_can_be_added_later(groupcompress-nograph)
1008@@ -6146,6 +6215,8 @@
1009 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_no_corruption(groupcompress-nograph)
1010 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_no_corruption(named-graph-nodelta-knit-pack)
1011 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_no_corruption(named-nograph-nodelta-knit-pack)
1012+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_no_corruption(weave-named)
1013+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_delta_missing_basis_no_corruption(weave-prefix)
1014 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_empty(annotated-knit-escape)
1015 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_empty(groupcompress)
1016 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_empty(groupcompress-nograph)
1017@@ -6158,9 +6229,21 @@
1018 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_empty(weave-prefix)
1019 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_existing_keys(groupcompress)
1020 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_existing_keys(groupcompress-nograph)
1021+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_existing_keys(weave-named)
1022+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_existing_keys(weave-prefix)
1023+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts(groupcompress)
1024+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts(groupcompress-nograph)
1025+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts(named-knit)
1026+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts_noeol(groupcompress)
1027+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts_noeol(groupcompress-nograph)
1028+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts_noeol(named-knit)
1029+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts_noeol(weave-named)
1030+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_fulltexts(weave-named)
1031 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_long_parent_chain_out_of_order(groupcompress)
1032 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_long_parent_chain_out_of_order(groupcompress-nograph)
1033 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_long_parent_chain_out_of_order(named-nograph-nodelta-knit-pack)
1034+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_long_parent_chain_out_of_order(weave-named)
1035+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_long_parent_chain_out_of_order(weave-prefix)
1036 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(annotated-knit-escape)
1037 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(groupcompress)
1038 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(groupcompress-nograph)
1039@@ -6173,13 +6256,19 @@
1040 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(weave-prefix)
1041 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_out_of_order(groupcompress)
1042 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_out_of_order(groupcompress-nograph)
1043+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_out_of_order(weave-named)
1044+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_out_of_order(weave-prefix)
1045 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_plain_knits(groupcompress)
1046 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_plain_knits(groupcompress-nograph)
1047 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_plain_knits_noeol(groupcompress)
1048 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_plain_knits_noeol(groupcompress-nograph)
1049+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_plain_knits_noeol(weave-named)
1050+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_plain_knits(weave-named)
1051 breezy.tests.per_versionedfile.TestVersionedFiles.test_iter_lines_added_or_present_in_keys(groupcompress)
1052 breezy.tests.per_versionedfile.TestVersionedFiles.test_iter_lines_added_or_present_in_keys(groupcompress-nograph)
1053 breezy.tests.per_versionedfile.TestVersionedFiles.test_iter_lines_added_or_present_in_keys(named-knit)
1054+breezy.tests.per_versionedfile.TestVersionedFiles.test_iter_lines_added_or_present_in_keys(weave-named)
1055+breezy.tests.per_versionedfile.TestVersionedFiles.test_iter_lines_added_or_present_in_keys(weave-prefix)
1056 breezy.tests.per_versionedfile.TestVersionedFiles.test_keys(groupcompress)
1057 breezy.tests.per_versionedfile.TestVersionedFiles.test_keys(groupcompress-nograph)
1058 breezy.tests.per_versionedfile.TestVersionedFiles.test_keys(named-knit)
1059@@ -6195,10 +6284,14 @@
1060 breezy.tests.per_versionedfile.TestVersionedFiles.test_make_mpdiffs(groupcompress)
1061 breezy.tests.per_versionedfile.TestVersionedFiles.test_make_mpdiffs(groupcompress-nograph)
1062 breezy.tests.per_versionedfile.TestVersionedFiles.test_make_mpdiffs(named-knit)
1063+breezy.tests.per_versionedfile.TestVersionedFiles.test_make_mpdiffs(weave-named)
1064+breezy.tests.per_versionedfile.TestVersionedFiles.test_make_mpdiffs(weave-prefix)
1065 breezy.tests.per_versionedfile.TestVersionedFiles.test_newline_only(annotated-knit-escape)
1066 breezy.tests.per_versionedfile.TestVersionedFiles.test_newline_only(groupcompress)
1067 breezy.tests.per_versionedfile.TestVersionedFiles.test_newline_only(groupcompress-nograph)
1068 breezy.tests.per_versionedfile.TestVersionedFiles.test_newline_only(named-knit)
1069+breezy.tests.per_versionedfile.TestVersionedFiles.test_newline_only(weave-named)
1070+breezy.tests.per_versionedfile.TestVersionedFiles.test_newline_only(weave-prefix)
1071 breezy.tests.per_versionedfile.TestWeaveMerge.test_agreement_deletion
1072 breezy.tests.per_versionedfile.TestWeaveMerge.testClashReplace
1073 breezy.tests.per_versionedfile.TestWeaveMerge.testDeleteAndModify
1074@@ -6212,6 +6305,7 @@
1075 breezy.tests.per_versionedfile.TestWeaveMerge.testSeparateInserts
1076 breezy.tests.per_versionedfile.TestWeaveMerge.test_sync_on_deletion
1077 breezy.tests.per_versionedfile.TestWeaveMerge.test_weave_merge_conflicts
1078+breezy.tests.per_versionedfile.TestWeave.test_add
1079 breezy.tests.per_versionedfile.TestWeave.test_add_follows_left_matching_blocks
1080 breezy.tests.per_versionedfile.TestWeave.test_add_lines_nostoresha
1081 breezy.tests.per_versionedfile.TestWeave.test_add_lines_return_value
1082@@ -6220,11 +6314,13 @@
1083 breezy.tests.per_versionedfile.TestWeave.test_add_lines_with_ghosts_nostoresha
1084 breezy.tests.per_versionedfile.TestWeave.test_add_lines_with_matching_blocks_noeol_last_line
1085 breezy.tests.per_versionedfile.TestWeave.test_add_reserved
1086+breezy.tests.per_versionedfile.TestWeave.test_adds_with_parent_texts
1087 breezy.tests.per_versionedfile.TestWeave.test_add_unchanged_last_line_noeol_snapshot
1088 breezy.tests.per_versionedfile.TestWeave.test_add_unicode_content
1089 breezy.tests.per_versionedfile.TestWeave.test_ancestry
1090 breezy.tests.per_versionedfile.TestWeave.test_annotate
1091 breezy.tests.per_versionedfile.TestWeave.test_copy_to
1092+breezy.tests.per_versionedfile.TestWeave.test_detection
1093 breezy.tests.per_versionedfile.TestWeave.test_get_parent_map
1094 breezy.tests.per_versionedfile.TestWeave.test_get_reserved
1095 breezy.tests.per_versionedfile.TestWeave.test_get_suffixes
1096@@ -10826,7 +10922,12 @@
1097 breezy.tests.test_utextwrap.TestUTextWrap.test_cut
1098 breezy.tests.test_utextwrap.TestUTextWrap.test_width
1099 breezy.tests.test_utextwrap.TestWrap.test_wrap
1100+breezy.tests.test_versionedfile.Test_MPDiffGenerator.test_compute_diffs
1101+breezy.tests.test_versionedfile.Test_MPDiffGenerator.test_finds_parents
1102+breezy.tests.test_versionedfile.Test_MPDiffGenerator.test_ignores_ghost_parents
1103+breezy.tests.test_versionedfile.Test_MPDiffGenerator.test_process_contents
1104 breezy.tests.test_versionedfile.Test_MPDiffGenerator.test_raises_on_ghost_keys
1105+breezy.tests.test_versionedfile.Test_MPDiffGenerator.test_refcount_multiple_children
1106 breezy.tests.test_version_info.CustomVersionInfoTests.test_custom_without_template
1107 breezy.tests.test_version_info.TestVersionInfoFormatRegistry.test_register_remove
1108 breezy.tests.test_vf_search.TestLimitedSearchResultFromParentMap.test_ancestry_1
1109@@ -10848,15 +10949,33 @@
1110 breezy.tests.test__walkdirs_win32.TestWin32Finder.test_prefix
1111 breezy.tests.test__walkdirs_win32.TestWin32Finder.test_top_prefix_to_starting_dir
1112 breezy.tests.test__walkdirs_win32.Test_Win32Stat.test_zero_members_present
1113+breezy.tests.test_weave.AnnotateOne.runTest
1114 breezy.tests.test_weave.BadInsert.runTest
1115 breezy.tests.test_weave.BadWeave.runTest
1116+breezy.tests.test_weave.CannedDelete.runTest
1117+breezy.tests.test_weave.CannedReplacement.runTest
1118 breezy.tests.test_weave.Conflicts.runTest
1119+breezy.tests.test_weave.DeleteLines2.runTest
1120+breezy.tests.test_weave.DeleteLines.runTest
1121+breezy.tests.test_weave.DivergedIncludes.runTest
1122 breezy.tests.test_weave.Easy.runTest
1123+breezy.tests.test_weave.IncludeVersions.runTest
1124+breezy.tests.test_weave.InsertLines.runTest
1125+breezy.tests.test_weave.InsertNested.runTest
1126 breezy.tests.test_weave.InvalidAdd.runTest
1127+breezy.tests.test_weave.InvalidRepeatedAdd.runTest
1128+breezy.tests.test_weave.JoinWeavesTests.test_written_detection
1129+breezy.tests.test_weave.Khayyam.test_multi_line_merge
1130+breezy.tests.test_weave.Merge.runTest
1131 breezy.tests.test_weave.NonConflict.runTest
1132+breezy.tests.test_weave.RepeatedAdd.test_duplicate_add
1133+breezy.tests.test_weave.ReplaceLine.runTest
1134 breezy.tests.test_weave.SuicideDelete.runTest
1135 breezy.tests.test_weave.TestNeedsReweave.test_compatible_parents
1136 breezy.tests.test_weave.TestWeaveFile.test_empty_file
1137+breezy.tests.test_weave.TestWeave.test_allow_reserved_false
1138+breezy.tests.test_weave.TestWeave.test_allow_reserved_true
1139+breezy.tests.test_weave.WeaveContains.runTest
1140 breezy.tests.test_whitebox.MoreTests.test_relpath
1141 breezy.tests.test_win32utils.TestAppPaths.test_iexplore
1142 breezy.tests.test_win32utils.TestAppPaths.test_not_existing

Subscribers

People subscribed via source and target branches