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

  • Committer: Martin
  • Date: 2017-06-04 18:09:30 UTC
  • mto: This revision was merged to the branch mainline in revision 6653.
  • Revision ID: gzlist@googlemail.com-20170604180930-zpcenvzu13lilaax
Apply 2to3 xrange fix and fix up with sixish range

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tree.py
1512
1512
                         for other in self._other_trees]
1513
1513
        other_entries = [self._step_one(walker) for walker in other_walkers]
1514
1514
        # Track extra nodes in the other trees
1515
 
        others_extra = [{} for i in xrange(len(self._other_trees))]
 
1515
        others_extra = [{} for _ in range(len(self._other_trees))]
1516
1516
 
1517
1517
        master_has_more = True
1518
1518
        step_one = self._step_one
1600
1600
                # the lookup_by_file_id will be removing anything processed
1601
1601
                # from the extras cache
1602
1602
                other_extra.pop(file_id)
1603
 
                other_values = [(None, None) for i in xrange(idx)]
 
1603
                other_values = [(None, None)] * idx
1604
1604
                other_values.append((other_path, other_ie))
1605
1605
                for alt_idx, alt_extra in enumerate(self._others_extra[idx+1:]):
1606
1606
                    alt_idx = alt_idx + idx + 1