← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
29
29
    osutils,
30
30
    ignores,
31
31
    msgeditor,
 
32
    tests,
32
33
    )
33
34
from bzrlib.bzrdir import BzrDir
34
35
from bzrlib.tests import (
 
36
    probe_bad_non_ascii,
35
37
    test_foreign,
36
 
    features,
 
38
    TestSkipped,
 
39
    UnicodeFilenameFeature,
37
40
    )
38
41
from bzrlib.tests import TestCaseWithTransport
39
42
 
135
138
    def test_unicode_commit_message_is_filename(self):
136
139
        """Unicode commit message same as a filename (Bug #563646).
137
140
        """
138
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
141
        self.requireFeature(UnicodeFilenameFeature)
139
142
        file_name = u'\N{euro sign}'
140
143
        self.run_bzr(['init'])
141
144
        open(file_name, 'w').write('hello world')
329
332
        tree = self.make_branch_and_tree('.')
330
333
        self.build_tree_contents([('foo.c', 'int main() {}')])
331
334
        tree.add('foo.c')
332
 
        self.run_bzr('commit -m ""')
 
335
        self.run_bzr('commit -m ""', retcode=3)
333
336
 
334
337
    def test_other_branch_commit(self):
335
338
        # this branch is to ensure consistent behaviour, whether we're run
596
599
            'commit -m add-b --fixes=xxx:123',
597
600
            working_dir='tree')
598
601
 
599
 
    def test_fixes_bug_with_default_tracker(self):
600
 
        """commit --fixes=234 uses the default bug tracker."""
601
 
        tree = self.make_branch_and_tree('tree')
602
 
        self.build_tree(['tree/hello.txt'])
603
 
        tree.add('hello.txt')
604
 
        self.run_bzr_error(
605
 
            ["bzr: ERROR: No tracker specified for bug 123. Use the form "
606
 
            "'tracker:id' or specify a default bug tracker using the "
607
 
            "`bugtracker` option.\n"
608
 
            "See \"bzr help bugs\" for more information on this feature. "
609
 
            "Commit refused."],
610
 
            'commit -m add-b --fixes=123',
611
 
            working_dir='tree')
612
 
        tree.branch.get_config().set_user_option("bugtracker", "lp")
613
 
        self.run_bzr('commit -m hello --fixes=234 tree/hello.txt')
614
 
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
615
 
        self.assertEqual('https://launchpad.net/bugs/234 fixed',
616
 
                         last_rev.properties['bugs'])
617
 
 
618
602
    def test_fixes_invalid_bug_number(self):
619
603
        tree = self.make_branch_and_tree('tree')
620
604
        self.build_tree(['tree/hello.txt'])
632
616
        self.build_tree(['tree/hello.txt'])
633
617
        tree.add('hello.txt')
634
618
        self.run_bzr_error(
635
 
            [r"Invalid bug orange:apples:bananas. Must be in the form of "
636
 
             r"'tracker:id'\. See \"bzr help bugs\" for more information on "
637
 
             r"this feature.\nCommit refused\."],
638
 
            'commit -m add-b --fixes=orange:apples:bananas',
 
619
            [r"Invalid bug orange. Must be in the form of 'tracker:id'\. "
 
620
             r"See \"bzr help bugs\" for more information on this feature.\n"
 
621
             r"Commit refused\."],
 
622
            'commit -m add-b --fixes=orange',
639
623
            working_dir='tree')
640
624
 
641
625
    def test_no_author(self):
757
741
        tree.add('hello.txt')
758
742
        return tree
759
743
 
760
 
    def test_edit_empty_message(self):
761
 
        tree = self.make_branch_and_tree('tree')
762
 
        self.setup_editor()
763
 
        self.build_tree(['tree/hello.txt'])
764
 
        tree.add('hello.txt')
765
 
        out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
766
 
            stdin="y\n")
767
 
        self.assertContainsRe(err,
768
 
            "bzr: ERROR: Empty commit message specified")
769
 
 
770
744
    def test_commit_hook_template_accepted(self):
771
745
        tree = self.setup_commit_with_template()
772
746
        out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
776
750
    def test_commit_hook_template_rejected(self):
777
751
        tree = self.setup_commit_with_template()
778
752
        expected = tree.last_revision()
779
 
        out, err = self.run_bzr_error(["Empty commit message specified."
780
 
                  " Please specify a commit message with either"
781
 
                  " --message or --file or leave a blank message"
782
 
                  " with --message \"\"."],
 
753
        out, err = self.run_bzr_error(["empty commit message"],
783
754
            "commit tree/hello.txt", stdin="n\n")
784
755
        self.assertEqual(expected, tree.last_revision())
785
756
 
786
 
    def test_set_commit_message(self):
787
 
        msgeditor.hooks.install_named_hook("set_commit_message",
788
 
                lambda commit_obj, msg: "save me some typing\n", None)
789
 
        tree = self.make_branch_and_tree('tree')
790
 
        self.build_tree(['tree/hello.txt'])
791
 
        tree.add('hello.txt')
792
 
        out, err = self.run_bzr("commit tree/hello.txt")
793
 
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
794
 
        self.assertEqual('save me some typing\n', last_rev.message)
795
 
 
796
757
    def test_commit_without_username(self):
797
758
        """Ensure commit error if username is not set.
798
759
        """
821
782
        self.assertEqual(out, '')
822
783
        self.assertContainsRe(err,
823
784
            'Branch.*test_checkout.*appears to be bound to itself')
 
785