/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/repository.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-02 06:40:58 UTC
  • mfrom: (2666 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2668.
  • Revision ID: andrew.bennetts@canonical.com-20070802064058-09eblz1qbc01fcr3
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
40
40
    transactions,
41
41
    ui,
42
42
    )
 
43
from bzrlib.bundle import serializer
43
44
from bzrlib.revisiontree import RevisionTree
44
45
from bzrlib.store.versioned import VersionedFileStore
45
46
from bzrlib.store.text import TextStore
143
144
                self.add_inventory(revision_id, inv, rev.parent_ids)
144
145
        self._revision_store.add_revision(rev, self.get_transaction())
145
146
 
 
147
    def _add_revision_text(self, revision_id, text):
 
148
        revision = self._revision_store._serializer.read_revision_from_string(
 
149
            text)
 
150
        self._revision_store._add_revision(revision, StringIO(text),
 
151
                                           self.get_transaction())
 
152
 
146
153
    @needs_read_lock
147
154
    def _all_possible_ids(self):
148
155
        """Return all the possible revisions that we could find."""
214
221
        self.bzrdir = a_bzrdir
215
222
        self.control_files = control_files
216
223
        self._revision_store = _revision_store
217
 
        self.text_store = text_store
218
224
        # backwards compatibility
219
225
        self.weave_store = text_store
220
226
        # not right yet - should be more semantically clear ? 
365
371
        except NotImplementedError:
366
372
            raise errors.IncompatibleRepositories(source, self)
367
373
 
 
374
    def create_bundle(self, target, base, fileobj, format=None):
 
375
        return serializer.write_bundle(self, target, base, fileobj, format)
 
376
 
368
377
    def get_commit_builder(self, branch, parents, config, timestamp=None, 
369
378
                           timezone=None, committer=None, revprops=None, 
370
379
                           revision_id=None):
643
652
    def serialise_inventory(self, inv):
644
653
        return self._serializer.write_inventory_to_string(inv)
645
654
 
 
655
    def get_serializer_format(self):
 
656
        return self._serializer.format_num
 
657
 
646
658
    @needs_read_lock
647
659
    def get_inventory_xml(self, revision_id):
648
660
        """Get inventory XML as a file object."""
678
690
        a_weave = self.get_inventory_weave()
679
691
        all_revisions = self._eliminate_revisions_not_present(
680
692
                                a_weave.versions())
681
 
        entire_graph = dict([(node, a_weave.get_parents(node)) for 
 
693
        entire_graph = dict([(node, tuple(a_weave.get_parents(node))) for 
682
694
                             node in all_revisions])
683
695
        if revision_id is None:
684
696
            return entire_graph