~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2006-2010 Canonical Ltd
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
16
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
17
"""Reconcilers are able to fix some potential data errors in a branch."""
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
18
19
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
20
__all__ = [
21
    'KnitReconciler',
22
    'PackReconciler',
23
    'reconcile',
24
    'Reconciler',
25
    'RepoReconciler',
26
    ]
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
27
28
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
29
from bzrlib import (
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
30
    cleanup,
2745.6.16 by Aaron Bentley
Update from review
31
    errors,
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
32
    ui,
33
    )
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
34
from bzrlib.trace import mutter
4577.2.4 by Maarten Bosmans
Make shure the faster topo_sort function is used where appropriate
35
from bzrlib.tsort import topo_sort
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
36
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
37
38
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
39
def reconcile(dir, other=None):
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
40
    """Reconcile the data in dir.
41
42
    Currently this is limited to a inventory 'reweave'.
43
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
44
    This is a convenience method, for using a Reconciler object.
45
46
    Directly using Reconciler is recommended for library users that
47
    desire fine grained control or analysis of the found issues.
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
48
49
    :param other: another bzrdir to reconcile against.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
50
    """
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
51
    reconciler = Reconciler(dir, other=other)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
52
    reconciler.reconcile()
53
54
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
55
class Reconciler(object):
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
56
    """Reconcilers are used to reconcile existing data."""
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
57
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
58
    def __init__(self, dir, other=None):
59
        """Create a Reconciler."""
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
60
        self.bzrdir = dir
61
62
    def reconcile(self):
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
63
        """Perform reconciliation.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
64
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
65
        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.
3389.2.7 by John Arbash Meinel
Review comments from Ian
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.
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
73
        """
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
74
        self.pb = ui.ui_factory.nested_progress_bar()
75
        try:
76
            self._reconcile()
77
        finally:
78
            self.pb.finished()
79
80
    def _reconcile(self):
81
        """Helper function for performing reconciliation."""
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
82
        self._reconcile_branch()
83
        self._reconcile_repository()
84
85
    def _reconcile_branch(self):
86
        try:
87
            self.branch = self.bzrdir.open_branch()
88
        except errors.NotBranchError:
89
            # Nothing to check here
3389.2.7 by John Arbash Meinel
Review comments from Ian
90
            self.fixed_branch_history = None
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
91
            return
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
92
        ui.ui_factory.note('Reconciling branch %s' % self.branch.base)
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
93
        branch_reconciler = self.branch.reconcile(thorough=True)
94
        self.fixed_branch_history = branch_reconciler.fixed_history
95
96
    def _reconcile_repository(self):
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
97
        self.repo = self.bzrdir.find_repository()
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
98
        ui.ui_factory.note('Reconciling repository %s' %
5158.6.10 by Martin Pool
Update more code to use user_transport when it should
99
            self.repo.user_url)
2960.1.1 by Robert Collins
* Reconcile now shows progress bars. (Robert Collins, #159351)
100
        self.pb.update("Reconciling repository", 0, 1)
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
101
        repo_reconciler = self.repo.reconcile(thorough=True)
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
102
        self.inconsistent_parents = repo_reconciler.inconsistent_parents
103
        self.garbage_inventories = repo_reconciler.garbage_inventories
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
104
        if repo_reconciler.aborted:
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
105
            ui.ui_factory.note(
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
106
                'Reconcile aborted: revision index has inconsistent parents.')
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
107
            ui.ui_factory.note(
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
108
                'Run "bzr check" for more details.')
109
        else:
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
110
            ui.ui_factory.note('Reconciliation complete.')
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
111
112
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
113
class BranchReconciler(object):
114
    """Reconciler that works on a branch."""
115
116
    def __init__(self, a_branch, thorough=False):
117
        self.fixed_history = None
118
        self.thorough = thorough
119
        self.branch = a_branch
120
121
    def reconcile(self):
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
122
        operation = cleanup.OperationWithCleanups(self._reconcile)
123
        self.add_cleanup = operation.add_cleanup
124
        operation.run_simple()
125
126
    def _reconcile(self):
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
127
        self.branch.lock_write()
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
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()
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
132
133
    def _reconcile_steps(self):
134
        self._reconcile_revision_history()
135
136
    def _reconcile_revision_history(self):
137
        repo = self.branch.repository
138
        last_revno, last_revision_id = self.branch.last_revision_info()
4266.3.11 by Jelmer Vernooij
Support reconcile on branches with ghosts in their mainline.
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
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
146
        real_history.reverse()
147
        if last_revno != len(real_history):
148
            self.fixed_history = True
149
            # Technically for Branch5 formats, it is more efficient to use
150
            # set_revision_history, as this will regenerate it again.
151
            # Not really worth a whole BranchReconciler class just for this,
152
            # though.
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
153
            ui.ui_factory.note('Fixing last revision info %s => %s' % (
154
                 last_revno, len(real_history)))
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
155
            self.branch.set_last_revision_info(len(real_history),
156
                                               last_revision_id)
157
        else:
158
            self.fixed_history = False
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
159
            ui.ui_factory.note('revision_history ok.')
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
160
161
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
162
class RepoReconciler(object):
163
    """Reconciler that reconciles a repository.
164
2857.1.2 by Robert Collins
Review feedback.
165
    The goal of repository reconciliation is to make any derived data
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
166
    consistent with the core data committed by a user. This can involve
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
167
    reindexing, or removing unreferenced data if that can interfere with
168
    queries in a given repository.
169
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
170
    Currently this consists of an inventory reweave with revision cross-checks.
171
    """
172
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
173
    def __init__(self, repo, other=None, thorough=False):
174
        """Construct a RepoReconciler.
175
176
        :param thorough: perform a thorough check which may take longer but
177
                         will correct non-data loss issues such as incorrect
178
                         cached data.
179
        """
180
        self.garbage_inventories = 0
181
        self.inconsistent_parents = 0
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
182
        self.aborted = False
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
183
        self.repo = repo
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
184
        self.thorough = thorough
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
185
186
    def reconcile(self):
187
        """Perform reconciliation.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
188
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
189
        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.
194
        """
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
195
        operation = cleanup.OperationWithCleanups(self._reconcile)
196
        self.add_cleanup = operation.add_cleanup
197
        operation.run_simple()
198
199
    def _reconcile(self):
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
200
        self.repo.lock_write()
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
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()
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
205
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
206
    def _reconcile_steps(self):
207
        """Perform the steps to reconcile this repository."""
1692.1.3 by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
208
        self._reweave_inventory()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
209
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
210
    def _reweave_inventory(self):
1692.1.3 by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
211
        """Regenerate the inventory weave for the repository from scratch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
212
213
        This is a smart function: it will only do the reweave if doing it
1692.1.3 by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
214
        will correct data issues. The self.thorough flag controls whether
215
        only data-loss causing issues (!self.thorough) or all issues
216
        (self.thorough) are treated as requiring the reweave.
217
        """
218
        # local because needing to know about WeaveFile is a wart we want to hide
1563.2.42 by Robert Collins
Stop reconcile on weaves being quadratic.
219
        from bzrlib.weave import WeaveFile, Weave
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
220
        transaction = self.repo.get_transaction()
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
221
        self.pb.update('Reading inventory data')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
222
        self.inventory = self.repo.inventories
223
        self.revisions = self.repo.revisions
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
224
        # the total set of revisions to process
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
225
        self.pending = set([key[-1] for key in self.revisions.keys()])
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
226
227
        # mapping from revision_id to parents
228
        self._rev_graph = {}
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
229
        # errors that we detect
230
        self.inconsistent_parents = 0
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
231
        # we need the revision id of each revision and its available parents list
1570.1.10 by Robert Collins
UI tweaks to reconcile - show progress for inventory backup.
232
        self._setup_steps(len(self.pending))
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
233
        for rev_id in self.pending:
234
            # put a revision into the graph.
235
            self._graph_revision(rev_id)
1594.2.2 by Robert Collins
Trivial change to reconcile to mutter the cause of reconciliation to bzr.log
236
        self._check_garbage_inventories()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
237
        # if there are no inconsistent_parents and
1692.1.3 by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
238
        # (no garbage inventories or we are not doing a thorough check)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
239
        if (not self.inconsistent_parents and
1692.1.3 by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
240
            (not self.garbage_inventories or not self.thorough)):
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
241
            ui.ui_factory.note('Inventory ok.')
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
242
            return
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
243
        self.pb.update('Backing up inventory', 0, 0)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
244
        self.repo._backup_inventory()
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
245
        ui.ui_factory.note('Backup inventory created.')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
246
        new_inventories = self.repo._temp_inventories()
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
247
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
248
        # we have topological order of revisions and non ghost parents ready.
1570.1.10 by Robert Collins
UI tweaks to reconcile - show progress for inventory backup.
249
        self._setup_steps(len(self._rev_graph))
4577.2.4 by Maarten Bosmans
Make shure the faster topo_sort function is used where appropriate
250
        revision_keys = [(rev_id,) for rev_id in topo_sort(self._rev_graph)]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
251
        stream = self._change_inv_parents(
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
252
            self.inventory.get_record_stream(revision_keys, 'unordered', True),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
253
            self._new_inv_parents,
254
            set(revision_keys))
255
        new_inventories.insert_record_stream(stream)
256
        # if this worked, the set of new_inventories.keys should equal
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
257
        # self.pending
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
258
        if not (set(new_inventories.keys()) ==
259
            set([(revid,) for revid in self.pending])):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
260
            raise AssertionError()
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
261
        self.pb.update('Writing weave')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
262
        self.repo._activate_new_inventory()
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
263
        self.inventory = None
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
264
        ui.ui_factory.note('Inventory regenerated.')
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
265
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
266
    def _new_inv_parents(self, revision_key):
267
        """Lookup ghost-filtered parents for revision_key."""
268
        # Use the filtered ghostless parents list:
269
        return tuple([(revid,) for revid in self._rev_graph[revision_key[-1]]])
270
271
    def _change_inv_parents(self, stream, get_parents, all_revision_keys):
272
        """Adapt a record stream to reconcile the parents."""
273
        for record in stream:
274
            wanted_parents = get_parents(record.key)
275
            if wanted_parents and wanted_parents[0] not in all_revision_keys:
276
                # The check for the left most parent only handles knit
277
                # compressors, but this code only applies to knit and weave
278
                # repositories anyway.
279
                bytes = record.get_bytes_as('fulltext')
280
                yield FulltextContentFactory(record.key, wanted_parents, record.sha1, bytes)
281
            else:
282
                adapted_record = AdapterFactory(record.key, wanted_parents, record)
283
                yield adapted_record
284
            self._reweave_step('adding inventories')
285
1570.1.10 by Robert Collins
UI tweaks to reconcile - show progress for inventory backup.
286
    def _setup_steps(self, new_total):
287
        """Setup the markers we need to control the progress bar."""
288
        self.total = new_total
289
        self.count = 0
290
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
291
    def _graph_revision(self, rev_id):
292
        """Load a revision into the revision graph."""
293
        # pick a random revision
294
        # analyse revision id rev_id and put it in the stack.
295
        self._reweave_step('loading revisions')
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
296
        rev = self.repo.get_revision_reconcile(rev_id)
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
297
        parents = []
298
        for parent in rev.parent_ids:
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
299
            if self._parent_is_available(parent):
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
300
                parents.append(parent)
301
            else:
302
                mutter('found ghost %s', parent)
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
303
        self._rev_graph[rev_id] = parents
1692.1.3 by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
304
1594.2.2 by Robert Collins
Trivial change to reconcile to mutter the cause of reconciliation to bzr.log
305
    def _check_garbage_inventories(self):
306
        """Check for garbage inventories which we cannot trust
307
308
        We cant trust them because their pre-requisite file data may not
309
        be present - all we know is that their revision was not installed.
310
        """
1692.1.3 by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
311
        if not self.thorough:
312
            return
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
313
        inventories = set(self.inventory.keys())
314
        revisions = set(self.revisions.keys())
1594.2.2 by Robert Collins
Trivial change to reconcile to mutter the cause of reconciliation to bzr.log
315
        garbage = inventories.difference(revisions)
316
        self.garbage_inventories = len(garbage)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
317
        for revision_key in garbage:
318
            mutter('Garbage inventory {%s} found.', revision_key[-1])
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
319
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
320
    def _parent_is_available(self, parent):
321
        """True if parent is a fully available revision
322
323
        A fully available revision has a inventory and a revision object in the
324
        repository.
325
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
326
        if parent in self._rev_graph:
327
            return True
328
        inv_present = (1 == len(self.inventory.get_parent_map([(parent,)])))
329
        return (inv_present and self.repo.has_revision(parent))
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
330
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
331
    def _reweave_step(self, message):
332
        """Mark a single step of regeneration complete."""
333
        self.pb.update(message, self.count, self.total)
334
        self.count += 1
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
335
336
337
class KnitReconciler(RepoReconciler):
338
    """Reconciler that reconciles a knit format repository.
339
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
340
    This will detect garbage inventories and remove them in thorough mode.
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
341
    """
342
343
    def _reconcile_steps(self):
344
        """Perform the steps to reconcile this repository."""
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
345
        if self.thorough:
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
346
            try:
347
                self._load_indexes()
348
            except errors.BzrCheckError:
349
                self.aborted = True
350
                return
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
351
            # knits never suffer this
352
            self._gc_inventory()
2745.6.13 by Aaron Bentley
Misc cleanup
353
            self._fix_text_parents()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
354
355
    def _load_indexes(self):
356
        """Load indexes for the reconciliation."""
357
        self.transaction = self.repo.get_transaction()
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
358
        self.pb.update('Reading indexes', 0, 2)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
359
        self.inventory = self.repo.inventories
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
360
        self.pb.update('Reading indexes', 1, 2)
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
361
        self.repo._check_for_inconsistent_revision_parents()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
362
        self.revisions = self.repo.revisions
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
363
        self.pb.update('Reading indexes', 2, 2)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
364
365
    def _gc_inventory(self):
366
        """Remove inventories that are not referenced from the revision store."""
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
367
        self.pb.update('Checking unused inventories', 0, 1)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
368
        self._check_garbage_inventories()
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
369
        self.pb.update('Checking unused inventories', 1, 3)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
370
        if not self.garbage_inventories:
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
371
            ui.ui_factory.note('Inventory ok.')
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
372
            return
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
373
        self.pb.update('Backing up inventory', 0, 0)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
374
        self.repo._backup_inventory()
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
375
        ui.ui_factory.note('Backup Inventory created')
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
376
        # asking for '' should never return a non-empty weave
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
377
        new_inventories = self.repo._temp_inventories()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
378
        # we have topological order of revisions and non ghost parents ready.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
379
        graph = self.revisions.get_parent_map(self.revisions.keys())
4577.2.4 by Maarten Bosmans
Make shure the faster topo_sort function is used where appropriate
380
        revision_keys = topo_sort(graph)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
381
        revision_ids = [key[-1] for key in revision_keys]
382
        self._setup_steps(len(revision_keys))
383
        stream = self._change_inv_parents(
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
384
            self.inventory.get_record_stream(revision_keys, 'unordered', True),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
385
            graph.__getitem__,
386
            set(revision_keys))
387
        new_inventories.insert_record_stream(stream)
1616.1.1 by Martin Pool
[merge] robertc
388
        # if this worked, the set of new_inventory_vf.names should equal
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
389
        # the revisionds list
390
        if not(set(new_inventories.keys()) == set(revision_keys)):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
391
            raise AssertionError()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
392
        self.pb.update('Writing weave')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
393
        self.repo._activate_new_inventory()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
394
        self.inventory = None
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
395
        ui.ui_factory.note('Inventory regenerated.')
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
396
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
397
    def _fix_text_parents(self):
2745.6.13 by Aaron Bentley
Misc cleanup
398
        """Fix bad versionedfile parent entries.
399
2745.6.16 by Aaron Bentley
Update from review
400
        It is possible for the parents entry in a versionedfile entry to be
2745.6.13 by Aaron Bentley
Misc cleanup
401
        inconsistent with the values in the revision and inventory.
402
403
        This method finds entries with such inconsistencies, corrects their
404
        parent lists, and replaces the versionedfile with a corrected version.
405
        """
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
406
        transaction = self.repo.get_transaction()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
407
        versions = [key[-1] for key in self.revisions.keys()]
2927.2.2 by Andrew Bennetts
Only try to check versions that actually exist in the versioned file, and do a little more muttering.
408
        mutter('Prepopulating revision text cache with %d revisions',
409
                len(versions))
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
410
        vf_checker = self.repo._get_versioned_file_checker()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
411
        bad_parents, unused_versions = vf_checker.check_file_version_parents(
412
            self.repo.texts, self.pb)
413
        text_index = vf_checker.text_index
414
        per_id_bad_parents = {}
415
        for key in unused_versions:
416
            # Ensure that every file with unused versions gets rewritten.
417
            # NB: This is really not needed, reconcile != pack.
418
            per_id_bad_parents[key[0]] = {}
419
        # Generate per-knit/weave data.
420
        for key, details in bad_parents.iteritems():
421
            file_id = key[0]
422
            rev_id = key[1]
423
            knit_parents = tuple([parent[-1] for parent in details[0]])
424
            correct_parents = tuple([parent[-1] for parent in details[1]])
425
            file_details = per_id_bad_parents.setdefault(file_id, {})
426
            file_details[rev_id] = (knit_parents, correct_parents)
427
        file_id_versions = {}
428
        for text_key in text_index:
429
            versions_list = file_id_versions.setdefault(text_key[0], [])
430
            versions_list.append(text_key[1])
431
        # Do the reconcile of individual weaves.
432
        for num, file_id in enumerate(per_id_bad_parents):
2745.6.12 by Aaron Bentley
Do topological sorting when adding new records to VersionedFile
433
            self.pb.update('Fixing text parents', num,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
434
                           len(per_id_bad_parents))
435
            versions_with_bad_parents = per_id_bad_parents[file_id]
436
            id_unused_versions = set(key[-1] for key in unused_versions
437
                if key[0] == file_id)
438
            if file_id in file_id_versions:
439
                file_versions = file_id_versions[file_id]
440
            else:
441
                # This id was present in the disk store but is not referenced
442
                # by any revision at all.
443
                file_versions = []
444
            self._fix_text_parent(file_id, versions_with_bad_parents,
445
                 id_unused_versions, file_versions)
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
446
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
447
    def _fix_text_parent(self, file_id, versions_with_bad_parents,
448
            unused_versions, all_versions):
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
449
        """Fix bad versionedfile entries in a single versioned file."""
2927.2.2 by Andrew Bennetts
Only try to check versions that actually exist in the versioned file, and do a little more muttering.
450
        mutter('fixing text parent: %r (%d versions)', file_id,
451
                len(versions_with_bad_parents))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
452
        mutter('(%d are unused)', len(unused_versions))
453
        new_file_id = 'temp:%s' % file_id
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
454
        new_parents = {}
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
455
        needed_keys = set()
456
        for version in all_versions:
2988.1.8 by Robert Collins
Change check and reconcile to use the new _generate_text_key_index rather
457
            if version in unused_versions:
458
                continue
459
            elif version in versions_with_bad_parents:
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
460
                parents = versions_with_bad_parents[version][1]
461
            else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
462
                pmap = self.repo.texts.get_parent_map([(file_id, version)])
463
                parents = [key[-1] for key in pmap[(file_id, version)]]
464
            new_parents[(new_file_id, version)] = [
465
                (new_file_id, parent) for parent in parents]
466
            needed_keys.add((file_id, version))
467
        def fix_parents(stream):
468
            for record in stream:
469
                bytes = record.get_bytes_as('fulltext')
470
                new_key = (new_file_id, record.key[-1])
471
                parents = new_parents[new_key]
472
                yield FulltextContentFactory(new_key, parents, record.sha1, bytes)
473
        stream = self.repo.texts.get_record_stream(needed_keys, 'topological', True)
474
        self.repo._remove_file_id(new_file_id)
475
        self.repo.texts.insert_record_stream(fix_parents(stream))
476
        self.repo._remove_file_id(file_id)
477
        if len(new_parents):
478
            self.repo._move_file_id(new_file_id, file_id)
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
479
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
480
481
class PackReconciler(RepoReconciler):
482
    """Reconciler that reconciles a pack based repository.
483
484
    Garbage inventories do not affect ancestry queries, and removal is
485
    considerably more expensive as there is no separate versioned file for
486
    them, so they are not cleaned. In short it is currently a no-op.
487
488
    In future this may be a good place to hook in annotation cache checking,
489
    index recreation etc.
490
    """
491
2592.3.239 by Martin Pool
doc
492
    # XXX: The index corruption that _fix_text_parents performs is needed for
493
    # packs, but not yet implemented. The basic approach is to:
494
    #  - lock the names list
495
    #  - perform a customised pack() that regenerates data as needed
496
    #  - unlock the names list
5243.1.2 by Martin
Point launchpad links in comments at production server rather than edge
497
    # https://bugs.launchpad.net/bzr/+bug/154173
2592.3.239 by Martin Pool
doc
498
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
499
    def _reconcile_steps(self):
500
        """Perform the steps to reconcile this repository."""
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
501
        if not self.thorough:
502
            return
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
503
        collection = self.repo._pack_collection
504
        collection.ensure_loaded()
505
        collection.lock_names()
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
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:
2951.1.10 by Robert Collins
Peer review feedback with Ian.
515
                self._discard_and_save(packs)
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
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()))
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
521
2951.1.10 by Robert Collins
Peer review feedback with Ian.
522
    def _discard_and_save(self, packs):
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
523
        """Discard some packs from the repository.
524
2951.1.10 by Robert Collins
Peer review feedback with Ian.
525
        This removes them from the memory index, saves the in-memory index
526
        which makes the newly reconciled pack visible and hides the packs to be
527
        discarded, and finally renames the packs being discarded into the
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
528
        obsolete packs directory.
2951.1.10 by Robert Collins
Peer review feedback with Ian.
529
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
530
        :param packs: The packs to discard.
531
        """
532
        for pack in packs:
533
            self.repo._pack_collection._remove_pack_from_memory(pack)
534
        self.repo._pack_collection._save_pack_names()
535
        self.repo._pack_collection._obsolete_packs(packs)