/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/status.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/status.py
334
334
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
335
335
                            branch.repository.get_parent_map(merge_extra))
336
336
        # Skip the first node
337
 
        num, first, depth, eom = rev_id_iterator.next()
 
337
        num, first, depth, eom = next(rev_id_iterator)
338
338
        if first != merge:
339
339
            raise AssertionError('Somehow we misunderstood how'
340
340
                ' iter_topo_order works %s != %s' % (first, merge))