← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Robert Collins
  • Date: 2007-03-07 01:14:11 UTC
  • mfrom: (2321 +trunk)
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070307011411-0cmmc8atx67v3nv7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1006
1006
            from_dir = self._byid[from_dir]
1007
1007
 
1008
1008
        if specific_file_ids is not None:
 
1009
            # TODO: jam 20070302 This could really be done as a loop rather
 
1010
            #       than a bunch of recursive calls.
1009
1011
            parents = set()
 
1012
            byid = self._byid
1010
1013
            def add_ancestors(file_id):
1011
 
                if file_id not in self:
 
1014
                if file_id not in byid:
1012
1015
                    return
1013
 
                parent_id = self[file_id].parent_id
 
1016
                parent_id = byid[file_id].parent_id
1014
1017
                if parent_id is None:
1015
1018
                    return
1016
1019
                if parent_id not in parents: