← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

Switch to PathsNotVersioned, accept extra_trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
345
345
    at least one tree.
346
346
    :return: a set of file ids for the specified filenames
347
347
    """
 
348
    not_versioned = []
348
349
    if not filenames:
349
350
        interesting_ids = None
350
351
    else:
356
357
                if file_id is not None:
357
358
                    interesting_ids.add(file_id)
358
359
                    not_found = False
359
 
            if not_found and require_versioned:
360
 
                raise errors.NotVersionedError(path=tree_path)
 
360
            if not_found:
 
361
                not_versioned.append(tree_path)
361
362
        
362
363
        pending = interesting_ids
363
364
        # now handle children of interesting ids
374
375
                            new_pending.add(child.file_id)
375
376
            interesting_ids.update(new_pending)
376
377
            pending = new_pending
 
378
        if len(not_versioned) > 0 and require_versioned:
 
379
            raise errors.PathsNotVersionedError(not_versioned)
377
380
    return interesting_ids