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