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

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
30
30
    osutils,
31
31
    pack,
32
32
    remote,
33
 
    repository,
34
33
    revision as _mod_revision,
35
34
    trace,
36
35
    ui,
39
38
    BTreeGraphIndex,
40
39
    BTreeBuilder,
41
40
    )
42
 
from bzrlib.index import GraphIndex, GraphIndexBuilder
43
41
from bzrlib.groupcompress import (
44
42
    _GCGraphIndex,
45
43
    GroupCompressVersionedFiles,
445
443
        #      is grabbing too many keys...
446
444
        text_keys = source_vf.keys()
447
445
        self._copy_stream(source_vf, target_vf, text_keys,
448
 
                          'text', self._get_progress_stream, 4)
 
446
                          'texts', self._get_progress_stream, 4)
449
447
 
450
448
    def _copy_signature_texts(self):
451
449
        source_vf, target_vf = self._build_vfs('signature', False, False)
652
650
                parents=False, is_locked=self.is_locked,
653
651
                inconsistency_fatal=False),
654
652
            access=self._pack_collection.chk_index.data_access)
 
653
        search_key_name = self._format._serializer.search_key_name
 
654
        search_key_func = chk_map.search_key_registry.get(search_key_name)
 
655
        self.chk_bytes._search_key_func = search_key_func
655
656
        # True when the repository object is 'write locked' (as opposed to the
656
657
        # physical lock only taken out around changes to the pack-names list.)
657
658
        # Another way to represent this would be a decorator around the control