← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-04 18:51:39 UTC
  • mfrom: (2961.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
Authentication ring implementation (read-only)

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
 
 
98
95
    def _comparison_data(self, entry, path):
99
96
        """See Tree._comparison_data."""
100
97
        if entry is None:
290
287
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
291
288
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
292
289
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
 
290
                import pdb; pdb.set_trace()
293
291
                self._basis_tree = self.branch.repository.revision_tree(None)
294
292
            else:
295
293
                self._basis_tree = parents_list[0][1]