/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2008-12-03 04:23:21 UTC
  • mfrom: (3878 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3892.
  • Revision ID: aaron@aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# Authors:
4
4
#   Johan Rydberg <jrydberg@gnu.org>
30
30
 
31
31
from bzrlib import (
32
32
    errors,
 
33
    index,
33
34
    osutils,
34
35
    multiparent,
35
36
    tsort,
846
847
        """
847
848
        raise NotImplementedError(self.get_sha1s)
848
849
 
 
850
    has_key = index._has_key_from_parent_map
 
851
 
849
852
    def insert_record_stream(self, stream):
850
853
        """Insert a record stream into this container.
851
854
 
922
925
                parent_lines, left_parent_blocks))
923
926
        return diffs
924
927
 
 
928
    missing_keys = index._missing_keys_from_parent_map
 
929
 
925
930
    def _extract_blocks(self, version_id, source, target):
926
931
        return None
927
932