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