← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Aaron Bentley
  • Date: 2009-03-13 06:32:28 UTC
  • mto: This revision was merged to the branch mainline in revision 4196.
  • Revision ID: aaron@aaronbentley.com-20090313063228-d4zoyohklfyz1ia2
Get a dict of required parents.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
246
246
        missing_files = set()
247
247
        missing_parents = set()
248
248
        candidate_files = set()
249
 
        required_parents = set()
250
249
        basis = self.basis_tree()
251
250
        basis.lock_read()
252
251
        try:
280
279
                matches = rn.file_match(self, candidate_files)
281
280
            finally:
282
281
                task.finished()
283
 
            for path in matches:
284
 
                while True:
285
 
                    path = dirname(path)
286
 
                    if path in required_parents:
287
 
                        break
288
 
                    if self.path2id(path) is not None:
289
 
                        break
290
 
                    required_parents.add(path)
291
 
            self.add(required_parents)
 
282
            self.add(rn.get_required_parents(matches, self))
292
283
            self.unversion(matches.values())
293
284
            self.add(matches.keys(), matches.values())
294
285
        finally: