← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge from unique-root

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
897
897
        Skips the control directory.
898
898
        """
899
899
        inv = self._inventory
 
900
        if include_root is True:
 
901
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
900
902
        # Convert these into local objects to save lookup times
901
903
        pathjoin = osutils.pathjoin
902
904
        file_kind = osutils.file_kind
915
917
        # list and just reverse() them.
916
918
        children = collections.deque(children)
917
919
        stack = [(inv.root.file_id, u'', self.basedir, children)]
918
 
        if include_root:
919
 
            yield u'', 'V', 'directory', inv.root.file_id, inv.root
920
920
        while stack:
921
921
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
922
922