~bzr-pqm/bzr/bzr.dev

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