/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

  • Committer: Jelmer Vernooij
  • Date: 2020-06-23 01:02:30 UTC
  • mfrom: (7490.40.27 work)
  • mto: This revision was merged to the branch mainline in revision 7517.
  • Revision ID: jelmer@jelmer.uk-20200623010230-62nnywznmb76h6ut
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

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