~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

Merge from unique-root

Show diffs side-by-side

added added

removed removed

Lines of Context:
96
96
    def has_filename(self, filename):
97
97
        return bool(self.inventory.path2id(filename))
98
98
 
99
 
    def list_files(self, include_root=True):
 
99
    def list_files(self, include_root=False):
100
100
        # The only files returned by this are those from the version
101
101
        entries = self.inventory.iter_entries()
102
102
        # skip the root for compatability with the current apis.
103
 
        if self.inventory.root is None or not include_root:
 
103
        if self.inventory.root is not None and not include_root:
 
104
            # skip the root for compatability with the current apis.
104
105
            entries.next()
105
106
        for path, entry in entries:
106
107
            yield path, 'V', entry.kind, entry.file_id, entry