← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1088
1088
                                  control_files,
1089
1089
                                  prefixed=True,
1090
1090
                                  versionedfile_class=WeaveFile,
 
1091
                                  versionedfile_kwargs={},
1091
1092
                                  escaped=False):
1092
1093
        weave_transport = control_files._transport.clone(name)
1093
1094
        dir_mode = control_files._dir_mode
1096
1097
                                  dir_mode=dir_mode,
1097
1098
                                  file_mode=file_mode,
1098
1099
                                  versionedfile_class=versionedfile_class,
 
1100
                                  versionedfile_kwargs=versionedfile_kwargs,
1099
1101
                                  escaped=escaped)
1100
1102
 
1101
1103
    def initialize(self, a_bzrdir, shared=False):
1490
1492
            prefixed=False,
1491
1493
            precious=True,
1492
1494
            versionedfile_class=KnitVersionedFile,
1493
 
            versionedfile_kwargs={'delta':False, 'factory':KnitPlainFactory()},
 
1495
            versionedfile_kwargs={'delta':False, 'factory':KnitPlainFactory(),},
1494
1496
            escaped=True,
1495
1497
            )
1496
1498
        return KnitRevisionStore(versioned_file_store)
1501
1503
                                              transport,
1502
1504
                                              control_files,
1503
1505
                                              versionedfile_class=KnitVersionedFile,
 
1506
                                              versionedfile_kwargs={
 
1507
                                                  'create_parent_dir':True,
 
1508
                                                  'delay_create':True,
 
1509
                                                  'dir_mode':control_files._dir_mode,
 
1510
                                              },
1504
1511
                                              escaped=True)
1505
1512
 
1506
1513
    def initialize(self, a_bzrdir, shared=False):
1640
1647
        target_ids = set(self.target.all_revision_ids())
1641
1648
        if revision_id is not None:
1642
1649
            source_ids = self.source.get_ancestry(revision_id)
1643
 
            assert source_ids[0] == None
 
1650
            assert source_ids[0] is None
1644
1651
            source_ids.pop(0)
1645
1652
        else:
1646
1653
            source_ids = self.source.all_revision_ids()
1743
1750
        # - RBC 20060209
1744
1751
        if revision_id is not None:
1745
1752
            source_ids = self.source.get_ancestry(revision_id)
1746
 
            assert source_ids[0] == None
 
1753
            assert source_ids[0] is None
1747
1754
            source_ids.pop(0)
1748
1755
        else:
1749
1756
            source_ids = self.source._all_possible_ids()
1806
1813
        """See InterRepository.missing_revision_ids()."""
1807
1814
        if revision_id is not None:
1808
1815
            source_ids = self.source.get_ancestry(revision_id)
1809
 
            assert source_ids[0] == None
 
1816
            assert source_ids[0] is None
1810
1817
            source_ids.pop(0)
1811
1818
        else:
1812
1819
            source_ids = self.source._all_possible_ids()