~bzr-pqm/bzr/bzr.dev

1 by mbp at sourcefrog
import from baz patch-364
1
# Copyright (C) 2004, 2005 by Martin Pool
2
# Copyright (C) 2005 by Canonical Ltd
3
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
1335 by Martin Pool
doc
18
# TODO: Check ancestries are correct for every revision: includes
19
# every committed so far, and in a reasonable order.
20
1104 by Martin Pool
- Add a simple UIFactory
21
import bzrlib.ui
1130 by Martin Pool
- check command writes output through logging not direct
22
from bzrlib.trace import note, warning
1287 by Martin Pool
- update check code for weave stores and new inventories
23
from bzrlib.osutils import rename, sha_string
1 by mbp at sourcefrog
import from baz patch-364
24
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
25
def _update_store_entry(obj, obj_id, branch, store_name, store):
26
    """This is just a meta-function, which handles both revision entries
27
    and inventory entries.
28
    """
29
    from bzrlib.trace import mutter
30
    import tempfile, os, errno
31
    obj_tmp = tempfile.TemporaryFile()
32
    obj.write_xml(obj_tmp)
33
    obj_tmp.seek(0)
34
35
    tmpfd, tmp_path = tempfile.mkstemp(prefix=obj_id, suffix='.gz',
36
        dir=branch.controlfilename(store_name))
37
    os.close(tmpfd)
38
    try:
39
        orig_obj_path = branch.controlfilename([store_name, obj_id+'.gz'])
40
        # Remove the old entry out of the way
41
        rename(orig_obj_path, tmp_path)
42
        try:
43
            # TODO: We may need to handle the case where the old
44
            # entry was not compressed (and thus did not end with .gz)
45
46
            store.add(obj_tmp, obj_id) # Add the new one
47
            os.remove(tmp_path) # Remove the old name
48
            mutter('    Updated %s entry {%s}' % (store_name, obj_id))
49
        except:
50
            # On any exception, restore the old entry
51
            rename(tmp_path, orig_obj_path)
52
            raise
53
    finally:
54
        if os.path.exists(tmp_path):
55
            # Unfortunately, the next command might throw
56
            # an exception, which will mask a previous exception.
57
            os.remove(tmp_path)
58
        obj_tmp.close()
59
60
def _update_revision_entry(rev, branch):
61
    """After updating the values in a revision, make sure to
62
    write out the data, but try to do it in an atomic manner.
63
64
    :param rev:    The Revision object to store
65
    :param branch: The Branch object where this Revision is to be stored.
66
    """
67
    _update_store_entry(rev, rev.revision_id, branch,
68
            'revision-store', branch.revision_store)
69
70
def _update_inventory_entry(inv, inv_id, branch):
71
    """When an inventory has been modified (such as by adding a unique tree root)
72
    this atomically re-generates the file.
73
74
    :param inv:     The Inventory
75
    :param inv_id:  The inventory id for this inventory
76
    :param branch:  The Branch where this entry will be stored.
77
    """
1223 by Martin Pool
- store inventories in weave
78
    raise NotImplementedError("can't update existing inventory entry")
1 by mbp at sourcefrog
import from baz patch-364
79
1104 by Martin Pool
- Add a simple UIFactory
80
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
81
def check(branch):
654 by Martin Pool
- update check command to use aaron's progress code
82
    """Run consistency checks on a branch.
705 by Martin Pool
- updated check for revision parents and sha1
83
813 by Martin Pool
doc
84
    TODO: Also check non-mainline revisions mentioned as parents.
85
86
    TODO: Check for extra files in the control directory.
654 by Martin Pool
- update check command to use aaron's progress code
87
    """
651 by Martin Pool
- clean up imports
88
    from bzrlib.trace import mutter
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
89
    from bzrlib.errors import BzrCheckError, NoSuchRevision
651 by Martin Pool
- clean up imports
90
    from bzrlib.osutils import fingerprint_file
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
91
    from bzrlib.inventory import ROOT_ID
92
    from bzrlib.branch import gen_root_id
676 by Martin Pool
- lock branch while checking
93
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
94
    branch.lock_read()
676 by Martin Pool
- lock branch while checking
95
96
    try:
705 by Martin Pool
- updated check for revision parents and sha1
97
        last_rev_id = None
676 by Martin Pool
- lock branch while checking
98
99
        missing_inventory_sha_cnt = 0
705 by Martin Pool
- updated check for revision parents and sha1
100
        missing_revision_sha_cnt = 0
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
101
        missing_revision_cnt = 0
676 by Martin Pool
- lock branch while checking
102
103
        history = branch.revision_history()
104
        revno = 0
105
        revcount = len(history)
106
1287 by Martin Pool
- update check code for weave stores and new inventories
107
        checked_text_count = 0
676 by Martin Pool
- lock branch while checking
108
1104 by Martin Pool
- Add a simple UIFactory
109
        progress = bzrlib.ui.ui_factory.progress_bar()
110
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
111
        for rev_id in history:
676 by Martin Pool
- lock branch while checking
112
            revno += 1
1104 by Martin Pool
- Add a simple UIFactory
113
            progress.update('checking revision', revno, revcount)
1097 by Martin Pool
- send trace messages out through python logging module
114
            # mutter('    revision {%s}' % rev_id)
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
115
            rev = branch.get_revision(rev_id)
116
            if rev.revision_id != rev_id:
705 by Martin Pool
- updated check for revision parents and sha1
117
                raise BzrCheckError('wrong internal revision id in revision {%s}'
118
                                    % rev_id)
119
120
            # check the previous history entry is a parent of this entry
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
121
            if rev.parent_ids:
705 by Martin Pool
- updated check for revision parents and sha1
122
                if last_rev_id is None:
123
                    raise BzrCheckError("revision {%s} has %d parents, but is the "
124
                                        "start of the branch"
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
125
                                        % (rev_id, len(rev.parent_ids)))
126
                for parent_id in rev.parent_ids:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
127
                    if parent_id == last_rev_id:
705 by Martin Pool
- updated check for revision parents and sha1
128
                        break
129
                else:
130
                    raise BzrCheckError("previous revision {%s} not listed among "
131
                                        "parents of {%s}"
132
                                        % (last_rev_id, rev_id))
133
            elif last_rev_id:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
134
                raise BzrCheckError("revision {%s} has no parents listed "
135
                                    "but preceded by {%s}"
705 by Martin Pool
- updated check for revision parents and sha1
136
                                    % (rev_id, last_rev_id))
676 by Martin Pool
- lock branch while checking
137
138
            ## TODO: Check all the required fields are present on the revision.
139
140
            if rev.inventory_sha1:
1222 by Martin Pool
- remove some more references to inventory_id
141
                inv_sha1 = branch.get_inventory_sha1(rev_id)
676 by Martin Pool
- lock branch while checking
142
                if inv_sha1 != rev.inventory_sha1:
143
                    raise BzrCheckError('Inventory sha1 hash doesn\'t match'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
144
                        ' value in revision {%s}' % rev_id)
676 by Martin Pool
- lock branch while checking
145
            else:
146
                missing_inventory_sha_cnt += 1
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
147
                mutter("no inventory_sha1 on revision {%s}" % rev_id)
676 by Martin Pool
- lock branch while checking
148
1287 by Martin Pool
- update check code for weave stores and new inventories
149
            tree = branch.revision_tree(rev_id)
150
            inv = tree.inventory
676 by Martin Pool
- lock branch while checking
151
            seen_ids = {}
152
            seen_names = {}
153
154
            ## p('revision %d/%d file ids' % (revno, revcount))
155
            for file_id in inv:
156
                if file_id in seen_ids:
157
                    raise BzrCheckError('duplicated file_id {%s} '
158
                                        'in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
159
                                        % (file_id, rev_id))
676 by Martin Pool
- lock branch while checking
160
                seen_ids[file_id] = True
161
162
            i = 0
163
            for file_id in inv:
164
                i += 1
165
                if i & 31 == 0:
1104 by Martin Pool
- Add a simple UIFactory
166
                    progress.tick()
676 by Martin Pool
- lock branch while checking
167
168
                ie = inv[file_id]
169
170
                if ie.parent_id != None:
171
                    if ie.parent_id not in seen_ids:
172
                        raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
173
                                % (ie.parent_id, rev_id))
676 by Martin Pool
- lock branch while checking
174
175
                if ie.kind == 'file':
1287 by Martin Pool
- update check code for weave stores and new inventories
176
                    text = tree.get_file_text(file_id)
177
                    checked_text_count += 1 
178
                    if ie.text_size != len(text):
676 by Martin Pool
- lock branch while checking
179
                        raise BzrCheckError('text {%s} wrong size' % ie.text_id)
1287 by Martin Pool
- update check code for weave stores and new inventories
180
                    if ie.text_sha1 != sha_string(text):
676 by Martin Pool
- lock branch while checking
181
                        raise BzrCheckError('text {%s} wrong sha1' % ie.text_id)
182
                elif ie.kind == 'directory':
183
                    if ie.text_sha1 != None or ie.text_size != None or ie.text_id != None:
184
                        raise BzrCheckError('directory {%s} has text in revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
185
                                % (file_id, rev_id))
676 by Martin Pool
- lock branch while checking
186
1104 by Martin Pool
- Add a simple UIFactory
187
            progress.tick()
676 by Martin Pool
- lock branch while checking
188
            for path, ie in inv.iter_entries():
189
                if path in seen_names:
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
190
                    raise BzrCheckError('duplicated path %s '
676 by Martin Pool
- lock branch while checking
191
                                        'in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
192
                                        % (path, rev_id))
1287 by Martin Pool
- update check code for weave stores and new inventories
193
                seen_names[path] = True
705 by Martin Pool
- updated check for revision parents and sha1
194
            last_rev_id = rev_id
125 by mbp at sourcefrog
- check progress indicator for file texts
195
676 by Martin Pool
- lock branch while checking
196
    finally:
197
        branch.unlock()
121 by mbp at sourcefrog
- progress indicator while checking
198
1104 by Martin Pool
- Add a simple UIFactory
199
    progress.clear()
674 by Martin Pool
- check command now also checks new inventory_sha1 and
200
1287 by Martin Pool
- update check code for weave stores and new inventories
201
    note('checked %d revisions, %d file texts' % (revcount, checked_text_count))
705 by Martin Pool
- updated check for revision parents and sha1
202
    
674 by Martin Pool
- check command now also checks new inventory_sha1 and
203
    if missing_inventory_sha_cnt:
1130 by Martin Pool
- check command writes output through logging not direct
204
        note('%d revisions are missing inventory_sha1' % missing_inventory_sha_cnt)
705 by Martin Pool
- updated check for revision parents and sha1
205
1287 by Martin Pool
- update check code for weave stores and new inventories
206
    ##if missing_revision_sha_cnt:
207
    ##    note('%d parent links are missing revision_sha1' % missing_revision_sha_cnt)
705 by Martin Pool
- updated check for revision parents and sha1
208
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
209
    if missing_revision_cnt:
1130 by Martin Pool
- check command writes output through logging not direct
210
        note('%d revisions are mentioned but not present' % missing_revision_cnt)
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
211
212
    if missing_revision_cnt:
213
        print '%d revisions are mentioned but not present' % missing_revision_cnt
214
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
215
    # stub this out for now because the main bzr branch has references
216
    # to revisions that aren't present in the store -- mbp 20050804
217
#    if (missing_inventory_sha_cnt
218
#        or missing_revision_sha_cnt):
219
#        print '  (use "bzr upgrade" to fix them)'