/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/repofmt/pack_repo.py

  • Committer: Martin Pool
  • Date: 2008-05-12 05:46:44 UTC
  • mto: (3407.2.18 controlfiles)
  • mto: This revision was merged to the branch mainline in revision 3445.
  • Revision ID: mbp@sourcefrog.net-20080512054644-b203t92q8kv8x9ic
Change some callers to get file and directory permissions from bzrdir not LockableFiles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
605
605
        return NewPack(self._pack_collection._upload_transport,
606
606
            self._pack_collection._index_transport,
607
607
            self._pack_collection._pack_transport, upload_suffix=self.suffix,
608
 
            file_mode=self._pack_collection.repo.control_files._file_mode)
 
608
            file_mode=self._pack_collection.repo.bzrdir._get_file_mode())
609
609
 
610
610
    def _copy_revision_texts(self):
611
611
        """Copy revision data to the new pack."""
1587
1587
            for key, value in disk_nodes:
1588
1588
                builder.add_node(key, value)
1589
1589
            self.transport.put_file('pack-names', builder.finish(),
1590
 
                mode=self.repo.control_files._file_mode)
 
1590
                mode=self.repo.bzrdir._get_file_mode())
1591
1591
            # move the baseline forward
1592
1592
            self._packs_at_load = disk_nodes
1593
1593
            # now clear out the obsolete packs directory
1631
1631
            raise errors.NotWriteLocked(self)
1632
1632
        self._new_pack = NewPack(self._upload_transport, self._index_transport,
1633
1633
            self._pack_transport, upload_suffix='.pack',
1634
 
            file_mode=self.repo.control_files._file_mode)
 
1634
            file_mode=self.repo.bzrdir._get_file_mode())
1635
1635
        # allow writing: queue writes to a new index
1636
1636
        self.revision_index.add_writable_index(self._new_pack.revision_index,
1637
1637
            self._new_pack)
1714
1714
            add_callback=add_callback)
1715
1715
        self.repo._revision_knit = knit.KnitVersionedFile(
1716
1716
            'revisions', self.transport.clone('..'),
1717
 
            self.repo.control_files._file_mode,
 
1717
            self.repo.bzrdir._get_file_mode(),
1718
1718
            create=False,
1719
1719
            index=knit_index, delta=False, factory=knit.KnitPlainFactory(),
1720
1720
            access_method=self.repo._pack_collection.revision_index.knit_access)
1732
1732
            add_callback=add_callback, parents=False)
1733
1733
        self.repo._signature_knit = knit.KnitVersionedFile(
1734
1734
            'signatures', self.transport.clone('..'),
1735
 
            self.repo.control_files._file_mode,
 
1735
            self.repo.bzrdir._get_file_mode(),
1736
1736
            create=False,
1737
1737
            index=knit_index, delta=False, factory=knit.KnitPlainFactory(),
1738
1738
            access_method=self.repo._pack_collection.signature_index.knit_access)
1821
1821
            add_callback=add_callback, deltas=True, parents=True)
1822
1822
        return knit.KnitVersionedFile(
1823
1823
            'inventory', self.transport.clone('..'),
1824
 
            self.repo.control_files._file_mode,
 
1824
            self.repo.bzrdir._get_file_mode(),
1825
1825
            create=False,
1826
1826
            index=knit_index, delta=True, factory=knit.KnitPlainFactory(),
1827
1827
            access_method=self.repo._pack_collection.inventory_index.knit_access)