/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2009-03-12 02:43:02 UTC
  • mfrom: (4121 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4140.
  • Revision ID: mbp@sourcefrog.net-20090312024302-aynicfx1ywm0k9dl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2683
2683
                    help="Refuse to commit if there are unknown "
2684
2684
                    "files in the working tree."),
2685
2685
             ListOption('fixes', type=str,
2686
 
                    help="Mark a bug as being fixed by this revision."),
 
2686
                    help="Mark a bug as being fixed by this revision "
 
2687
                         "(see \"bzr help bugs\")."),
2687
2688
             ListOption('author', type=unicode,
2688
2689
                    help="Set the author's name, if it's different "
2689
2690
                         "from the committer."),
2706
2707
            tokens = fixed_bug.split(':')
2707
2708
            if len(tokens) != 2:
2708
2709
                raise errors.BzrCommandError(
2709
 
                    "Invalid bug %s. Must be in the form of 'tag:id'. "
2710
 
                    "Commit refused." % fixed_bug)
 
2710
                    "Invalid bug %s. Must be in the form of 'tracker:id'. "
 
2711
                    "See \"bzr help bugs\" for more information on this "
 
2712
                    "feature.\nCommit refused." % fixed_bug)
2711
2713
            tag, bug_id = tokens
2712
2714
            try:
2713
2715
                bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2714
2716
            except errors.UnknownBugTrackerAbbreviation:
2715
2717
                raise errors.BzrCommandError(
2716
2718
                    'Unrecognized bug %s. Commit refused.' % fixed_bug)
2717
 
            except errors.MalformedBugIdentifier:
 
2719
            except errors.MalformedBugIdentifier, e:
2718
2720
                raise errors.BzrCommandError(
2719
 
                    "Invalid bug identifier for %s. Commit refused."
2720
 
                    % fixed_bug)
 
2721
                    "%s\nCommit refused." % (str(e),))
2721
2722
            properties.append('%s fixed' % bug_url)
2722
2723
        return '\n'.join(properties)
2723
2724