/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/plugins/repodebug/missing_keys_for_stacking_fixer.py

Rename BzrCommandError to CommandError.

Merged from https://code.launchpad.net/~jelmer/brz/command-error/+merge/386136

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py
44
44
            bd = ControlDir.open(branch_url)
45
45
            b = bd.open_branch(ignore_fallbacks=True)
46
46
        except (errors.NotBranchError, errors.InvalidURL):
47
 
            raise errors.BzrCommandError(
 
47
            raise errors.CommandError(
48
48
                "Not a branch or invalid URL: %s" % branch_url)
49
49
        b.lock_read()
50
50
        try:
52
52
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
53
53
                errors.UnstackableBranchFormat):
54
54
            b.unlock()
55
 
            raise errors.BzrCommandError("Not stacked: %s" % branch_url)
 
55
            raise errors.CommandError("Not stacked: %s" % branch_url)
56
56
        raw_r = b.repository.controldir.open_repository()
57
57
        if dry_run:
58
58
            raw_r.lock_read()