/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 breezy/option.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/option.py
17
17
# TODO: For things like --diff-prefix, we want a way to customize the display
18
18
# of the option argument.
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
import optparse
21
23
import re
22
24
 
130
132
        type_list = '\n'.join(lines)
131
133
        msg = "No known merge type %s. Supported types are:\n%s" %\
132
134
            (typestring, type_list)
133
 
        raise errors.CommandError(msg)
 
135
        raise errors.BzrCommandError(msg)
134
136
 
135
137
 
136
138
class Option(object):
455
457
        self.formatter = GettextIndentedHelpFormatter()
456
458
 
457
459
    def error(self, message):
458
 
        raise errors.CommandError(message)
 
460
        raise errors.BzrCommandError(message)
459
461
 
460
462
 
461
463
class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):