~bzr-pqm/bzr/bzr.dev

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