← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
372
372
            tree_d.branch.base, patch_type='diff',
373
373
            public_branch=tree_a.branch.base)
374
374
 
375
 
    def test_disk_name(self):
376
 
        tree_a, tree_b, branch_c = self.make_trees()
377
 
        tree_a.branch.nick = 'fancy <name>'
378
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
379
 
            tree_b.branch.base)
380
 
        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))
381
 
 
382
 
    def test_disk_name_old_revno(self):
383
 
        tree_a, tree_b, branch_c = self.make_trees()
384
 
        tree_a.branch.nick = 'fancy-name'
385
 
        md = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
386
 
            tree_b.branch.base)
387
 
        self.assertEqual('fancy-name-1', md.get_disk_name(tree_a.branch))
388
 
 
389
375
    def test_generate_patch(self):
390
376
        tree_a, tree_b, branch_c = self.make_trees()
391
377
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
576
562
            branch_c.base, base_revision_id='rev2a')
577
563
        revision = md.install_revisions(tree_b.branch.repository)
578
564
 
579
 
    def test_handle_target_not_a_branch(self):
580
 
        tree_a, tree_b, branch_c = self.make_trees()
581
 
        branch_c.pull(tree_a.branch)
582
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
583
 
        tree_a.commit('rev3a', rev_id='rev3a')
584
 
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
585
 
            branch_c.base, base_revision_id='rev2a')
586
 
        md.target_branch = self.get_url('not-a-branch')
587
 
        self.assertRaises(errors.TargetNotBranch, md.install_revisions,
588
 
                tree_b.branch.repository)
589
 
 
590
565
 
591
566
class TestMergeDirective1Branch(tests.TestCaseWithTransport,
592
567
    TestMergeDirectiveBranch):
631
606
        public_branch=None, message=None, base_revision_id=None):
632
607
        include_patch = (patch_type in ('bundle', 'diff'))
633
608
        include_bundle = (patch_type == 'bundle')
634
 
        self.assertTrue(patch_type in ('bundle', 'diff', None))
 
609
        assert patch_type in ('bundle', 'diff', None)
635
610
        return merge_directive.MergeDirective2.from_objects(
636
611
            repository, revision_id, time, timezone, target_branch,
637
612
            include_patch, include_bundle, local_target_branch, public_branch,