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

  • Committer: Jelmer Vernooij
  • Date: 2017-06-05 23:35:09 UTC
  • mfrom: (6658 work)
  • mto: (6653.3.3 bzrwt)
  • mto: This revision was merged to the branch mainline in revision 6667.
  • Revision ID: jelmer@jelmer.uk-20170605233509-30wo916k6meuggqf
Merge lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/remote.py
51
51
from .i18n import gettext
52
52
from .inventory import Inventory
53
53
from .lockable_files import LockableFiles
 
54
from .sixish import (
 
55
    viewitems,
 
56
    viewvalues,
 
57
    )
54
58
from .smart import client, vfs, repository as smart_repo
55
59
from .smart.client import _SmartClient
56
60
from .revision import NULL_REVISION
698
702
            raise errors.UnexpectedSmartServerResponse(response)
699
703
        body = bencode.bdecode(handler.read_body_bytes())
700
704
        ret = {}
701
 
        for (name, value) in body.iteritems():
 
705
        for name, value in viewitems(body):
702
706
            ret[name] = self._open_branch(name, value[0], value[1],
703
707
                possible_transports=possible_transports,
704
708
                ignore_fallbacks=ignore_fallbacks)
2088
2092
    def revision_ids_to_search_result(self, result_set):
2089
2093
        """Convert a set of revision ids to a graph SearchResult."""
2090
2094
        result_parents = set()
2091
 
        for parents in self.get_graph().get_parent_map(
2092
 
            result_set).itervalues():
 
2095
        for parents in viewvalues(self.get_graph().get_parent_map(result_set)):
2093
2096
            result_parents.update(parents)
2094
2097
        included_keys = result_set.intersection(result_parents)
2095
2098
        start_keys = result_set.difference(included_keys)
2214
2217
            for fallback in self._fallback_repositories:
2215
2218
                if not absent:
2216
2219
                    break
2217
 
                desired_files = [(key[0], key[1], identifier) for
2218
 
                    (identifier, key) in absent.iteritems()]
 
2220
                desired_files = [(key[0], key[1], identifier)
 
2221
                    for identifier, key in viewitems(absent)]
2219
2222
                for (identifier, bytes_iterator) in fallback.iter_files_bytes(desired_files):
2220
2223
                    del absent[identifier]
2221
2224
                    yield identifier, bytes_iterator
2222
2225
            if absent:
2223
2226
                # There may be more missing items, but raise an exception
2224
2227
                # for just one.
2225
 
                missing_identifier = absent.keys()[0]
 
2228
                missing_identifier = next(iter(absent))
2226
2229
                missing_key = absent[missing_identifier]
2227
2230
                raise errors.RevisionNotPresent(revision_id=missing_key[1],
2228
2231
                    file_id=missing_key[0])
2262
2265
            # There is one other "bug" which is that ghosts in
2263
2266
            # get_revision_graph() are not returned at all. But we won't worry
2264
2267
            # about that for now.
2265
 
            for node_id, parent_ids in rg.iteritems():
 
2268
            for node_id, parent_ids in viewitems(rg):
2266
2269
                if parent_ids == ():
2267
2270
                    rg[node_id] = (NULL_REVISION,)
2268
2271
            rg[NULL_REVISION] = ()