/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/vf_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/vf_repository.py
19
19
from __future__ import absolute_import
20
20
 
21
21
 
22
 
from breezy.lazy_import import lazy_import
 
22
from .lazy_import import lazy_import
23
23
lazy_import(globals(), """
24
24
import itertools
25
25
 
50
50
from breezy.i18n import gettext
51
51
""")
52
52
 
53
 
from breezy import (
 
53
from . import (
54
54
    errors,
55
55
    )
56
 
from breezy.decorators import (
 
56
from .decorators import (
57
57
    needs_read_lock,
58
58
    needs_write_lock,
59
59
    only_raises,
60
60
    )
61
 
from breezy.inventory import (
 
61
from .inventory import (
62
62
    Inventory,
63
63
    InventoryDirectory,
64
64
    ROOT_ID,
65
65
    entry_factory,
66
66
    )
67
67
 
68
 
from breezy.repository import (
 
68
from .repository import (
69
69
    CommitBuilder,
70
70
    InterRepository,
71
71
    MetaDirRepository,
74
74
    RepositoryFormat,
75
75
    )
76
76
 
77
 
from breezy.trace import (
 
77
from .trace import (
78
78
    mutter
79
79
    )
80
80
 
168
168
        # inventories for the parents.
169
169
        parent_keys = [(p,) for p in self.parents]
170
170
        parent_map = self.repository.inventories._index.get_parent_map(parent_keys)
171
 
        missing_parent_keys = set([pk for pk in parent_keys
172
 
                                       if pk not in parent_map])
 
171
        missing_parent_keys = {pk for pk in parent_keys
 
172
                                       if pk not in parent_map}
173
173
        fallback_repos = list(reversed(self.repository._fallback_repositories))
174
174
        missing_keys = [('inventories', pk[0])
175
175
                        for pk in missing_parent_keys]
1718
1718
        #      missing sigs. Consider removing this work entirely
1719
1719
        revisions_with_signatures = set(self.signatures.get_parent_map(
1720
1720
            [(r,) for r in revision_ids]))
1721
 
        revisions_with_signatures = set(
1722
 
            [r for (r,) in revisions_with_signatures])
 
1721
        revisions_with_signatures = {r for (r,) in revisions_with_signatures}
1723
1722
        revisions_with_signatures.intersection_update(revision_ids)
1724
1723
        yield ("signatures", None, revisions_with_signatures)
1725
1724
 
2175
2174
            try:
2176
2175
                parse_result = deserialiser.parse_text_bytes(
2177
2176
                    inventory_delta_bytes)
2178
 
            except inventory_delta.IncompatibleInventoryDelta, err:
 
2177
            except inventory_delta.IncompatibleInventoryDelta as err:
2179
2178
                mutter("Incompatible delta: %s", err.msg)
2180
2179
                raise errors.IncompatibleRevision(self.target_repo._format)
2181
2180
            basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
2439
2438
        inventories = self.from_repository.iter_inventories(
2440
2439
            revision_ids, 'topological')
2441
2440
        format = from_repo._format
2442
 
        invs_sent_so_far = set([_mod_revision.NULL_REVISION])
 
2441
        invs_sent_so_far = {_mod_revision.NULL_REVISION}
2443
2442
        inventory_cache = lru_cache.LRUCache(50)
2444
2443
        null_inventory = from_repo.revision_tree(
2445
2444
            _mod_revision.NULL_REVISION).root_inventory
2529
2528
    def _check_file_version_parents(self, texts, progress_bar):
2530
2529
        """See check_file_version_parents."""
2531
2530
        wrong_parents = {}
2532
 
        self.file_ids = set([file_id for file_id, _ in
2533
 
            self.text_index.iterkeys()])
 
2531
        self.file_ids = {file_id for file_id, _ in
 
2532
            self.text_index.iterkeys()}
2534
2533
        # text keys is now grouped by file_id
2535
2534
        n_versions = len(self.text_index)
2536
2535
        progress_bar.update(gettext('loading text store'), 0, n_versions)