← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.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/memorytree.py
92
92
        stream = self._file_transport.get(path)
93
93
        return sha_file(stream)
94
94
 
 
95
    def get_root_id(self):
 
96
        return self.path2id('')
 
97
 
95
98
    def _comparison_data(self, entry, path):
96
99
        """See Tree._comparison_data."""
97
100
        if entry is None:
287
290
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
288
291
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
289
292
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
290
 
                import pdb; pdb.set_trace()
291
293
                self._basis_tree = self.branch.repository.revision_tree(None)
292
294
            else:
293
295
                self._basis_tree = parents_list[0][1]