/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/workingtree.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/workingtree.py
1590
1590
        inventory_iterator = self._walkdirs(prefix)
1591
1591
        disk_iterator = osutils.walkdirs(disk_top, prefix)
1592
1592
        try:
1593
 
            current_disk = disk_iterator.next()
 
1593
            current_disk = next(disk_iterator)
1594
1594
            disk_finished = False
1595
1595
        except OSError as e:
1596
1596
            if not (e.errno == errno.ENOENT or
1599
1599
            current_disk = None
1600
1600
            disk_finished = True
1601
1601
        try:
1602
 
            current_inv = inventory_iterator.next()
 
1602
            current_inv = next(inventory_iterator)
1603
1603
            inv_finished = False
1604
1604
        except StopIteration:
1605
1605
            current_inv = None
1640
1640
                    cur_disk_dir_content]
1641
1641
                yield (cur_disk_dir_relpath, None), dirblock
1642
1642
                try:
1643
 
                    current_disk = disk_iterator.next()
 
1643
                    current_disk = next(disk_iterator)
1644
1644
                except StopIteration:
1645
1645
                    disk_finished = True
1646
1646
            elif direction < 0:
1650
1650
                    current_inv[1]]
1651
1651
                yield (current_inv[0][0], current_inv[0][1]), dirblock
1652
1652
                try:
1653
 
                    current_inv = inventory_iterator.next()
 
1653
                    current_inv = next(inventory_iterator)
1654
1654
                except StopIteration:
1655
1655
                    inv_finished = True
1656
1656
            else:
1682
1682
                        raise NotImplementedError('unreachable code')
1683
1683
                yield current_inv[0], dirblock
1684
1684
                try:
1685
 
                    current_inv = inventory_iterator.next()
 
1685
                    current_inv = next(inventory_iterator)
1686
1686
                except StopIteration:
1687
1687
                    inv_finished = True
1688
1688
                try:
1689
 
                    current_disk = disk_iterator.next()
 
1689
                    current_disk = next(disk_iterator)
1690
1690
                except StopIteration:
1691
1691
                    disk_finished = True
1692
1692
 
2069
2069
            return _mod_conflicts.ConflictList()
2070
2070
        try:
2071
2071
            try:
2072
 
                if confile.next() != CONFLICT_HEADER_1 + '\n':
 
2072
                if next(confile) != CONFLICT_HEADER_1 + '\n':
2073
2073
                    raise errors.ConflictFormatError()
2074
2074
            except StopIteration:
2075
2075
                raise errors.ConflictFormatError()
2366
2366
        try:
2367
2367
            merge_hashes = {}
2368
2368
            try:
2369
 
                if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
 
2369
                if next(hashfile) != MERGE_MODIFIED_HEADER_1 + '\n':
2370
2370
                    raise errors.MergeModifiedFormatError()
2371
2371
            except StopIteration:
2372
2372
                raise errors.MergeModifiedFormatError()