~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-10 09:38:09 UTC
mfrom: (6015.14.1 bzr24-filter-809901)
mto: (6015.24.1 2.4) (6060.2.1 trunk) (6069.1.1 trunk) (6089.1.1 trunk) (6090.1.1 trunk) (6092.1.1 810701-lang-not-set) (6093.1.1 trunk) (6104.1.1 2.5-get_cached_parent_map-388269) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6206.1.1 2.5-client-reconnect-819604) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev) (6082.5.1 expand-in-stack)
mto: This revision was merged to the branch mainline in revision 6066.
Revision ID: pqm@pqm.ubuntu.com-20110810093809-perfac4es3i9goy3

(jameinel) Use a set during Inventory.filter() to handle when a file is
referenced multiple times. (bug #809901) (Bastian)

files modified:
bzrlib/inventory.py

bzrlib/tests/test_inv.py

doc/en/release-notes/bzr-2.4.txt

Show diffs side-by-side

added added

removed removed

bzrlib/inventory.py

1490

if entry.kind == 'directory':

1491

directories_to_expand.add(entry.file_id)

1492

interesting.add(entry.parent_id)

1493

children_of_parent_id.setdefault(entry.parent_id, []

1494

).append(entry.file_id)

1493

children_of_parent_id.setdefault(entry.parent_id, set()

1494

).add(entry.file_id)

1495

1496

# Now, interesting has all of the direct parents, but not the

1497

# parents of those parents. It also may have some duplicates with

1505

next_parents = set()

1506

for entry in self._getitems(remaining_parents):

1507

next_parents.add(entry.parent_id)

1508

children_of_parent_id.setdefault(entry.parent_id, []

1509

).append(entry.file_id)

1508

children_of_parent_id.setdefault(entry.parent_id, set()

1509

).add(entry.file_id)

1510

# Remove any search tips we've already processed

1511

remaining_parents = next_parents.difference(interesting)

1512

interesting.update(remaining_parents)

1525

for entry in self._getitems(next_file_ids):

1526

if entry.kind == 'directory':

1527

directories_to_expand.add(entry.file_id)

1528

children_of_parent_id.setdefault(entry.parent_id, []

1529

).append(entry.file_id)

1528

children_of_parent_id.setdefault(entry.parent_id, set()

1529

).add(entry.file_id)

1530

return interesting, children_of_parent_id

1531

1532

def filter(self, specific_fileids):

Older »