/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

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

• reverse the comparison (4807 to 5200.4.5)
• stop comparing with revision 5200.4.5

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_commit.py

1

 

# Copyright (C) 2006-2010 Canonical Ltd

 

1

# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

107

107

                              'modified hello\.txt\n'

108

108

                              'Committed revision 2\.\n$')

109

109

 

110

 

    def test_warn_about_forgotten_commit_message(self):

111

 

        """Test that the lack of -m parameter is caught"""

112

 

        wt = self.make_branch_and_tree('.')

113

 

        self.build_tree(['one', 'two'])

114

 

        wt.add(['two'])

115

 

        out, err = self.run_bzr('commit -m one two')

116

 

        self.assertContainsRe(err, "The commit message is a file name")

117

 

 

118

110

    def test_verbose_commit_renamed(self):

119

111

        # Verbose commit of renamed file should say so

120

112

        wt = self.prepare_simple_history()

343

335

        trunk = self.make_branch_and_tree('trunk')

344

336

 

345

337

        u1 = trunk.branch.create_checkout('u1')

346

 

        self.build_tree_contents([('u1/hosts', 'initial contents\n')])

 

338

        self.build_tree_contents([('u1/hosts', 'initial contents')])

347

339

        u1.add('hosts')

348

340

        self.run_bzr('commit -m add-hosts u1')

349

341

 

350

342

        u2 = trunk.branch.create_checkout('u2')

351

 

        self.build_tree_contents([('u2/hosts', 'altered in u2\n')])

 

343

        self.build_tree_contents([('u2/hosts', 'altered in u2')])

352

344

        self.run_bzr('commit -m checkin-from-u2 u2')

353

345

 

354

346

        # make an offline commits

355

 

        self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])

 

347

        self.build_tree_contents([('u1/hosts', 'first offline change in u1')])

356

348

        self.run_bzr('commit -m checkin-offline --local u1')

357

349

 

358

350

        # now try to pull in online work from u2, and then commit our offline

359

351

        # work as a merge

360

352

        # retcode 1 as we expect a text conflict

361

353

        self.run_bzr('update u1', retcode=1)

362

 

        self.assertFileEqual('''\

363

 

<<<<<<< TREE

364

 

first offline change in u1

365

 

=======

366

 

altered in u2

367

 

>>>>>>> MERGE-SOURCE

368

 

''',

369

 

                             'u1/hosts')

370

 

 

371

354

        self.run_bzr('resolved u1/hosts')

372

355

        # add a text change here to represent resolving the merge conflicts in

373

356

        # favour of a new version of the file not identical to either the u1

625

608

        properties = last_rev.properties

626

609

        self.assertEqual('John Doe\nJane Rey', properties['authors'])

627

610

 

628

 

    def test_commit_time(self):

629

 

        tree = self.make_branch_and_tree('tree')

630

 

        self.build_tree(['tree/hello.txt'])

631

 

        tree.add('hello.txt')

632

 

        out, err = self.run_bzr("commit -m hello "

633

 

            "--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")

634

 

        last_rev = tree.branch.repository.get_revision(tree.last_revision())

635

 

        self.assertEqual(

636

 

            'Sat 2009-10-10 08:00:00 +0100',

637

 

            osutils.format_date(last_rev.timestamp, last_rev.timezone))

638

 

        

639

 

    def test_commit_time_bad_time(self):

640

 

        tree = self.make_branch_and_tree('tree')

641

 

        self.build_tree(['tree/hello.txt'])

642

 

        tree.add('hello.txt')

643

 

        out, err = self.run_bzr("commit -m hello "

644

 

            "--commit-time='NOT A TIME' tree/hello.txt", retcode=3)

645

 

        self.assertStartsWith(

646

 

            err, "bzr: ERROR: Could not parse --commit-time:")

647

 

 

648

611

    def test_partial_commit_with_renames_in_tree(self):

649

612

        # this test illustrates bug #140419

650

613

        t = self.make_branch_and_tree('.')

675

638

        self.assertContainsRe(err,

676

639

            r'^bzr: ERROR: Cannot lock.*readonly transport')

677

640

 

678

 

    def setup_editor(self):

 

641

    def test_commit_hook_template(self):

679

642

        # Test that commit template hooks work

 

643

        def restoreDefaults():

 

644

            msgeditor.hooks['commit_message_template'] = []

 

645

            osutils.set_or_unset_env('BZR_EDITOR', default_editor)

680

646

        if sys.platform == "win32":

681

647

            f = file('fed.bat', 'w')

682

648

            f.write('@rem dummy fed')

683

649

            f.close()

684

 

            osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")

 

650

            default_editor = osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")

685

651

        else:

686

652

            f = file('fed.sh', 'wb')

687

653

            f.write('#!/bin/sh\n')

688

654

            f.close()

689

655

            os.chmod('fed.sh', 0755)

690

 

            osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")

691

 

 

692

 

    def setup_commit_with_template(self):

693

 

        self.setup_editor()

 

656

            default_editor = osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")

 

657

        self.addCleanup(restoreDefaults)

694

658

        msgeditor.hooks.install_named_hook("commit_message_template",

695

659

                lambda commit_obj, msg: "save me some typing\n", None)

696

660

        tree = self.make_branch_and_tree('tree')

697

661

        self.build_tree(['tree/hello.txt'])

698

662

        tree.add('hello.txt')

699

 

        return tree

700

 

 

701

 

    def test_commit_hook_template_accepted(self):

702

 

        tree = self.setup_commit_with_template()

703

 

        out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")

 

663

        out, err = self.run_bzr("commit tree/hello.txt")

704

664

        last_rev = tree.branch.repository.get_revision(tree.last_revision())

705

665

        self.assertEqual('save me some typing\n', last_rev.message)

706

 

 

707

 

    def test_commit_hook_template_rejected(self):

708

 

        tree = self.setup_commit_with_template()

709

 

        expected = tree.last_revision()

710

 

        out, err = self.run_bzr_error(["empty commit message"],

711

 

            "commit tree/hello.txt", stdin="n\n")

712

 

        self.assertEqual(expected, tree.last_revision())

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0