~bzr-pqm/bzr/bzr.dev

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