/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: John Arbash Meinel
  • Date: 2006-09-12 20:46:42 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912204642-91599869cc863f07
Cleanup, deprecated, and get the tests passing again.

bzrlib.builtins.merge is heavily used by the test suite, though it is
really the wrong place for a function like that.
lazy imports work badly with doctests, but so far none of the doc tested
modules had anything worth testing in that fashion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
31
31
    errors,
32
32
    gpg,
33
33
    graph,
 
34
    knit,
34
35
    lockable_files,
35
36
    lockdir,
36
37
    osutils,
42
43
    weavefile,
43
44
    xml5,
44
45
    )
45
 
from bzrlib.knit import KnitVersionedFile, KnitPlainFactory
46
46
from bzrlib.osutils import (
47
47
    rand_bytes,
48
48
    compact_date, 
1487
1487
            repo_transport,
1488
1488
            prefixed=False,
1489
1489
            file_mode=control_files._file_mode,
1490
 
            versionedfile_class=KnitVersionedFile,
1491
 
            versionedfile_kwargs={'factory':KnitPlainFactory()},
 
1490
            versionedfile_class=knit.KnitVersionedFile,
 
1491
            versionedfile_kwargs={'factory':knit.KnitPlainFactory()},
1492
1492
            )
1493
1493
 
1494
1494
    def get_format_string(self):
1507
1507
            file_mode=control_files._file_mode,
1508
1508
            prefixed=False,
1509
1509
            precious=True,
1510
 
            versionedfile_class=KnitVersionedFile,
1511
 
            versionedfile_kwargs={'delta':False, 'factory':KnitPlainFactory(),},
 
1510
            versionedfile_class=knit.KnitVersionedFile,
 
1511
            versionedfile_kwargs={'delta':False,
 
1512
                                  'factory':knit.KnitPlainFactory(),
 
1513
                                 },
1512
1514
            escaped=True,
1513
1515
            )
1514
1516
        return KnitRevisionStore(versioned_file_store)
1516
1518
    def _get_text_store(self, transport, control_files):
1517
1519
        """See RepositoryFormat._get_text_store()."""
1518
1520
        return self._get_versioned_file_store('knits',
1519
 
                                              transport,
1520
 
                                              control_files,
1521
 
                                              versionedfile_class=KnitVersionedFile,
1522
 
                                              versionedfile_kwargs={
1523
 
                                                  'create_parent_dir':True,
1524
 
                                                  'delay_create':True,
1525
 
                                                  'dir_mode':control_files._dir_mode,
1526
 
                                              },
1527
 
                                              escaped=True)
 
1521
                                  transport,
 
1522
                                  control_files,
 
1523
                                  versionedfile_class=knit.KnitVersionedFile,
 
1524
                                  versionedfile_kwargs={
 
1525
                                      'create_parent_dir':True,
 
1526
                                      'delay_create':True,
 
1527
                                      'dir_mode':control_files._dir_mode,
 
1528
                                  },
 
1529
                                  escaped=True)
1528
1530
 
1529
1531
    def initialize(self, a_bzrdir, shared=False):
1530
1532
        """Create a knit format 1 repository.