/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/bisect.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/bisect.py
20
20
from .controldir import ControlDir
21
21
from . import revision as _mod_revision
22
22
from .commands import Command
23
 
from .errors import BzrCommandError
 
23
from .errors import CommandError
24
24
from .option import Option
25
25
from .trace import note
26
26
 
315
315
    def _check(self, controldir):
316
316
        """Check preconditions for most operations to work."""
317
317
        if not controldir.control_transport.has(BISECT_INFO_PATH):
318
 
            raise BzrCommandError("No bisection in progress.")
 
318
            raise CommandError("No bisection in progress.")
319
319
 
320
320
    def _set_state(self, controldir, revspec, state):
321
321
        """Set the state of the given revspec and bisecting.
345
345
        elif subcommand in ('replay', ) and args_list and len(args_list) == 1:
346
346
            log_fn = args_list[0]
347
347
        elif subcommand in ('move', ) and not revision:
348
 
            raise BzrCommandError(
 
348
            raise CommandError(
349
349
                "The 'bisect move' command requires a revision.")
350
350
        elif subcommand in ('run', ):
351
351
            run_script = args_list[0]
352
352
        elif args_list or revision:
353
 
            raise BzrCommandError(
 
353
            raise CommandError(
354
354
                "Improper arguments to bisect " + subcommand)
355
355
 
356
356
        controldir, _ = ControlDir.open_containing(directory)
373
373
        elif subcommand == "run":
374
374
            self.run_bisect(controldir, run_script)
375
375
        else:
376
 
            raise BzrCommandError(
 
376
            raise CommandError(
377
377
                "Unknown bisect command: " + subcommand)
378
378
 
379
379
    def reset(self, controldir):