← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
29
29
from bzrlib import (
30
30
    cleanup,
31
31
    errors,
 
32
    revision as _mod_revision,
32
33
    ui,
33
34
    )
34
35
from bzrlib.trace import mutter
35
36
from bzrlib.tsort import topo_sort
36
37
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
37
 
 
38
 
 
39
 
def reconcile(dir, other=None):
 
38
from bzrlib.i18n import gettext
 
39
 
 
40
 
 
41
def reconcile(dir, canonicalize_chks=False):
40
42
    """Reconcile the data in dir.
41
43
 
42
44
    Currently this is limited to a inventory 'reweave'.
46
48
    Directly using Reconciler is recommended for library users that
47
49
    desire fine grained control or analysis of the found issues.
48
50
 
49
 
    :param other: another bzrdir to reconcile against.
 
51
    :param canonicalize_chks: Make sure CHKs are in canonical form.
50
52
    """
51
 
    reconciler = Reconciler(dir, other=other)
 
53
    reconciler = Reconciler(dir, canonicalize_chks=canonicalize_chks)
52
54
    reconciler.reconcile()
53
55
 
54
56
 
55
57
class Reconciler(object):
56
58
    """Reconcilers are used to reconcile existing data."""
57
59
 
58
 
    def __init__(self, dir, other=None):
 
60
    def __init__(self, dir, other=None, canonicalize_chks=False):
59
61
        """Create a Reconciler."""
60
62
        self.bzrdir = dir
 
63
        self.canonicalize_chks = canonicalize_chks
61
64
 
62
65
    def reconcile(self):
63
66
        """Perform reconciliation.
64
67
 
65
68
        After reconciliation the following attributes document found issues:
66
 
        inconsistent_parents: The number of revisions in the repository whose
67
 
                              ancestry was being reported incorrectly.
68
 
        garbage_inventories: The number of inventory objects without revisions
69
 
                             that were garbage collected.
70
 
        fixed_branch_history: None if there was no branch, False if the branch
71
 
                              history was correct, True if the branch history
72
 
                              needed to be re-normalized.
 
69
 
 
70
        * `inconsistent_parents`: The number of revisions in the repository
 
71
          whose ancestry was being reported incorrectly.
 
72
        * `garbage_inventories`: The number of inventory objects without
 
73
          revisions that were garbage collected.
 
74
        * `fixed_branch_history`: None if there was no branch, False if the
 
75
          branch history was correct, True if the branch history needed to be
 
76
          re-normalized.
73
77
        """
74
78
        self.pb = ui.ui_factory.nested_progress_bar()
75
79
        try:
89
93
            # Nothing to check here
90
94
            self.fixed_branch_history = None
91
95
            return
92
 
        ui.ui_factory.note('Reconciling branch %s' % self.branch.base)
 
96
        ui.ui_factory.note(gettext('Reconciling branch %s') % self.branch.base)
93
97
        branch_reconciler = self.branch.reconcile(thorough=True)
94
98
        self.fixed_branch_history = branch_reconciler.fixed_history
95
99
 
96
100
    def _reconcile_repository(self):
97
101
        self.repo = self.bzrdir.find_repository()
98
 
        ui.ui_factory.note('Reconciling repository %s' %
 
102
        ui.ui_factory.note(gettext('Reconciling repository %s') %
99
103
            self.repo.user_url)
100
 
        self.pb.update("Reconciling repository", 0, 1)
101
 
        repo_reconciler = self.repo.reconcile(thorough=True)
 
104
        self.pb.update(gettext("Reconciling repository"), 0, 1)
 
105
        if self.canonicalize_chks:
 
106
            try:
 
107
                self.repo.reconcile_canonicalize_chks
 
108
            except AttributeError:
 
109
                raise errors.BzrError(
 
110
                    gettext("%s cannot canonicalize CHKs.") % (self.repo,))
 
111
            repo_reconciler = self.repo.reconcile_canonicalize_chks()
 
112
        else:
 
113
            repo_reconciler = self.repo.reconcile(thorough=True)
102
114
        self.inconsistent_parents = repo_reconciler.inconsistent_parents
103
115
        self.garbage_inventories = repo_reconciler.garbage_inventories
104
116
        if repo_reconciler.aborted:
105
 
            ui.ui_factory.note(
106
 
                'Reconcile aborted: revision index has inconsistent parents.')
107
 
            ui.ui_factory.note(
108
 
                'Run "bzr check" for more details.')
 
117
            ui.ui_factory.note(gettext(
 
118
                'Reconcile aborted: revision index has inconsistent parents.'))
 
119
            ui.ui_factory.note(gettext(
 
120
                'Run "bzr check" for more details.'))
109
121
        else:
110
 
            ui.ui_factory.note('Reconciliation complete.')
 
122
            ui.ui_factory.note(gettext('Reconciliation complete.'))
111
123
 
112
124
 
113
125
class BranchReconciler(object):
134
146
        self._reconcile_revision_history()
135
147
 
136
148
    def _reconcile_revision_history(self):
137
 
        repo = self.branch.repository
138
149
        last_revno, last_revision_id = self.branch.last_revision_info()
139
150
        real_history = []
 
151
        graph = self.branch.repository.get_graph()
140
152
        try:
141
 
            for revid in repo.iter_reverse_revision_history(
142
 
                    last_revision_id):
 
153
            for revid in graph.iter_lefthand_ancestry(
 
154
                    last_revision_id, (_mod_revision.NULL_REVISION,)):
143
155
                real_history.append(revid)
144
156
        except errors.RevisionNotPresent:
145
157
            pass # Hit a ghost left hand parent
150
162
            # set_revision_history, as this will regenerate it again.
151
163
            # Not really worth a whole BranchReconciler class just for this,
152
164
            # though.
153
 
            ui.ui_factory.note('Fixing last revision info %s => %s' % (
154
 
                 last_revno, len(real_history)))
 
165
            ui.ui_factory.note(gettext('Fixing last revision info {0} '\
 
166
                                       ' => {1}').format(
 
167
                                       last_revno, len(real_history)))
155
168
            self.branch.set_last_revision_info(len(real_history),
156
169
                                               last_revision_id)
157
170
        else:
158
171
            self.fixed_history = False
159
 
            ui.ui_factory.note('revision_history ok.')
 
172
            ui.ui_factory.note(gettext('revision_history ok.'))
160
173
 
161
174
 
162
175
class RepoReconciler(object):
187
200
        """Perform reconciliation.
188
201
 
189
202
        After reconciliation the following attributes document found issues:
190
 
        inconsistent_parents: The number of revisions in the repository whose
191
 
                              ancestry was being reported incorrectly.
192
 
        garbage_inventories: The number of inventory objects without revisions
193
 
                             that were garbage collected.
 
203
 
 
204
        * `inconsistent_parents`: The number of revisions in the repository
 
205
          whose ancestry was being reported incorrectly.
 
206
        * `garbage_inventories`: The number of inventory objects without
 
207
          revisions that were garbage collected.
194
208
        """
195
209
        operation = cleanup.OperationWithCleanups(self._reconcile)
196
210
        self.add_cleanup = operation.add_cleanup
215
229
        only data-loss causing issues (!self.thorough) or all issues
216
230
        (self.thorough) are treated as requiring the reweave.
217
231
        """
218
 
        # local because needing to know about WeaveFile is a wart we want to hide
219
 
        from bzrlib.weave import WeaveFile, Weave
220
232
        transaction = self.repo.get_transaction()
221
 
        self.pb.update('Reading inventory data')
 
233
        self.pb.update(gettext('Reading inventory data'))
222
234
        self.inventory = self.repo.inventories
223
235
        self.revisions = self.repo.revisions
224
236
        # the total set of revisions to process
238
250
        # (no garbage inventories or we are not doing a thorough check)
239
251
        if (not self.inconsistent_parents and
240
252
            (not self.garbage_inventories or not self.thorough)):
241
 
            ui.ui_factory.note('Inventory ok.')
 
253
            ui.ui_factory.note(gettext('Inventory ok.'))
242
254
            return
243
 
        self.pb.update('Backing up inventory', 0, 0)
 
255
        self.pb.update(gettext('Backing up inventory'), 0, 0)
244
256
        self.repo._backup_inventory()
245
 
        ui.ui_factory.note('Backup inventory created.')
 
257
        ui.ui_factory.note(gettext('Backup inventory created.'))
246
258
        new_inventories = self.repo._temp_inventories()
247
259
 
248
260
        # we have topological order of revisions and non ghost parents ready.
258
270
        if not (set(new_inventories.keys()) ==
259
271
            set([(revid,) for revid in self.pending])):
260
272
            raise AssertionError()
261
 
        self.pb.update('Writing weave')
 
273
        self.pb.update(gettext('Writing weave'))
262
274
        self.repo._activate_new_inventory()
263
275
        self.inventory = None
264
 
        ui.ui_factory.note('Inventory regenerated.')
 
276
        ui.ui_factory.note(gettext('Inventory regenerated.'))
265
277
 
266
278
    def _new_inv_parents(self, revision_key):
267
279
        """Lookup ghost-filtered parents for revision_key."""
355
367
    def _load_indexes(self):
356
368
        """Load indexes for the reconciliation."""
357
369
        self.transaction = self.repo.get_transaction()
358
 
        self.pb.update('Reading indexes', 0, 2)
 
370
        self.pb.update(gettext('Reading indexes'), 0, 2)
359
371
        self.inventory = self.repo.inventories
360
 
        self.pb.update('Reading indexes', 1, 2)
 
372
        self.pb.update(gettext('Reading indexes'), 1, 2)
361
373
        self.repo._check_for_inconsistent_revision_parents()
362
374
        self.revisions = self.repo.revisions
363
 
        self.pb.update('Reading indexes', 2, 2)
 
375
        self.pb.update(gettext('Reading indexes'), 2, 2)
364
376
 
365
377
    def _gc_inventory(self):
366
378
        """Remove inventories that are not referenced from the revision store."""
367
 
        self.pb.update('Checking unused inventories', 0, 1)
 
379
        self.pb.update(gettext('Checking unused inventories'), 0, 1)
368
380
        self._check_garbage_inventories()
369
 
        self.pb.update('Checking unused inventories', 1, 3)
 
381
        self.pb.update(gettext('Checking unused inventories'), 1, 3)
370
382
        if not self.garbage_inventories:
371
 
            ui.ui_factory.note('Inventory ok.')
 
383
            ui.ui_factory.note(gettext('Inventory ok.'))
372
384
            return
373
 
        self.pb.update('Backing up inventory', 0, 0)
 
385
        self.pb.update(gettext('Backing up inventory'), 0, 0)
374
386
        self.repo._backup_inventory()
375
 
        ui.ui_factory.note('Backup Inventory created')
 
387
        ui.ui_factory.note(gettext('Backup Inventory created'))
376
388
        # asking for '' should never return a non-empty weave
377
389
        new_inventories = self.repo._temp_inventories()
378
390
        # we have topological order of revisions and non ghost parents ready.
389
401
        # the revisionds list
390
402
        if not(set(new_inventories.keys()) == set(revision_keys)):
391
403
            raise AssertionError()
392
 
        self.pb.update('Writing weave')
 
404
        self.pb.update(gettext('Writing weave'))
393
405
        self.repo._activate_new_inventory()
394
406
        self.inventory = None
395
 
        ui.ui_factory.note('Inventory regenerated.')
 
407
        ui.ui_factory.note(gettext('Inventory regenerated.'))
396
408
 
397
409
    def _fix_text_parents(self):
398
410
        """Fix bad versionedfile parent entries.
430
442
            versions_list.append(text_key[1])
431
443
        # Do the reconcile of individual weaves.
432
444
        for num, file_id in enumerate(per_id_bad_parents):
433
 
            self.pb.update('Fixing text parents', num,
 
445
            self.pb.update(gettext('Fixing text parents'), num,
434
446
                           len(per_id_bad_parents))
435
447
            versions_with_bad_parents = per_id_bad_parents[file_id]
436
448
            id_unused_versions = set(key[-1] for key in unused_versions
496
508
    #  - unlock the names list
497
509
    # https://bugs.launchpad.net/bzr/+bug/154173
498
510
 
 
511
    def __init__(self, repo, other=None, thorough=False,
 
512
            canonicalize_chks=False):
 
513
        super(PackReconciler, self).__init__(repo, other=other,
 
514
            thorough=thorough)
 
515
        self.canonicalize_chks = canonicalize_chks
 
516
 
499
517
    def _reconcile_steps(self):
500
518
        """Perform the steps to reconcile this repository."""
501
519
        if not self.thorough:
509
527
        total_inventories = len(list(
510
528
            collection.inventory_index.combined_index.iter_all_entries()))
511
529
        if len(all_revisions):
512
 
            new_pack =  self.repo._reconcile_pack(collection, packs,
513
 
                ".reconcile", all_revisions, self.pb)
 
530
            if self.canonicalize_chks:
 
531
                reconcile_meth = self.repo._canonicalize_chks_pack
 
532
            else:
 
533
                reconcile_meth = self.repo._reconcile_pack
 
534
            new_pack = reconcile_meth(collection, packs, ".reconcile",
 
535
                all_revisions, self.pb)
514
536
            if new_pack is not None:
515
537
                self._discard_and_save(packs)
516
538
        else: