← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
43
43
from bzrlib.recordcounter import RecordCounter
44
44
from bzrlib.revisiontree import InventoryRevisionTree
45
45
from bzrlib.testament import Testament
46
 
from bzrlib.i18n import gettext
47
46
""")
48
47
 
49
48
from bzrlib import (
1088
1087
        keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1089
1088
        kinds = ['chk_bytes', 'texts']
1090
1089
        count = len(checker.pending_keys)
1091
 
        bar.update(gettext("inventories"), 0, 2)
 
1090
        bar.update("inventories", 0, 2)
1092
1091
        current_keys = checker.pending_keys
1093
1092
        checker.pending_keys = {}
1094
1093
        # Accumulate current checks.
1114
1113
            del keys['inventories']
1115
1114
        else:
1116
1115
            return
1117
 
        bar.update(gettext("texts"), 1)
 
1116
        bar.update("texts", 1)
1118
1117
        while (checker.pending_keys or keys['chk_bytes']
1119
1118
            or keys['texts']):
1120
1119
            # Something to check.
1207
1206
        # this construct will accept instances of those things.
1208
1207
        super(VersionedFileRepository, self).__init__(_format, a_bzrdir,
1209
1208
            control_files)
1210
 
        self._transport = control_files._transport
1211
 
        self.base = self._transport.base
1212
1209
        # for tests
1213
1210
        self._reconcile_does_inventory_gc = True
1214
1211
        self._reconcile_fixes_text_parents = False
1571
1568
        batch_size = 10 # should be ~150MB on a 55K path tree
1572
1569
        batch_count = len(revision_order) / batch_size + 1
1573
1570
        processed_texts = 0
1574
 
        pb.update(gettext("Calculating text parents"), processed_texts, text_count)
 
1571
        pb.update("Calculating text parents", processed_texts, text_count)
1575
1572
        for offset in xrange(batch_count):
1576
1573
            to_query = revision_order[offset * batch_size:(offset + 1) *
1577
1574
                batch_size]
1580
1577
            for revision_id in to_query:
1581
1578
                parent_ids = ancestors[revision_id]
1582
1579
                for text_key in revision_keys[revision_id]:
1583
 
                    pb.update(gettext("Calculating text parents"), processed_texts)
 
1580
                    pb.update("Calculating text parents", processed_texts)
1584
1581
                    processed_texts += 1
1585
1582
                    candidate_parents = []
1586
1583
                    for parent_id in parent_ids:
1656
1653
        num_file_ids = len(file_ids)
1657
1654
        for file_id, altered_versions in file_ids.iteritems():
1658
1655
            if pb is not None:
1659
 
                pb.update(gettext("Fetch texts"), count, num_file_ids)
 
1656
                pb.update("Fetch texts", count, num_file_ids)
1660
1657
            count += 1
1661
1658
            yield ("file", file_id, altered_versions)
1662
1659
 
2467
2464
            self.text_index.iterkeys()])
2468
2465
        # text keys is now grouped by file_id
2469
2466
        n_versions = len(self.text_index)
2470
 
        progress_bar.update(gettext('loading text store'), 0, n_versions)
 
2467
        progress_bar.update('loading text store', 0, n_versions)
2471
2468
        parent_map = self.repository.texts.get_parent_map(self.text_index)
2472
2469
        # On unlistable transports this could well be empty/error...
2473
2470
        text_keys = self.repository.texts.keys()
2474
2471
        unused_keys = frozenset(text_keys) - set(self.text_index)
2475
2472
        for num, key in enumerate(self.text_index.iterkeys()):
2476
 
            progress_bar.update(gettext('checking text graph'), num, n_versions)
 
2473
            progress_bar.update('checking text graph', num, n_versions)
2477
2474
            correct_parents = self.calculate_file_version_parents(key)
2478
2475
            try:
2479
2476
                knit_parents = parent_map[key]
2923
2920
        for offset in range(0, len(revision_ids), batch_size):
2924
2921
            self.target.start_write_group()
2925
2922
            try:
2926
 
                pb.update(gettext('Transferring revisions'), offset,
 
2923
                pb.update('Transferring revisions', offset,
2927
2924
                          len(revision_ids))
2928
2925
                batch = revision_ids[offset:offset+batch_size]
2929
2926
                basis_id = self._fetch_batch(batch, basis_id, cache)
2937
2934
                    hints.extend(hint)
2938
2935
        if hints and self.target._format.pack_compresses:
2939
2936
            self.target.pack(hint=hints)
2940
 
        pb.update(gettext('Transferring revisions'), len(revision_ids),
 
2937
        pb.update('Transferring revisions', len(revision_ids),
2941
2938
                  len(revision_ids))
2942
2939
 
2943
2940
    @needs_write_lock
3052
3049
            _install_revision(repository, revision, revision_tree, signature,
3053
3050
                inventory_cache)
3054
3051
            if pb is not None:
3055
 
                pb.update(gettext('Transferring revisions'), n + 1, num_revisions)
 
3052
                pb.update('Transferring revisions', n + 1, num_revisions)
3056
3053
    except:
3057
3054
        repository.abort_write_group()
3058
3055
        raise