/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/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/repository.py
912
912
            not part of revision_ids themselves
913
913
        """
914
914
        parent_map = self.get_parent_map(revision_ids)
915
 
        parent_ids = set()
916
 
        map(parent_ids.update, parent_map.itervalues())
 
915
        parent_ids = set(itertools.chain.from_iterable(
 
916
            parent_map.itervalues()))
917
917
        parent_ids.difference_update(revision_ids)
918
918
        parent_ids.discard(_mod_revision.NULL_REVISION)
919
919
        return parent_ids
1773
1773
        (_mod_revision.NULL_REVISION,))
1774
1774
    try:
1775
1775
        # skip the last revision in the list
1776
 
        iterator.next()
 
1776
        next(iterator)
1777
1777
        while True:
1778
1778
            if (stop_index is not None and
1779
1779
                len(partial_history_cache) > stop_index):
1780
1780
                break
1781
1781
            if partial_history_cache[-1] == stop_revision:
1782
1782
                break
1783
 
            revision_id = iterator.next()
 
1783
            revision_id = next(iterator)
1784
1784
            partial_history_cache.append(revision_id)
1785
1785
    except StopIteration:
1786
1786
        # No more history