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

  • Committer: Breezy landing bot
  • Author(s): Martin
  • Date: 2017-05-26 09:35:13 UTC
  • mfrom: (6634.2.2 next_up_next)
  • Revision ID: breezy.the.bot@gmail.com-20170526093513-funr1gww70uc4mag
Make iterator objects and use of next Python 3 compatible

Merged from https://code.launchpad.net/~gz/brz/next_up_next/+merge/324586

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/annotate.py
367
367
                else:
368
368
                    heads = heads_provider.heads((left[0], right[0]))
369
369
                    if len(heads) == 1:
370
 
                        output_append((iter(heads).next(), left[1]))
 
370
                        output_append((next(iter(heads)), left[1]))
371
371
                    else:
372
372
                        # Both claim different origins, get a stable result.
373
373
                        # If the result is not stable, there is a risk a