~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

• browse files at revision 2691.1.17
• compare with another revision
• download diff
• download tarball
• view history from revision 2691.1.17

• reverse the comparison (2691.1.17 to 5039)
• stop comparing with revision 5039

Show diffs side-by-side

added

removed

bzrlib/tests/test_merge_directive.py

12

12

#

13

13

# You should have received a copy of the GNU General Public License

14

14

# along with this program; if not, write to the Free Software

15

 

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

 

15

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

16

16

 

17

 

import re

18

17

 

19

18

from bzrlib import (

20

19

    errors,

21

20

    gpg,

22

 

    mail_client,

23

21

    merge_directive,

24

22

    tests,

25

 

    trace,

26

23

    )

27

24

 

28

25

 

355

352

        tree_a = self.make_branch_and_tree('tree_a')

356

353

        tree_a.branch.get_config().set_user_option('email',

357

354

            'J. Random Hacker <jrandom@example.com>')

358

 

        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n'),

359

 

                                  ('tree_a/file_2', 'content_x\rcontent_y\r')])

360

 

        tree_a.add(['file', 'file_2'])

 

355

        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n')])

 

356

        tree_a.add('file')

361

357

        tree_a.commit('message', rev_id='rev1')

362

358

        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()

363

359

        branch_c = tree_a.bzrdir.sprout('branch_c').open_branch()

364

360

        tree_b.commit('message', rev_id='rev2b')

365

 

        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c \n'),

366

 

                                  ('tree_a/file_2', 'content_x\rcontent_z\r')])

 

361

        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c \n')])

367

362

        tree_a.commit('Commit of rev2a', rev_id='rev2a')

368

363

        return tree_a, tree_b, branch_c

369

364

 

374

369

            tree_d.branch.base, patch_type='diff',

375

370

            public_branch=tree_a.branch.base)

376

371

 

377

 

    def test_disk_name(self):

378

 

        tree_a, tree_b, branch_c = self.make_trees()

379

 

        tree_a.branch.nick = 'fancy <name>'

380

 

        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,

381

 

            tree_b.branch.base)

382

 

        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))

383

 

 

384

 

    def test_disk_name_old_revno(self):

385

 

        tree_a, tree_b, branch_c = self.make_trees()

386

 

        tree_a.branch.nick = 'fancy-name'

387

 

        md = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,

388

 

            tree_b.branch.base)

389

 

        self.assertEqual('fancy-name-1', md.get_disk_name(tree_a.branch))

390

 

 

391

372

    def test_generate_patch(self):

392

373

        tree_a, tree_b, branch_c = self.make_trees()

393

374

        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,

569

550

        revision = md.install_revisions(tree_b.branch.repository)

570

551

        self.assertEqual('rev2a', revision)

571

552

 

572

 

    def test_use_submit_for_missing_dependency(self):

573

 

        tree_a, tree_b, branch_c = self.make_trees()

574

 

        branch_c.pull(tree_a.branch)

575

 

        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])

576

 

        tree_a.commit('rev3a', rev_id='rev3a')

577

 

        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,

578

 

            branch_c.base, base_revision_id='rev2a')

579

 

        revision = md.install_revisions(tree_b.branch.repository)

580

 

 

581

 

    def test_handle_target_not_a_branch(self):

582

 

        tree_a, tree_b, branch_c = self.make_trees()

583

 

        branch_c.pull(tree_a.branch)

584

 

        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])

585

 

        tree_a.commit('rev3a', rev_id='rev3a')

586

 

        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,

587

 

            branch_c.base, base_revision_id='rev2a')

588

 

        md.target_branch = self.get_url('not-a-branch')

589

 

        self.assertRaises(errors.TargetNotBranch, md.install_revisions,

590

 

                tree_b.branch.repository)

591

 

 

592

553

 

593

554

class TestMergeDirective1Branch(tests.TestCaseWithTransport,

594

555

    TestMergeDirectiveBranch):

600

561

 

601

562

    def from_objects(self, repository, revision_id, time, timezone,

602

563

        target_branch, patch_type='bundle', local_target_branch=None,

603

 

        public_branch=None, message=None, base_revision_id=None):

604

 

        if base_revision_id is not None:

605

 

            raise tests.TestNotApplicable('This format does not support'

606

 

                                          ' explicit bases.')

607

 

        repository.lock_write()

608

 

        try:

609

 

            return merge_directive.MergeDirective.from_objects( repository,

610

 

                revision_id, time, timezone, target_branch, patch_type,

611

 

                local_target_branch, public_branch, message)

612

 

        finally:

613

 

            repository.unlock()

 

564

        public_branch=None, message=None):

 

565

        return merge_directive.MergeDirective.from_objects(

 

566

            repository, revision_id, time, timezone, target_branch,

 

567

            patch_type, local_target_branch, public_branch, message)

614

568

 

615

569

    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,

616

570

                 target_branch, patch=None, patch_type=None,

633

587

        public_branch=None, message=None, base_revision_id=None):

634

588

        include_patch = (patch_type in ('bundle', 'diff'))

635

589

        include_bundle = (patch_type == 'bundle')

636

 

        self.assertTrue(patch_type in ('bundle', 'diff', None))

 

590

        assert patch_type in ('bundle', 'diff', None)

637

591

        return merge_directive.MergeDirective2.from_objects(

638

592

            repository, revision_id, time, timezone, target_branch,

639

593

            include_patch, include_bundle, local_target_branch, public_branch,

673

627

        lines = md.to_lines()

674

628

        md2 = merge_directive.MergeDirective.from_lines(lines)

675

629

        md2._verify_patch(tree_a.branch.repository)

676

 

        # Strip trailing whitespace

 

630

        # Stript trailing whitespace

677

631

        md2.patch = md2.patch.replace(' \n', '\n')

678

632

        md2._verify_patch(tree_a.branch.repository)

679

633

        # Convert to Mac line-endings

680

 

        md2.patch = re.sub('(\r\n|\r|\n)', '\r', md2.patch)

 

634

        md2.patch = md2.patch.replace('\n', '\r')

681

635

        self.assertTrue(md2._verify_patch(tree_a.branch.repository))

682

636

        # Convert to DOS line-endings

683

 

        md2.patch = re.sub('(\r\n|\r|\n)', '\r\n', md2.patch)

 

637

        md2.patch = md2.patch.replace('\r', '\r\n')

684

638

        self.assertTrue(md2._verify_patch(tree_a.branch.repository))

685

639

        md2.patch = md2.patch.replace('content_c', 'content_d')

686

640

        self.assertFalse(md2._verify_patch(tree_a.branch.repository))

699

653

        self.assertEqual('booga', md.patch)

700

654

        self.assertEqual('diff', md.patch_type)

701

655

        self.assertEqual('Hi mom!', md.message)

702

 

 

703

 

 

704

 

class TestHook(object):

705

 

    """Hook callback for test purposes."""

706

 

 

707

 

    def __init__(self, result=None):

708

 

        self.calls = []

709

 

        self.result = result

710

 

 

711

 

    def __call__(self, params):

712

 

        self.calls.append(params)

713

 

        return self.result

714

 

 

715

 

 

716

 

class HookMailClient(mail_client.MailClient):

717

 

    """Mail client for testing hooks."""

718

 

 

719

 

    def __init__(self, config):

720

 

        self.body = None

721

 

        self.config = config

722

 

 

723

 

    def compose(self, prompt, to, subject, attachment, mime_subtype,

724

 

                extension, basename=None, body=None):

725

 

        self.body = body

726

 

 

727

 

 

728

 

class TestBodyHook(tests.TestCaseWithTransport):

729

 

 

730

 

    def compose_with_hooks(self, test_hooks, supports_body=True):

731

 

        client = HookMailClient({})

732

 

        client.supports_body = supports_body

733

 

        for test_hook in test_hooks:

734

 

            merge_directive.MergeDirective.hooks.install_named_hook(

735

 

                'merge_request_body', test_hook, 'test')

736

 

        tree = self.make_branch_and_tree('foo')

737

 

        tree.commit('foo')

738

 

        directive = merge_directive.MergeDirective2(

739

 

            tree.branch.last_revision(), 'sha', 0, 0, 'sha',

740

 

            source_branch=tree.branch.base,

741

 

            base_revision_id=tree.branch.last_revision(),

742

 

            message='This code rox')

743

 

        directive.compose_merge_request(client, 'jrandom@example.com',

744

 

            None, tree.branch)

745

 

        return client, directive

746

 

 

747

 

    def test_no_supports_body(self):

748

 

        test_hook = TestHook('foo')

749

 

        old_warn = trace.warning

750

 

        warnings = []

751

 

        def warn(*args):

752

 

            warnings.append(args)

753

 

        trace.warning = warn

754

 

        try:

755

 

            client, directive = self.compose_with_hooks([test_hook],

756

 

                supports_body=False)

757

 

        finally:

758

 

            trace.warning = old_warn

759

 

        self.assertEqual(0, len(test_hook.calls))

760

 

        self.assertEqual(('Cannot run merge_request_body hooks because mail'

761

 

                          ' client %s does not support message bodies.',

762

 

                          'HookMailClient'), warnings[0])

763

 

 

764

 

    def test_body_hook(self):

765

 

        test_hook = TestHook('foo')

766

 

        client, directive = self.compose_with_hooks([test_hook])

767

 

        self.assertEqual(1, len(test_hook.calls))

768

 

        self.assertEqual('foo', client.body)

769

 

        params = test_hook.calls[0]

770

 

        self.assertIsInstance(params,

771

 

                              merge_directive.MergeRequestBodyParams)

772

 

        self.assertIs(None, params.body)

773

 

        self.assertIs(None, params.orig_body)

774

 

        self.assertEqual('jrandom@example.com', params.to)

775

 

        self.assertEqual('[MERGE] This code rox', params.subject)

776

 

        self.assertEqual(directive, params.directive)

777

 

        self.assertEqual('foo-1', params.basename)

778

 

 

779

 

    def test_body_hook_chaining(self):

780

 

        test_hook1 = TestHook('foo')

781

 

        test_hook2 = TestHook('bar')

782

 

        client = self.compose_with_hooks([test_hook1, test_hook2])[0]

783

 

        self.assertEqual(None, test_hook1.calls[0].body)

784

 

        self.assertEqual(None, test_hook1.calls[0].orig_body)

785

 

        self.assertEqual('foo', test_hook2.calls[0].body)

786

 

        self.assertEqual(None, test_hook2.calls[0].orig_body)

787

 

        self.assertEqual('bar', client.body)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1