← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
33
33
    repofmt,
34
34
    )
35
35
from bzrlib.trace import mutter, note
36
 
from bzrlib.tsort import TopoSorter
 
36
from bzrlib.tsort import topo_sort
37
37
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
38
38
 
39
39
 
90
90
            # Nothing to check here
91
91
            self.fixed_branch_history = None
92
92
            return
93
 
        self.pb.note('Reconciling branch %s',
94
 
                     self.branch.base)
 
93
        ui.ui_factory.note('Reconciling branch %s' % self.branch.base)
95
94
        branch_reconciler = self.branch.reconcile(thorough=True)
96
95
        self.fixed_branch_history = branch_reconciler.fixed_history
97
96
 
98
97
    def _reconcile_repository(self):
99
98
        self.repo = self.bzrdir.find_repository()
100
 
        self.pb.note('Reconciling repository %s',
101
 
                     self.repo.bzrdir.root_transport.base)
 
99
        ui.ui_factory.note('Reconciling repository %s' %
 
100
            self.repo.bzrdir.root_transport.base)
102
101
        self.pb.update("Reconciling repository", 0, 1)
103
102
        repo_reconciler = self.repo.reconcile(thorough=True)
104
103
        self.inconsistent_parents = repo_reconciler.inconsistent_parents
105
104
        self.garbage_inventories = repo_reconciler.garbage_inventories
106
105
        if repo_reconciler.aborted:
107
 
            self.pb.note(
 
106
            ui.ui_factory.note(
108
107
                'Reconcile aborted: revision index has inconsistent parents.')
109
 
            self.pb.note(
 
108
            ui.ui_factory.note(
110
109
                'Run "bzr check" for more details.')
111
110
        else:
112
 
            self.pb.note('Reconciliation complete.')
 
111
            ui.ui_factory.note('Reconciliation complete.')
113
112
 
114
113
 
115
114
class BranchReconciler(object):
137
136
    def _reconcile_revision_history(self):
138
137
        repo = self.branch.repository
139
138
        last_revno, last_revision_id = self.branch.last_revision_info()
140
 
        real_history = list(repo.iter_reverse_revision_history(
141
 
                                last_revision_id))
 
139
        real_history = []
 
140
        try:
 
141
            for revid in repo.iter_reverse_revision_history(
 
142
                    last_revision_id):
 
143
                real_history.append(revid)
 
144
        except errors.RevisionNotPresent:
 
145
            pass # Hit a ghost left hand parent
142
146
        real_history.reverse()
143
147
        if last_revno != len(real_history):
144
148
            self.fixed_history = True
146
150
            # set_revision_history, as this will regenerate it again.
147
151
            # Not really worth a whole BranchReconciler class just for this,
148
152
            # though.
149
 
            self.pb.note('Fixing last revision info %s => %s',
150
 
                         last_revno, len(real_history))
 
153
            ui.ui_factory.note('Fixing last revision info %s => %s' % (
 
154
                 last_revno, len(real_history)))
151
155
            self.branch.set_last_revision_info(len(real_history),
152
156
                                               last_revision_id)
153
157
        else:
154
158
            self.fixed_history = False
155
 
            self.pb.note('revision_history ok.')
 
159
            ui.ui_factory.note('revision_history ok.')
156
160
 
157
161
 
158
162
class RepoReconciler(object):
233
237
        # (no garbage inventories or we are not doing a thorough check)
234
238
        if (not self.inconsistent_parents and
235
239
            (not self.garbage_inventories or not self.thorough)):
236
 
            self.pb.note('Inventory ok.')
 
240
            ui.ui_factory.note('Inventory ok.')
237
241
            return
238
242
        self.pb.update('Backing up inventory', 0, 0)
239
243
        self.repo._backup_inventory()
240
 
        self.pb.note('Backup inventory created.')
 
244
        ui.ui_factory.note('Backup inventory created.')
241
245
        new_inventories = self.repo._temp_inventories()
242
246
 
243
247
        # we have topological order of revisions and non ghost parents ready.
244
248
        self._setup_steps(len(self._rev_graph))
245
 
        revision_keys = [(rev_id,) for rev_id in
246
 
            TopoSorter(self._rev_graph.items()).iter_topo_order()]
 
249
        revision_keys = [(rev_id,) for rev_id in topo_sort(self._rev_graph)]
247
250
        stream = self._change_inv_parents(
248
251
            self.inventory.get_record_stream(revision_keys, 'unordered', True),
249
252
            self._new_inv_parents,
257
260
        self.pb.update('Writing weave')
258
261
        self.repo._activate_new_inventory()
259
262
        self.inventory = None
260
 
        self.pb.note('Inventory regenerated.')
 
263
        ui.ui_factory.note('Inventory regenerated.')
261
264
 
262
265
    def _new_inv_parents(self, revision_key):
263
266
        """Lookup ghost-filtered parents for revision_key."""
364
367
        self._check_garbage_inventories()
365
368
        self.pb.update('Checking unused inventories', 1, 3)
366
369
        if not self.garbage_inventories:
367
 
            self.pb.note('Inventory ok.')
 
370
            ui.ui_factory.note('Inventory ok.')
368
371
            return
369
372
        self.pb.update('Backing up inventory', 0, 0)
370
373
        self.repo._backup_inventory()
371
 
        self.pb.note('Backup Inventory created')
 
374
        ui.ui_factory.note('Backup Inventory created')
372
375
        # asking for '' should never return a non-empty weave
373
376
        new_inventories = self.repo._temp_inventories()
374
377
        # we have topological order of revisions and non ghost parents ready.
375
378
        graph = self.revisions.get_parent_map(self.revisions.keys())
376
 
        revision_keys = list(TopoSorter(graph).iter_topo_order())
 
379
        revision_keys = topo_sort(graph)
377
380
        revision_ids = [key[-1] for key in revision_keys]
378
381
        self._setup_steps(len(revision_keys))
379
382
        stream = self._change_inv_parents(
388
391
        self.pb.update('Writing weave')
389
392
        self.repo._activate_new_inventory()
390
393
        self.inventory = None
391
 
        self.pb.note('Inventory regenerated.')
 
394
        ui.ui_factory.note('Inventory regenerated.')
392
395
 
393
396
    def _fix_text_parents(self):
394
397
        """Fix bad versionedfile parent entries.