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

  • Committer: Jelmer Vernooij
  • Date: 2017-02-05 16:49:28 UTC
  • mto: (6621.2.1 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: jelmer@jelmer.uk-20170205164928-nmcybzip5kdhiwon
Use 2to3 set_literal fixer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
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
 
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)