/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: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py
44
44
            b = bd.open_branch(ignore_fallbacks=True)
45
45
        except (errors.NotBranchError, errors.InvalidURL):
46
46
            raise errors.BzrCommandError(
47
 
                    "Not a branch or invalid URL: %s" % branch_url)
 
47
                "Not a branch or invalid URL: %s" % branch_url)
48
48
        b.lock_read()
49
49
        try:
50
50
            url = b.get_stacked_on_url()
51
51
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
52
 
            errors.UnstackableBranchFormat):
 
52
                errors.UnstackableBranchFormat):
53
53
            b.unlock()
54
54
            raise errors.BzrCommandError("Not stacked: %s" % branch_url)
55
55
        raw_r = b.repository.controldir.open_repository()
76
76
                return
77
77
            assert raw_r._format.network_name() == b.repository._format.network_name()
78
78
            stream = b.repository.inventories.get_record_stream(
79
 
                    needed, 'topological', True)
 
79
                needed, 'topological', True)
80
80
            raw_r.start_write_group()
81
81
            try:
82
82
                raw_r.inventories.insert_record_stream(stream)