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

  • Committer: Martin
  • Date: 2017-05-25 01:35:55 UTC
  • mto: This revision was merged to the branch mainline in revision 6637.
  • Revision ID: gzlist@googlemail.com-20170525013555-lepzczdnzb9r272j
Apply 2to3 next fixer and make compatible

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree_4.py
1288
1288
                ids_to_unversion.remove(entry[0][2])
1289
1289
            block_index += 1
1290
1290
        if ids_to_unversion:
1291
 
            raise errors.NoSuchId(self, iter(ids_to_unversion).next())
 
1291
            raise errors.NoSuchId(self, next(iter(ids_to_unversion)))
1292
1292
        self._make_dirty(reset_inventory=False)
1293
1293
        # have to change the legacy inventory too.
1294
1294
        if self._inventory is not None:
2014
2014
        # FIXME: Support nested trees
2015
2015
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
2016
2016
        if inv.root is not None and not include_root and from_dir is None:
2017
 
            entries.next()
 
2017
            next(entries)
2018
2018
        for path, entry in entries:
2019
2019
            yield path, 'V', entry.kind, entry.file_id, entry
2020
2020