← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
101
101
        self._commit_builder_class = _commit_builder_class
102
102
        self._serializer = _serializer
103
103
        self._reconcile_fixes_text_parents = True
 
104
        control_store.get_scope = self.get_transaction
 
105
        text_store.get_scope = self.get_transaction
 
106
        _revision_store.get_scope = self.get_transaction
104
107
 
105
108
    def _warn_if_deprecated(self):
106
109
        # This class isn't deprecated
195
198
        revision_id = osutils.safe_revision_id(revision_id)
196
199
        return self.get_revision_reconcile(revision_id)
197
200
 
 
201
    @symbol_versioning.deprecated_method(symbol_versioning.one_four)
198
202
    @needs_read_lock
199
203
    def get_revision_graph(self, revision_id=None):
200
204
        """Return a dictionary containing the revision graph.
357
361
            repo_transport,
358
362
            prefixed=False,
359
363
            file_mode=control_files._file_mode,
360
 
            versionedfile_class=knit.KnitVersionedFile,
 
364
            versionedfile_class=knit.make_file_knit,
361
365
            versionedfile_kwargs={'factory':knit.KnitPlainFactory()},
362
366
            )
363
367
 
368
372
            file_mode=control_files._file_mode,
369
373
            prefixed=False,
370
374
            precious=True,
371
 
            versionedfile_class=knit.KnitVersionedFile,
 
375
            versionedfile_class=knit.make_file_knit,
372
376
            versionedfile_kwargs={'delta':False,
373
377
                                  'factory':knit.KnitPlainFactory(),
374
378
                                 },
381
385
        return self._get_versioned_file_store('knits',
382
386
                                  transport,
383
387
                                  control_files,
384
 
                                  versionedfile_class=knit.KnitVersionedFile,
 
388
                                  versionedfile_class=knit.make_file_knit,
385
389
                                  versionedfile_kwargs={
386
390
                                      'create_parent_dir':True,
387
391
                                      'delay_create':True,