/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/option.py
130
130
        type_list = '\n'.join(lines)
131
131
        msg = "No known merge type %s. Supported types are:\n%s" %\
132
132
            (typestring, type_list)
133
 
        raise errors.BzrCommandError(msg)
 
133
        raise errors.CommandError(msg)
134
134
 
135
135
 
136
136
class Option(object):
455
455
        self.formatter = GettextIndentedHelpFormatter()
456
456
 
457
457
    def error(self, message):
458
 
        raise errors.BzrCommandError(message)
 
458
        raise errors.CommandError(message)
459
459
 
460
460
 
461
461
class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):