← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1166
1166
                     t in self.revision_trees(required_trees))
1167
1167
        for revision in revisions:
1168
1168
            if not revision.parent_ids:
1169
 
                old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
 
1169
                old_tree = self.revision_tree(None)
1170
1170
            else:
1171
1171
                old_tree = trees[revision.parent_ids[0]]
1172
1172
            yield trees[revision.revision_id].changes_from(old_tree)
1658
1658
    def revision_tree(self, revision_id):
1659
1659
        """Return Tree for a revision on this branch.
1660
1660
 
1661
 
        `revision_id` may be NULL_REVISION for the empty tree revision.
 
1661
        `revision_id` may be None for the empty tree revision.
1662
1662
        """
1663
 
        revision_id = _mod_revision.ensure_null(revision_id)
1664
1663
        # TODO: refactor this to use an existing revision object
1665
1664
        # so we don't need to read it in twice.
1666
 
        if revision_id == _mod_revision.NULL_REVISION:
 
1665
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
1667
1666
            return RevisionTree(self, Inventory(root_id=None), 
1668
1667
                                _mod_revision.NULL_REVISION)
1669
1668
        else:
1960
1959
            present_parents.append(p_id)
1961
1960
            parent_trees[p_id] = repository.revision_tree(p_id)
1962
1961
        else:
1963
 
            parent_trees[p_id] = repository.revision_tree(
1964
 
                                     _mod_revision.NULL_REVISION)
 
1962
            parent_trees[p_id] = repository.revision_tree(None)
1965
1963
 
1966
1964
    inv = revision_tree.inventory
1967
1965
    entries = inv.iter_entries()