← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-20 18:55:04 UTC
  • mfrom: (4971.2.2 505762)
  • Revision ID: pqm@pqm.ubuntu.com-20100120185504-es1x5ntwauunwxvp
(nmb) Explain bound branches in "branches" help topic

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
from bzrlib import (
30
30
    cleanup,
31
31
    errors,
32
 
    revision as _mod_revision,
33
32
    ui,
 
33
    repository,
34
34
    )
35
35
from bzrlib.trace import mutter
36
36
from bzrlib.tsort import topo_sort
37
37
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
38
38
 
39
39
 
40
 
def reconcile(dir, canonicalize_chks=False):
 
40
def reconcile(dir, other=None):
41
41
    """Reconcile the data in dir.
42
42
 
43
43
    Currently this is limited to a inventory 'reweave'.
47
47
    Directly using Reconciler is recommended for library users that
48
48
    desire fine grained control or analysis of the found issues.
49
49
 
50
 
    :param canonicalize_chks: Make sure CHKs are in canonical form.
 
50
    :param other: another bzrdir to reconcile against.
51
51
    """
52
 
    reconciler = Reconciler(dir, canonicalize_chks=canonicalize_chks)
 
52
    reconciler = Reconciler(dir, other=other)
53
53
    reconciler.reconcile()
54
54
 
55
55
 
56
56
class Reconciler(object):
57
57
    """Reconcilers are used to reconcile existing data."""
58
58
 
59
 
    def __init__(self, dir, other=None, canonicalize_chks=False):
 
59
    def __init__(self, dir, other=None):
60
60
        """Create a Reconciler."""
61
61
        self.bzrdir = dir
62
 
        self.canonicalize_chks = canonicalize_chks
63
62
 
64
63
    def reconcile(self):
65
64
        """Perform reconciliation.
66
65
 
67
66
        After reconciliation the following attributes document found issues:
68
 
 
69
 
        * `inconsistent_parents`: The number of revisions in the repository
70
 
          whose ancestry was being reported incorrectly.
71
 
        * `garbage_inventories`: The number of inventory objects without
72
 
          revisions that were garbage collected.
73
 
        * `fixed_branch_history`: None if there was no branch, False if the
74
 
          branch history was correct, True if the branch history needed to be
75
 
          re-normalized.
 
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.
 
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.
76
74
        """
77
75
        self.pb = ui.ui_factory.nested_progress_bar()
78
76
        try:
99
97
    def _reconcile_repository(self):
100
98
        self.repo = self.bzrdir.find_repository()
101
99
        ui.ui_factory.note('Reconciling repository %s' %
102
 
            self.repo.user_url)
 
100
            self.repo.bzrdir.root_transport.base)
103
101
        self.pb.update("Reconciling repository", 0, 1)
104
 
        if self.canonicalize_chks:
105
 
            try:
106
 
                self.repo.reconcile_canonicalize_chks
107
 
            except AttributeError:
108
 
                raise errors.BzrError(
109
 
                    "%s cannot canonicalize CHKs." % (self.repo,))
110
 
            repo_reconciler = self.repo.reconcile_canonicalize_chks()
111
 
        else:
112
 
            repo_reconciler = self.repo.reconcile(thorough=True)
 
102
        repo_reconciler = self.repo.reconcile(thorough=True)
113
103
        self.inconsistent_parents = repo_reconciler.inconsistent_parents
114
104
        self.garbage_inventories = repo_reconciler.garbage_inventories
115
105
        if repo_reconciler.aborted:
145
135
        self._reconcile_revision_history()
146
136
 
147
137
    def _reconcile_revision_history(self):
 
138
        repo = self.branch.repository
148
139
        last_revno, last_revision_id = self.branch.last_revision_info()
149
140
        real_history = []
150
 
        graph = self.branch.repository.get_graph()
151
141
        try:
152
 
            for revid in graph.iter_lefthand_ancestry(
153
 
                    last_revision_id, (_mod_revision.NULL_REVISION,)):
 
142
            for revid in repo.iter_reverse_revision_history(
 
143
                    last_revision_id):
154
144
                real_history.append(revid)
155
145
        except errors.RevisionNotPresent:
156
146
            pass # Hit a ghost left hand parent
198
188
        """Perform reconciliation.
199
189
 
200
190
        After reconciliation the following attributes document found issues:
201
 
 
202
 
        * `inconsistent_parents`: The number of revisions in the repository
203
 
          whose ancestry was being reported incorrectly.
204
 
        * `garbage_inventories`: The number of inventory objects without
205
 
          revisions that were garbage collected.
 
191
        inconsistent_parents: The number of revisions in the repository whose
 
192
                              ancestry was being reported incorrectly.
 
193
        garbage_inventories: The number of inventory objects without revisions
 
194
                             that were garbage collected.
206
195
        """
207
196
        operation = cleanup.OperationWithCleanups(self._reconcile)
208
197
        self.add_cleanup = operation.add_cleanup
227
216
        only data-loss causing issues (!self.thorough) or all issues
228
217
        (self.thorough) are treated as requiring the reweave.
229
218
        """
 
219
        # local because needing to know about WeaveFile is a wart we want to hide
 
220
        from bzrlib.weave import WeaveFile, Weave
230
221
        transaction = self.repo.get_transaction()
231
222
        self.pb.update('Reading inventory data')
232
223
        self.inventory = self.repo.inventories
504
495
    #  - lock the names list
505
496
    #  - perform a customised pack() that regenerates data as needed
506
497
    #  - unlock the names list
507
 
    # https://bugs.launchpad.net/bzr/+bug/154173
508
 
 
509
 
    def __init__(self, repo, other=None, thorough=False,
510
 
            canonicalize_chks=False):
511
 
        super(PackReconciler, self).__init__(repo, other=other,
512
 
            thorough=thorough)
513
 
        self.canonicalize_chks = canonicalize_chks
 
498
    # https://bugs.edge.launchpad.net/bzr/+bug/154173
514
499
 
515
500
    def _reconcile_steps(self):
516
501
        """Perform the steps to reconcile this repository."""
525
510
        total_inventories = len(list(
526
511
            collection.inventory_index.combined_index.iter_all_entries()))
527
512
        if len(all_revisions):
528
 
            if self.canonicalize_chks:
529
 
                reconcile_meth = self.repo._canonicalize_chks_pack
530
 
            else:
531
 
                reconcile_meth = self.repo._reconcile_pack
532
 
            new_pack = reconcile_meth(collection, packs, ".reconcile",
533
 
                all_revisions, self.pb)
 
513
            new_pack =  self.repo._reconcile_pack(collection, packs,
 
514
                ".reconcile", all_revisions, self.pb)
534
515
            if new_pack is not None:
535
516
                self._discard_and_save(packs)
536
517
        else: