← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/test_baz_import.py

  • Committer: Robert Collins
  • Date: 2005-10-23 22:56:20 UTC
  • mto: (147.1.39) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20051023225620-7ae2727d90bba914
When an import finds a revision it needs already in the branch, just append it to the revision history

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_baz_import.py
422
422
        self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')
423
423
        self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))
424
424
 
 
425
    def test_appending_revisions_already_present(self):
 
426
        import_version('output', pybaz.Version(self._baz._bad_id_tag),
 
427
                       self.collect, max_count=2)
 
428
        # expected results:
 
429
        # three commits, one files, revision identifiers of 
 
430
        # 'demo@DONOTUSE_c--import--0--base-0' ,
 
431
        # 'demo@DONOTUSE/c--bad-id--0--base-0' ,
 
432
        # ''demo@DONOTUSE/c--bad-id--0--patch-1'
 
433
        branch = Branch.open('output')
 
434
        self.assertEqual(branch.revision_history(),
 
435
                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',
 
436
                          self._baz._bad_id_tag_bzr_base])
 
437
        branch.set_revision_history(
 
438
            ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
 
439
        del branch
 
440
        branch = Branch.open('output')
 
441
        self.assertEqual(branch.revision_history(),
 
442
                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
 
443
        del branch
 
444
        import_version('output', pybaz.Version(self._baz._bad_id_tag),
 
445
                       self.collect)
 
446
        branch = Branch.open('output')
 
447
        self.assertEqual(branch.revision_history(),
 
448
                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',
 
449
                          self._baz._bad_id_tag_bzr_base,
 
450
                          self._baz._bad_id_tag_bzr])
 
451
        rev = branch.get_revision(self._baz._bad_id_tag_bzr)
 
452
        inv = branch.get_inventory(self._baz._bad_id_tag_bzr)
 
453
        self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')
 
454
        self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))
 
455
 
 
456
    def test_appending_revisions_all_already_present(self):
 
457
        import_version('output', pybaz.Version(self._baz._bad_id_tag),
 
458
                       self.collect)
 
459
        # expected results:
 
460
        # three commits, one files, revision identifiers of 
 
461
        # 'demo@DONOTUSE_c--import--0--base-0' ,
 
462
        # 'demo@DONOTUSE/c--bad-id--0--base-0' ,
 
463
        # ''demo@DONOTUSE/c--bad-id--0--patch-1'
 
464
        branch = Branch.open('output')
 
465
        self.assertEqual(branch.revision_history(),
 
466
                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',
 
467
                          self._baz._bad_id_tag_bzr_base,
 
468
                          self._baz._bad_id_tag_bzr])
 
469
        branch.set_revision_history(
 
470
            ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
 
471
        del branch
 
472
        branch = Branch.open('output')
 
473
        self.assertEqual(branch.revision_history(),
 
474
                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])
 
475
        del branch
 
476
        import_version('output', pybaz.Version(self._baz._bad_id_tag),
 
477
                       self.collect)
 
478
        branch = Branch.open('output')
 
479
        self.assertEqual(branch.revision_history(),
 
480
                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',
 
481
                          self._baz._bad_id_tag_bzr_base,
 
482
                          self._baz._bad_id_tag_bzr])
 
483
        rev = branch.get_revision(self._baz._bad_id_tag_bzr)
 
484
        inv = branch.get_inventory(self._baz._bad_id_tag_bzr)
 
485
        self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')
 
486
        self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))
 
487
 
425
488
 
426
489
class TestNamespacePrevious(TestCase):
427
490