/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/errors.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/errors.py
271
271
            'E.g. brz whoami "Your Name <name@example.com>"')
272
272
 
273
273
 
274
 
class BzrCommandError(BzrError):
 
274
class CommandError(BzrError):
275
275
    """Error from user command"""
276
276
 
277
277
    # Error from malformed user command; please avoid raising this as a
279
279
    #
280
280
    # I think it's a waste of effort to differentiate between errors that
281
281
    # are not intended to be caught anyway.  UI code need not subclass
282
 
    # BzrCommandError, and non-UI code should not throw a subclass of
283
 
    # BzrCommandError.  ADHB 20051211
 
282
    # CommandError, and non-UI code should not throw a subclass of
 
283
    # CommandError.  ADHB 20051211
 
284
 
 
285
 
 
286
# Provide the old name as backup, for the moment.
 
287
BzrCommandError = CommandError
284
288
 
285
289
 
286
290
class NotWriteLocked(BzrError):
2379
2383
        self.format = format
2380
2384
 
2381
2385
 
2382
 
class ChangesAlreadyStored(BzrCommandError):
 
2386
class ChangesAlreadyStored(CommandError):
2383
2387
 
2384
2388
    _fmt = ('Cannot store uncommitted changes because this branch already'
2385
2389
            ' stores uncommitted changes.')