← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Martin Pool
  • Date: 2008-06-11 02:36:40 UTC
  • mfrom: (3490 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3492.
  • Revision ID: mbp@sourcefrog.net-20080611023640-db0lqd75yueksdw7
Merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
528
528
        return False
529
529
 
530
530
    def kind(self, file_id):
531
 
        assert self._inventory[file_id].kind == "directory"
532
531
        return "directory"
533
532
 
534
533
    def list_files(self, include_root=False):
577
576
        # what happened to the file that used to have
578
577
        # this name.  There are two possibilities: either it was
579
578
        # deleted entirely, or renamed.
580
 
        assert old_id
581
579
        if new_inv.has_id(old_id):
582
580
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
583
581
        else:
904
902
            # the parent's path is necessarily known at this point.
905
903
            yield(file_id, (path, to_path), changed_content, versioned, parent,
906
904
                  name, kind, executable)
907
 
 
908
 
 
909
 
# This was deprecated before 0.12, but did not have an official warning
910
 
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
911
 
def RevisionTree(*args, **kwargs):
912
 
    """RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
913
 
 
914
 
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
915
 
    bzr 0.12.
916
 
    """
917
 
    from bzrlib.revisiontree import RevisionTree as _RevisionTree
918
 
    return _RevisionTree(*args, **kwargs)
919
 
 
920