← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-25 08:01:09 UTC
  • mfrom: (2858.1.1 ianc-integration2)
  • Revision ID: pqm@pqm.ubuntu.com-20070925080109-vqlnacer5iwwmxm8
Joining of annotated and plain knits (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_knit.py
1315
1315
        self.assertEquals(origins[1], ('text-1', 'b\n'))
1316
1316
        self.assertEquals(origins[2], ('text-1', 'c\n'))
1317
1317
 
1318
 
    def test_knit_join(self):
1319
 
        """Store in knit with parents"""
1320
 
        k1 = KnitVersionedFile('test1', get_transport('.'), factory=KnitPlainFactory(), create=True)
1321
 
        k1.add_lines('text-a', [], split_lines(TEXT_1))
1322
 
        k1.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1323
 
 
1324
 
        k1.add_lines('text-c', [], split_lines(TEXT_1))
1325
 
        k1.add_lines('text-d', ['text-c'], split_lines(TEXT_1))
1326
 
 
1327
 
        k1.add_lines('text-m', ['text-b', 'text-d'], split_lines(TEXT_1))
1328
 
 
1329
 
        k2 = KnitVersionedFile('test2', get_transport('.'), factory=KnitPlainFactory(), create=True)
 
1318
    def _test_join_with_factories(self, k1_factory, k2_factory):
 
1319
        k1 = KnitVersionedFile('test1', get_transport('.'), factory=k1_factory, create=True)
 
1320
        k1.add_lines('text-a', [], ['a1\n', 'a2\n', 'a3\n'])
 
1321
        k1.add_lines('text-b', ['text-a'], ['a1\n', 'b2\n', 'a3\n'])
 
1322
        k1.add_lines('text-c', [], ['c1\n', 'c2\n', 'c3\n'])
 
1323
        k1.add_lines('text-d', ['text-c'], ['c1\n', 'd2\n', 'd3\n'])
 
1324
        k1.add_lines('text-m', ['text-b', 'text-d'], ['a1\n', 'b2\n', 'd3\n'])
 
1325
        k2 = KnitVersionedFile('test2', get_transport('.'), factory=k2_factory, create=True)
1330
1326
        count = k2.join(k1, version_ids=['text-m'])
1331
1327
        self.assertEquals(count, 5)
1332
1328
        self.assertTrue(k2.has_version('text-a'))
1333
1329
        self.assertTrue(k2.has_version('text-c'))
 
1330
        origins = k2.annotate('text-m')
 
1331
        self.assertEquals(origins[0], ('text-a', 'a1\n'))
 
1332
        self.assertEquals(origins[1], ('text-b', 'b2\n'))
 
1333
        self.assertEquals(origins[2], ('text-d', 'd3\n'))
 
1334
 
 
1335
    def test_knit_join_plain_to_plain(self):
 
1336
        """Test joining a plain knit with a plain knit."""
 
1337
        self._test_join_with_factories(KnitPlainFactory(), KnitPlainFactory())
 
1338
 
 
1339
    def test_knit_join_anno_to_anno(self):
 
1340
        """Test joining an annotated knit with an annotated knit."""
 
1341
        self._test_join_with_factories(None, None)
 
1342
 
 
1343
    def test_knit_join_anno_to_plain(self):
 
1344
        """Test joining an annotated knit with a plain knit."""
 
1345
        self._test_join_with_factories(None, KnitPlainFactory())
 
1346
 
 
1347
    def test_knit_join_plain_to_anno(self):
 
1348
        """Test joining a plain knit with an annotated knit."""
 
1349
        self._test_join_with_factories(KnitPlainFactory(), None)
1334
1350
 
1335
1351
    def test_reannotate(self):
1336
1352
        k1 = KnitVersionedFile('knit1', get_transport('.'),