~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 (
2745.6.16 by Aaron Bentley
Update from review
30
    errors,
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
31
    ui,
32
    repository,
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
33
    repofmt,
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
34
    )
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
35
from bzrlib.trace import mutter, note
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):
123
        self.branch.lock_write()
124
        try:
125
            self.pb = ui.ui_factory.nested_progress_bar()
126
            try:
127
                self._reconcile_steps()
128
            finally:
129
                self.pb.finished()
130
        finally:
131
            self.branch.unlock()
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
        """
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
195
        self.repo.lock_write()
196
        try:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
197
            self.pb = ui.ui_factory.nested_progress_bar()
198
            try:
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
199
                self._reconcile_steps()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
200
            finally:
201
                self.pb.finished()
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
202
        finally:
203
            self.repo.unlock()
204
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
205
    def _reconcile_steps(self):
206
        """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.
207
        self._reweave_inventory()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
208
1570.1.6 by Robert Collins
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
209
    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.
210
        """Regenerate the inventory weave for the repository from scratch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
211
212
        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.
213
        will correct data issues. The self.thorough flag controls whether
214
        only data-loss causing issues (!self.thorough) or all issues
215
        (self.thorough) are treated as requiring the reweave.
216
        """
217
        # 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.
218
        from bzrlib.weave import WeaveFile, Weave
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
219
        transaction = self.repo.get_transaction()
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
220
        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.
221
        self.inventory = self.repo.inventories
222
        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.
223
        # 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.
224
        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.
225
226
        # mapping from revision_id to parents
227
        self._rev_graph = {}
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
228
        # errors that we detect
229
        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.
230
        # 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.
231
        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.
232
        for rev_id in self.pending:
233
            # put a revision into the graph.
234
            self._graph_revision(rev_id)
1594.2.2 by Robert Collins
Trivial change to reconcile to mutter the cause of reconciliation to bzr.log
235
        self._check_garbage_inventories()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
236
        # 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.
237
        # (no garbage inventories or we are not doing a thorough check)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
238
        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.
239
            (not self.garbage_inventories or not self.thorough)):
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
240
            ui.ui_factory.note('Inventory ok.')
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
241
            return
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
242
        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.
243
        self.repo._backup_inventory()
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
244
        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.
245
        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.
246
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
247
        # 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.
248
        self._setup_steps(len(self._rev_graph))
4577.2.4 by Maarten Bosmans
Make shure the faster topo_sort function is used where appropriate
249
        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.
250
        stream = self._change_inv_parents(
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
251
            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.
252
            self._new_inv_parents,
253
            set(revision_keys))
254
        new_inventories.insert_record_stream(stream)
255
        # if this worked, the set of new_inventories.keys should equal
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
256
        # 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.
257
        if not (set(new_inventories.keys()) ==
258
            set([(revid,) for revid in self.pending])):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
259
            raise AssertionError()
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
260
        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.
261
        self.repo._activate_new_inventory()
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
262
        self.inventory = None
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
263
        ui.ui_factory.note('Inventory regenerated.')
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
264
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.
265
    def _new_inv_parents(self, revision_key):
266
        """Lookup ghost-filtered parents for revision_key."""
267
        # Use the filtered ghostless parents list:
268
        return tuple([(revid,) for revid in self._rev_graph[revision_key[-1]]])
269
270
    def _change_inv_parents(self, stream, get_parents, all_revision_keys):
271
        """Adapt a record stream to reconcile the parents."""
272
        for record in stream:
273
            wanted_parents = get_parents(record.key)
274
            if wanted_parents and wanted_parents[0] not in all_revision_keys:
275
                # The check for the left most parent only handles knit
276
                # compressors, but this code only applies to knit and weave
277
                # repositories anyway.
278
                bytes = record.get_bytes_as('fulltext')
279
                yield FulltextContentFactory(record.key, wanted_parents, record.sha1, bytes)
280
            else:
281
                adapted_record = AdapterFactory(record.key, wanted_parents, record)
282
                yield adapted_record
283
            self._reweave_step('adding inventories')
284
1570.1.10 by Robert Collins
UI tweaks to reconcile - show progress for inventory backup.
285
    def _setup_steps(self, new_total):
286
        """Setup the markers we need to control the progress bar."""
287
        self.total = new_total
288
        self.count = 0
289
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
290
    def _graph_revision(self, rev_id):
291
        """Load a revision into the revision graph."""
292
        # pick a random revision
293
        # analyse revision id rev_id and put it in the stack.
294
        self._reweave_step('loading revisions')
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
295
        rev = self.repo.get_revision_reconcile(rev_id)
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
296
        parents = []
297
        for parent in rev.parent_ids:
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
298
            if self._parent_is_available(parent):
1570.1.3 by Robert Collins
Optimise reconcilation to only hit each revision once.
299
                parents.append(parent)
300
            else:
301
                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.
302
        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.
303
1594.2.2 by Robert Collins
Trivial change to reconcile to mutter the cause of reconciliation to bzr.log
304
    def _check_garbage_inventories(self):
305
        """Check for garbage inventories which we cannot trust
306
307
        We cant trust them because their pre-requisite file data may not
308
        be present - all we know is that their revision was not installed.
309
        """
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.
310
        if not self.thorough:
311
            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.
312
        inventories = set(self.inventory.keys())
313
        revisions = set(self.revisions.keys())
1594.2.2 by Robert Collins
Trivial change to reconcile to mutter the cause of reconciliation to bzr.log
314
        garbage = inventories.difference(revisions)
315
        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.
316
        for revision_key in garbage:
317
            mutter('Garbage inventory {%s} found.', revision_key[-1])
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
318
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
319
    def _parent_is_available(self, parent):
320
        """True if parent is a fully available revision
321
322
        A fully available revision has a inventory and a revision object in the
323
        repository.
324
        """
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.
325
        if parent in self._rev_graph:
326
            return True
327
        inv_present = (1 == len(self.inventory.get_parent_map([(parent,)])))
328
        return (inv_present and self.repo.has_revision(parent))
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
329
1570.1.4 by Robert Collins
Somewhat optimised version of reconciler.
330
    def _reweave_step(self, message):
331
        """Mark a single step of regeneration complete."""
332
        self.pb.update(message, self.count, self.total)
333
        self.count += 1
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
334
335
336
class KnitReconciler(RepoReconciler):
337
    """Reconciler that reconciles a knit format repository.
338
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
339
    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.
340
    """
341
342
    def _reconcile_steps(self):
343
        """Perform the steps to reconcile this repository."""
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
344
        if self.thorough:
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
345
            try:
346
                self._load_indexes()
347
            except errors.BzrCheckError:
348
                self.aborted = True
349
                return
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
350
            # knits never suffer this
351
            self._gc_inventory()
2745.6.13 by Aaron Bentley
Misc cleanup
352
            self._fix_text_parents()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
353
354
    def _load_indexes(self):
355
        """Load indexes for the reconciliation."""
356
        self.transaction = self.repo.get_transaction()
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
357
        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.
358
        self.inventory = self.repo.inventories
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
359
        self.pb.update('Reading indexes', 1, 2)
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
360
        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.
361
        self.revisions = self.repo.revisions
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
362
        self.pb.update('Reading indexes', 2, 2)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
363
364
    def _gc_inventory(self):
365
        """Remove inventories that are not referenced from the revision store."""
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
366
        self.pb.update('Checking unused inventories', 0, 1)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
367
        self._check_garbage_inventories()
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
368
        self.pb.update('Checking unused inventories', 1, 3)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
369
        if not self.garbage_inventories:
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
370
            ui.ui_factory.note('Inventory ok.')
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
371
            return
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
372
        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.
373
        self.repo._backup_inventory()
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
374
        ui.ui_factory.note('Backup Inventory created')
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
375
        # 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.
376
        new_inventories = self.repo._temp_inventories()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
377
        # 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.
378
        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
379
        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.
380
        revision_ids = [key[-1] for key in revision_keys]
381
        self._setup_steps(len(revision_keys))
382
        stream = self._change_inv_parents(
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
383
            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.
384
            graph.__getitem__,
385
            set(revision_keys))
386
        new_inventories.insert_record_stream(stream)
1616.1.1 by Martin Pool
[merge] robertc
387
        # 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.
388
        # the revisionds list
389
        if not(set(new_inventories.keys()) == set(revision_keys)):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
390
            raise AssertionError()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
391
        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.
392
        self.repo._activate_new_inventory()
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
393
        self.inventory = None
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
394
        ui.ui_factory.note('Inventory regenerated.')
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
395
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
396
    def _fix_text_parents(self):
2745.6.13 by Aaron Bentley
Misc cleanup
397
        """Fix bad versionedfile parent entries.
398
2745.6.16 by Aaron Bentley
Update from review
399
        It is possible for the parents entry in a versionedfile entry to be
2745.6.13 by Aaron Bentley
Misc cleanup
400
        inconsistent with the values in the revision and inventory.
401
402
        This method finds entries with such inconsistencies, corrects their
403
        parent lists, and replaces the versionedfile with a corrected version.
404
        """
2745.6.11 by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML
405
        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.
406
        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.
407
        mutter('Prepopulating revision text cache with %d revisions',
408
                len(versions))
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
409
        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.
410
        bad_parents, unused_versions = vf_checker.check_file_version_parents(
411
            self.repo.texts, self.pb)
412
        text_index = vf_checker.text_index
413
        per_id_bad_parents = {}
414
        for key in unused_versions:
415
            # Ensure that every file with unused versions gets rewritten.
416
            # NB: This is really not needed, reconcile != pack.
417
            per_id_bad_parents[key[0]] = {}
418
        # Generate per-knit/weave data.
419
        for key, details in bad_parents.iteritems():
420
            file_id = key[0]
421
            rev_id = key[1]
422
            knit_parents = tuple([parent[-1] for parent in details[0]])
423
            correct_parents = tuple([parent[-1] for parent in details[1]])
424
            file_details = per_id_bad_parents.setdefault(file_id, {})
425
            file_details[rev_id] = (knit_parents, correct_parents)
426
        file_id_versions = {}
427
        for text_key in text_index:
428
            versions_list = file_id_versions.setdefault(text_key[0], [])
429
            versions_list.append(text_key[1])
430
        # Do the reconcile of individual weaves.
431
        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
432
            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.
433
                           len(per_id_bad_parents))
434
            versions_with_bad_parents = per_id_bad_parents[file_id]
435
            id_unused_versions = set(key[-1] for key in unused_versions
436
                if key[0] == file_id)
437
            if file_id in file_id_versions:
438
                file_versions = file_id_versions[file_id]
439
            else:
440
                # This id was present in the disk store but is not referenced
441
                # by any revision at all.
442
                file_versions = []
443
            self._fix_text_parent(file_id, versions_with_bad_parents,
444
                 id_unused_versions, file_versions)
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
445
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.
446
    def _fix_text_parent(self, file_id, versions_with_bad_parents,
447
            unused_versions, all_versions):
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
448
        """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.
449
        mutter('fixing text parent: %r (%d versions)', file_id,
450
                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.
451
        mutter('(%d are unused)', len(unused_versions))
452
        new_file_id = 'temp:%s' % file_id
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
453
        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.
454
        needed_keys = set()
455
        for version in all_versions:
2988.1.8 by Robert Collins
Change check and reconcile to use the new _generate_text_key_index rather
456
            if version in unused_versions:
457
                continue
458
            elif version in versions_with_bad_parents:
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
459
                parents = versions_with_bad_parents[version][1]
460
            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.
461
                pmap = self.repo.texts.get_parent_map([(file_id, version)])
462
                parents = [key[-1] for key in pmap[(file_id, version)]]
463
            new_parents[(new_file_id, version)] = [
464
                (new_file_id, parent) for parent in parents]
465
            needed_keys.add((file_id, version))
466
        def fix_parents(stream):
467
            for record in stream:
468
                bytes = record.get_bytes_as('fulltext')
469
                new_key = (new_file_id, record.key[-1])
470
                parents = new_parents[new_key]
471
                yield FulltextContentFactory(new_key, parents, record.sha1, bytes)
472
        stream = self.repo.texts.get_record_stream(needed_keys, 'topological', True)
473
        self.repo._remove_file_id(new_file_id)
474
        self.repo.texts.insert_record_stream(fix_parents(stream))
475
        self.repo._remove_file_id(file_id)
476
        if len(new_parents):
477
            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
478
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
479
480
class PackReconciler(RepoReconciler):
481
    """Reconciler that reconciles a pack based repository.
482
483
    Garbage inventories do not affect ancestry queries, and removal is
484
    considerably more expensive as there is no separate versioned file for
485
    them, so they are not cleaned. In short it is currently a no-op.
486
487
    In future this may be a good place to hook in annotation cache checking,
488
    index recreation etc.
489
    """
490
2592.3.239 by Martin Pool
doc
491
    # XXX: The index corruption that _fix_text_parents performs is needed for
492
    # packs, but not yet implemented. The basic approach is to:
493
    #  - lock the names list
494
    #  - perform a customised pack() that regenerates data as needed
495
    #  - unlock the names list
496
    # https://bugs.edge.launchpad.net/bzr/+bug/154173
497
2592.3.80 by Robert Collins
Make reconcile work, and pass tests.
498
    def _reconcile_steps(self):
499
        """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.
500
        if not self.thorough:
501
            return
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
502
        collection = self.repo._pack_collection
503
        collection.ensure_loaded()
504
        collection.lock_names()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
505
        try:
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
506
            packs = collection.all_packs()
507
            all_revisions = self.repo.all_revision_ids()
508
            total_inventories = len(list(
509
                collection.inventory_index.combined_index.iter_all_entries()))
510
            if len(all_revisions):
4245.1.1 by Ian Clatworthy
minor test clean-ups & _reconcile_pack API
511
                new_pack =  self.repo._reconcile_pack(collection, packs,
512
                    ".reconcile", all_revisions, self.pb)
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
513
                if new_pack is not None:
2951.1.10 by Robert Collins
Peer review feedback with Ian.
514
                    self._discard_and_save(packs)
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
515
            else:
516
                # only make a new pack when there is data to copy.
2951.1.10 by Robert Collins
Peer review feedback with Ian.
517
                self._discard_and_save(packs)
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
518
            self.garbage_inventories = total_inventories - len(list(
519
                collection.inventory_index.combined_index.iter_all_entries()))
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
520
        finally:
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
521
            collection._unlock_names()
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)