~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Martin Pool
  • Date: 2006-11-02 10:20:19 UTC
  • mfrom: (2114 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2119.
  • Revision ID: mbp@sourcefrog.net-20061102102019-9a5a02f485dff6f6
merge bzr.dev and reconcile several changes, also some test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
        self._repository = branch
41
41
        self._weave_store = branch.weave_store
42
42
        self._inventory = inv
43
 
        assert inv.root is not None
44
43
        self._revision_id = revision_id
45
44
 
46
45
    def get_parent_ids(self):
100
99
    def list_files(self, include_root=False):
101
100
        # The only files returned by this are those from the version
102
101
        entries = self.inventory.iter_entries()
103
 
        if not include_root:
 
102
        # skip the root for compatability with the current apis.
 
103
        if self.inventory.root is not None and not include_root:
104
104
            # skip the root for compatability with the current apis.
105
105
            entries.next()
106
106
        for path, entry in entries: