← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Martin Pool
  • Date: 2010-08-13 08:09:53 UTC
  • mto: (5050.17.6 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: mbp@sourcefrog.net-20100813080953-c00cm9l3qgu2flj9
Remove spuriously-resurrected test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
 
28
28
 
29
29
from bzrlib import (
 
30
    cleanup,
30
31
    errors,
31
32
    ui,
32
 
    repository,
33
 
    repofmt,
34
33
    )
35
 
from bzrlib.trace import mutter, note
36
 
from bzrlib.tsort import TopoSorter
 
34
from bzrlib.trace import mutter
 
35
from bzrlib.tsort import topo_sort
37
36
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
38
37
 
39
38
 
90
89
            # Nothing to check here
91
90
            self.fixed_branch_history = None
92
91
            return
93
 
        self.pb.note('Reconciling branch %s',
94
 
                     self.branch.base)
 
92
        ui.ui_factory.note('Reconciling branch %s' % self.branch.base)
95
93
        branch_reconciler = self.branch.reconcile(thorough=True)
96
94
        self.fixed_branch_history = branch_reconciler.fixed_history
97
95
 
98
96
    def _reconcile_repository(self):
99
97
        self.repo = self.bzrdir.find_repository()
100
 
        self.pb.note('Reconciling repository %s',
101
 
                     self.repo.bzrdir.root_transport.base)
 
98
        ui.ui_factory.note('Reconciling repository %s' %
 
99
            self.repo.user_url)
102
100
        self.pb.update("Reconciling repository", 0, 1)
103
101
        repo_reconciler = self.repo.reconcile(thorough=True)
104
102
        self.inconsistent_parents = repo_reconciler.inconsistent_parents
105
103
        self.garbage_inventories = repo_reconciler.garbage_inventories
106
104
        if repo_reconciler.aborted:
107
 
            self.pb.note(
 
105
            ui.ui_factory.note(
108
106
                'Reconcile aborted: revision index has inconsistent parents.')
109
 
            self.pb.note(
 
107
            ui.ui_factory.note(
110
108
                'Run "bzr check" for more details.')
111
109
        else:
112
 
            self.pb.note('Reconciliation complete.')
 
110
            ui.ui_factory.note('Reconciliation complete.')
113
111
 
114
112
 
115
113
class BranchReconciler(object):
121
119
        self.branch = a_branch
122
120
 
123
121
    def reconcile(self):
 
122
        operation = cleanup.OperationWithCleanups(self._reconcile)
 
123
        self.add_cleanup = operation.add_cleanup
 
124
        operation.run_simple()
 
125
 
 
126
    def _reconcile(self):
124
127
        self.branch.lock_write()
125
 
        try:
126
 
            self.pb = ui.ui_factory.nested_progress_bar()
127
 
            try:
128
 
                self._reconcile_steps()
129
 
            finally:
130
 
                self.pb.finished()
131
 
        finally:
132
 
            self.branch.unlock()
 
128
        self.add_cleanup(self.branch.unlock)
 
129
        self.pb = ui.ui_factory.nested_progress_bar()
 
130
        self.add_cleanup(self.pb.finished)
 
131
        self._reconcile_steps()
133
132
 
134
133
    def _reconcile_steps(self):
135
134
        self._reconcile_revision_history()
151
150
            # set_revision_history, as this will regenerate it again.
152
151
            # Not really worth a whole BranchReconciler class just for this,
153
152
            # though.
154
 
            self.pb.note('Fixing last revision info %s => %s',
155
 
                         last_revno, len(real_history))
 
153
            ui.ui_factory.note('Fixing last revision info %s => %s' % (
 
154
                 last_revno, len(real_history)))
156
155
            self.branch.set_last_revision_info(len(real_history),
157
156
                                               last_revision_id)
158
157
        else:
159
158
            self.fixed_history = False
160
 
            self.pb.note('revision_history ok.')
 
159
            ui.ui_factory.note('revision_history ok.')
161
160
 
162
161
 
163
162
class RepoReconciler(object):
193
192
        garbage_inventories: The number of inventory objects without revisions
194
193
                             that were garbage collected.
195
194
        """
 
195
        operation = cleanup.OperationWithCleanups(self._reconcile)
 
196
        self.add_cleanup = operation.add_cleanup
 
197
        operation.run_simple()
 
198
 
 
199
    def _reconcile(self):
196
200
        self.repo.lock_write()
197
 
        try:
198
 
            self.pb = ui.ui_factory.nested_progress_bar()
199
 
            try:
200
 
                self._reconcile_steps()
201
 
            finally:
202
 
                self.pb.finished()
203
 
        finally:
204
 
            self.repo.unlock()
 
201
        self.add_cleanup(self.repo.unlock)
 
202
        self.pb = ui.ui_factory.nested_progress_bar()
 
203
        self.add_cleanup(self.pb.finished)
 
204
        self._reconcile_steps()
205
205
 
206
206
    def _reconcile_steps(self):
207
207
        """Perform the steps to reconcile this repository."""
238
238
        # (no garbage inventories or we are not doing a thorough check)
239
239
        if (not self.inconsistent_parents and
240
240
            (not self.garbage_inventories or not self.thorough)):
241
 
            self.pb.note('Inventory ok.')
 
241
            ui.ui_factory.note('Inventory ok.')
242
242
            return
243
243
        self.pb.update('Backing up inventory', 0, 0)
244
244
        self.repo._backup_inventory()
245
 
        self.pb.note('Backup inventory created.')
 
245
        ui.ui_factory.note('Backup inventory created.')
246
246
        new_inventories = self.repo._temp_inventories()
247
247
 
248
248
        # we have topological order of revisions and non ghost parents ready.
249
249
        self._setup_steps(len(self._rev_graph))
250
 
        revision_keys = [(rev_id,) for rev_id in
251
 
            TopoSorter(self._rev_graph.items()).iter_topo_order()]
 
250
        revision_keys = [(rev_id,) for rev_id in topo_sort(self._rev_graph)]
252
251
        stream = self._change_inv_parents(
253
252
            self.inventory.get_record_stream(revision_keys, 'unordered', True),
254
253
            self._new_inv_parents,
262
261
        self.pb.update('Writing weave')
263
262
        self.repo._activate_new_inventory()
264
263
        self.inventory = None
265
 
        self.pb.note('Inventory regenerated.')
 
264
        ui.ui_factory.note('Inventory regenerated.')
266
265
 
267
266
    def _new_inv_parents(self, revision_key):
268
267
        """Lookup ghost-filtered parents for revision_key."""
369
368
        self._check_garbage_inventories()
370
369
        self.pb.update('Checking unused inventories', 1, 3)
371
370
        if not self.garbage_inventories:
372
 
            self.pb.note('Inventory ok.')
 
371
            ui.ui_factory.note('Inventory ok.')
373
372
            return
374
373
        self.pb.update('Backing up inventory', 0, 0)
375
374
        self.repo._backup_inventory()
376
 
        self.pb.note('Backup Inventory created')
 
375
        ui.ui_factory.note('Backup Inventory created')
377
376
        # asking for '' should never return a non-empty weave
378
377
        new_inventories = self.repo._temp_inventories()
379
378
        # we have topological order of revisions and non ghost parents ready.
380
379
        graph = self.revisions.get_parent_map(self.revisions.keys())
381
 
        revision_keys = list(TopoSorter(graph).iter_topo_order())
 
380
        revision_keys = topo_sort(graph)
382
381
        revision_ids = [key[-1] for key in revision_keys]
383
382
        self._setup_steps(len(revision_keys))
384
383
        stream = self._change_inv_parents(
393
392
        self.pb.update('Writing weave')
394
393
        self.repo._activate_new_inventory()
395
394
        self.inventory = None
396
 
        self.pb.note('Inventory regenerated.')
 
395
        ui.ui_factory.note('Inventory regenerated.')
397
396
 
398
397
    def _fix_text_parents(self):
399
398
        """Fix bad versionedfile parent entries.
495
494
    #  - lock the names list
496
495
    #  - perform a customised pack() that regenerates data as needed
497
496
    #  - unlock the names list
498
 
    # https://bugs.edge.launchpad.net/bzr/+bug/154173
 
497
    # https://bugs.launchpad.net/bzr/+bug/154173
499
498
 
500
499
    def _reconcile_steps(self):
501
500
        """Perform the steps to reconcile this repository."""
504
503
        collection = self.repo._pack_collection
505
504
        collection.ensure_loaded()
506
505
        collection.lock_names()
507
 
        try:
508
 
            packs = collection.all_packs()
509
 
            all_revisions = self.repo.all_revision_ids()
510
 
            total_inventories = len(list(
511
 
                collection.inventory_index.combined_index.iter_all_entries()))
512
 
            if len(all_revisions):
513
 
                new_pack =  self.repo._reconcile_pack(collection, packs,
514
 
                    ".reconcile", all_revisions, self.pb)
515
 
                if new_pack is not None:
516
 
                    self._discard_and_save(packs)
517
 
            else:
518
 
                # only make a new pack when there is data to copy.
 
506
        self.add_cleanup(collection._unlock_names)
 
507
        packs = collection.all_packs()
 
508
        all_revisions = self.repo.all_revision_ids()
 
509
        total_inventories = len(list(
 
510
            collection.inventory_index.combined_index.iter_all_entries()))
 
511
        if len(all_revisions):
 
512
            new_pack =  self.repo._reconcile_pack(collection, packs,
 
513
                ".reconcile", all_revisions, self.pb)
 
514
            if new_pack is not None:
519
515
                self._discard_and_save(packs)
520
 
            self.garbage_inventories = total_inventories - len(list(
521
 
                collection.inventory_index.combined_index.iter_all_entries()))
522
 
        finally:
523
 
            collection._unlock_names()
 
516
        else:
 
517
            # only make a new pack when there is data to copy.
 
518
            self._discard_and_save(packs)
 
519
        self.garbage_inventories = total_inventories - len(list(
 
520
            collection.inventory_index.combined_index.iter_all_entries()))
524
521
 
525
522
    def _discard_and_save(self, packs):
526
523
        """Discard some packs from the repository.