← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Gordon Tyler
  • Date: 2011-06-30 21:00:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6007.
  • Revision ID: gordon@doxxx.net-20110630210038-bzscps46jgcqtkr0
https://launchpad.net/bugs/784505
Use known executables for win32 and other platforms in test_exe_on_path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1490
1490
            if entry.kind == 'directory':
1491
1491
                directories_to_expand.add(entry.file_id)
1492
1492
            interesting.add(entry.parent_id)
1493
 
            children_of_parent_id.setdefault(entry.parent_id, set()
1494
 
                                             ).add(entry.file_id)
 
1493
            children_of_parent_id.setdefault(entry.parent_id, []
 
1494
                                             ).append(entry.file_id)
1495
1495
 
1496
1496
        # Now, interesting has all of the direct parents, but not the
1497
1497
        # parents of those parents. It also may have some duplicates with
1505
1505
            next_parents = set()
1506
1506
            for entry in self._getitems(remaining_parents):
1507
1507
                next_parents.add(entry.parent_id)
1508
 
                children_of_parent_id.setdefault(entry.parent_id, set()
1509
 
                                                 ).add(entry.file_id)
 
1508
                children_of_parent_id.setdefault(entry.parent_id, []
 
1509
                                                 ).append(entry.file_id)
1510
1510
            # Remove any search tips we've already processed
1511
1511
            remaining_parents = next_parents.difference(interesting)
1512
1512
            interesting.update(remaining_parents)
1525
1525
            for entry in self._getitems(next_file_ids):
1526
1526
                if entry.kind == 'directory':
1527
1527
                    directories_to_expand.add(entry.file_id)
1528
 
                children_of_parent_id.setdefault(entry.parent_id, set()
1529
 
                                                 ).add(entry.file_id)
 
1528
                children_of_parent_id.setdefault(entry.parent_id, []
 
1529
                                                 ).append(entry.file_id)
1530
1530
        return interesting, children_of_parent_id
1531
1531
 
1532
1532
    def filter(self, specific_fileids):