/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/smart/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:32:13 UTC
  • mfrom: (6637 work)
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530193213-qm21s6dc7dln237t
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/smart/repository.py
19
19
from __future__ import absolute_import
20
20
 
21
21
import bz2
 
22
import itertools
22
23
import os
23
24
try:
24
25
    import queue
126
127
                start_keys)
127
128
            while True:
128
129
                try:
129
 
                    next_revs = search.next()
 
130
                    next_revs = next(search)
130
131
                except StopIteration:
131
132
                    break
132
133
                search.stop_searching_any(exclude_keys.intersection(next_revs))
307
308
        else:
308
309
            search_ids = repository.all_revision_ids()
309
310
        search = graph._make_breadth_first_searcher(search_ids)
310
 
        transitive_ids = set()
311
 
        map(transitive_ids.update, list(search))
 
311
        transitive_ids = set(itertools.chain.from_iterable(search))
312
312
        parent_map = graph.get_parent_map(transitive_ids)
313
313
        revision_graph = _strip_NULL_ghosts(parent_map)
314
314
        if revision_id and revision_id not in revision_graph: