~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
1104 by Martin Pool
- Add a simple UIFactory
18
import bzrlib.ui
1130 by Martin Pool
- check command writes output through logging not direct
19
from bzrlib.trace import note, warning
1 by mbp at sourcefrog
import from baz patch-364
20
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
21
def _update_store_entry(obj, obj_id, branch, store_name, store):
22
    """This is just a meta-function, which handles both revision entries
23
    and inventory entries.
24
    """
25
    from bzrlib.trace import mutter
26
    import tempfile, os, errno
27
    from osutils import rename
28
    obj_tmp = tempfile.TemporaryFile()
29
    obj.write_xml(obj_tmp)
30
    obj_tmp.seek(0)
31
32
    tmpfd, tmp_path = tempfile.mkstemp(prefix=obj_id, suffix='.gz',
33
        dir=branch.controlfilename(store_name))
34
    os.close(tmpfd)
35
    try:
36
        orig_obj_path = branch.controlfilename([store_name, obj_id+'.gz'])
37
        # Remove the old entry out of the way
38
        rename(orig_obj_path, tmp_path)
39
        try:
40
            # TODO: We may need to handle the case where the old
41
            # entry was not compressed (and thus did not end with .gz)
42
43
            store.add(obj_tmp, obj_id) # Add the new one
44
            os.remove(tmp_path) # Remove the old name
45
            mutter('    Updated %s entry {%s}' % (store_name, obj_id))
46
        except:
47
            # On any exception, restore the old entry
48
            rename(tmp_path, orig_obj_path)
49
            raise
50
    finally:
51
        if os.path.exists(tmp_path):
52
            # Unfortunately, the next command might throw
53
            # an exception, which will mask a previous exception.
54
            os.remove(tmp_path)
55
        obj_tmp.close()
56
57
def _update_revision_entry(rev, branch):
58
    """After updating the values in a revision, make sure to
59
    write out the data, but try to do it in an atomic manner.
60
61
    :param rev:    The Revision object to store
62
    :param branch: The Branch object where this Revision is to be stored.
63
    """
64
    _update_store_entry(rev, rev.revision_id, branch,
65
            'revision-store', branch.revision_store)
66
67
def _update_inventory_entry(inv, inv_id, branch):
68
    """When an inventory has been modified (such as by adding a unique tree root)
69
    this atomically re-generates the file.
70
71
    :param inv:     The Inventory
72
    :param inv_id:  The inventory id for this inventory
73
    :param branch:  The Branch where this entry will be stored.
74
    """
75
    _update_store_entry(inv, inv_id, branch,
76
            'inventory-store', branch.inventory_store)
1 by mbp at sourcefrog
import from baz patch-364
77
1104 by Martin Pool
- Add a simple UIFactory
78
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
79
def check(branch):
654 by Martin Pool
- update check command to use aaron's progress code
80
    """Run consistency checks on a branch.
705 by Martin Pool
- updated check for revision parents and sha1
81
813 by Martin Pool
doc
82
    TODO: Also check non-mainline revisions mentioned as parents.
83
84
    TODO: Check for extra files in the control directory.
654 by Martin Pool
- update check command to use aaron's progress code
85
    """
651 by Martin Pool
- clean up imports
86
    from bzrlib.trace import mutter
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
87
    from bzrlib.errors import BzrCheckError, NoSuchRevision
651 by Martin Pool
- clean up imports
88
    from bzrlib.osutils import fingerprint_file
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
89
    from bzrlib.inventory import ROOT_ID
90
    from bzrlib.branch import gen_root_id
676 by Martin Pool
- lock branch while checking
91
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
92
    branch.lock_read()
676 by Martin Pool
- lock branch while checking
93
94
    try:
705 by Martin Pool
- updated check for revision parents and sha1
95
        last_rev_id = None
676 by Martin Pool
- lock branch while checking
96
97
        missing_inventory_sha_cnt = 0
705 by Martin Pool
- updated check for revision parents and sha1
98
        missing_revision_sha_cnt = 0
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
99
        missing_revision_cnt = 0
676 by Martin Pool
- lock branch while checking
100
101
        history = branch.revision_history()
102
        revno = 0
103
        revcount = len(history)
819 by Martin Pool
- check command checks that all inventory-ids are the same as in the revision.
104
        mismatch_inv_id = []
676 by Martin Pool
- lock branch while checking
105
705 by Martin Pool
- updated check for revision parents and sha1
106
        # for all texts checked, text_id -> sha1
676 by Martin Pool
- lock branch while checking
107
        checked_texts = {}
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
121
            if rev.parents:
122
                if last_rev_id is None:
123
                    raise BzrCheckError("revision {%s} has %d parents, but is the "
124
                                        "start of the branch"
125
                                        % (rev_id, len(rev.parents)))
126
                for prr in rev.parents:
127
                    if prr.revision_id == last_rev_id:
128
                        break
129
                else:
130
                    raise BzrCheckError("previous revision {%s} not listed among "
131
                                        "parents of {%s}"
132
                                        % (last_rev_id, rev_id))
133
134
                for prr in rev.parents:
135
                    if prr.revision_sha1 is None:
136
                        missing_revision_sha_cnt += 1
137
                        continue
138
                    prid = prr.revision_id
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
139
                    
140
                    try:
141
                        actual_sha = branch.get_revision_sha1(prid)
142
                    except NoSuchRevision:
143
                        missing_revision_cnt += 1
144
                        mutter("parent {%s} of {%s} not present in store",
145
                               prid, rev_id)
146
                        continue
147
                        
705 by Martin Pool
- updated check for revision parents and sha1
148
                    if prr.revision_sha1 != actual_sha:
149
                        raise BzrCheckError("mismatched revision sha1 for "
150
                                            "parent {%s} of {%s}: %s vs %s"
151
                                            % (prid, rev_id,
152
                                               prr.revision_sha1, actual_sha))
153
            elif last_rev_id:
154
                raise BzrCheckError("revision {%s} has no parents listed but preceded "
155
                                    "by {%s}"
156
                                    % (rev_id, last_rev_id))
676 by Martin Pool
- lock branch while checking
157
819 by Martin Pool
- check command checks that all inventory-ids are the same as in the revision.
158
            if rev.inventory_id != rev_id:
159
                mismatch_inv_id.append(rev_id)
160
676 by Martin Pool
- lock branch while checking
161
            ## TODO: Check all the required fields are present on the revision.
162
163
            if rev.inventory_sha1:
164
                inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
165
                if inv_sha1 != rev.inventory_sha1:
166
                    raise BzrCheckError('Inventory sha1 hash doesn\'t match'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
167
                        ' value in revision {%s}' % rev_id)
676 by Martin Pool
- lock branch while checking
168
            else:
169
                missing_inventory_sha_cnt += 1
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
170
                mutter("no inventory_sha1 on revision {%s}" % rev_id)
676 by Martin Pool
- lock branch while checking
171
172
            inv = branch.get_inventory(rev.inventory_id)
173
            seen_ids = {}
174
            seen_names = {}
175
176
            ## p('revision %d/%d file ids' % (revno, revcount))
177
            for file_id in inv:
178
                if file_id in seen_ids:
179
                    raise BzrCheckError('duplicated file_id {%s} '
180
                                        'in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
181
                                        % (file_id, rev_id))
676 by Martin Pool
- lock branch while checking
182
                seen_ids[file_id] = True
183
184
            i = 0
185
            for file_id in inv:
186
                i += 1
187
                if i & 31 == 0:
1104 by Martin Pool
- Add a simple UIFactory
188
                    progress.tick()
676 by Martin Pool
- lock branch while checking
189
190
                ie = inv[file_id]
191
192
                if ie.parent_id != None:
193
                    if ie.parent_id not in seen_ids:
194
                        raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
195
                                % (ie.parent_id, rev_id))
676 by Martin Pool
- lock branch while checking
196
197
                if ie.kind == 'file':
198
                    if ie.text_id in checked_texts:
199
                        fp = checked_texts[ie.text_id]
200
                    else:
201
                        if not ie.text_id in branch.text_store:
202
                            raise BzrCheckError('text {%s} not in text_store' % ie.text_id)
203
204
                        tf = branch.text_store[ie.text_id]
205
                        fp = fingerprint_file(tf)
206
                        checked_texts[ie.text_id] = fp
207
208
                    if ie.text_size != fp['size']:
209
                        raise BzrCheckError('text {%s} wrong size' % ie.text_id)
210
                    if ie.text_sha1 != fp['sha1']:
211
                        raise BzrCheckError('text {%s} wrong sha1' % ie.text_id)
212
                elif ie.kind == 'directory':
213
                    if ie.text_sha1 != None or ie.text_size != None or ie.text_id != None:
214
                        raise BzrCheckError('directory {%s} has text in revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
215
                                % (file_id, rev_id))
676 by Martin Pool
- lock branch while checking
216
1104 by Martin Pool
- Add a simple UIFactory
217
            progress.tick()
676 by Martin Pool
- lock branch while checking
218
            for path, ie in inv.iter_entries():
219
                if path in seen_names:
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
220
                    raise BzrCheckError('duplicated path %s '
676 by Martin Pool
- lock branch while checking
221
                                        'in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
222
                                        % (path, rev_id))
543 by Martin Pool
- More cleanups for set type
223
            seen_names[path] = True
705 by Martin Pool
- updated check for revision parents and sha1
224
            last_rev_id = rev_id
125 by mbp at sourcefrog
- check progress indicator for file texts
225
676 by Martin Pool
- lock branch while checking
226
    finally:
227
        branch.unlock()
121 by mbp at sourcefrog
- progress indicator while checking
228
1104 by Martin Pool
- Add a simple UIFactory
229
    progress.clear()
674 by Martin Pool
- check command now also checks new inventory_sha1 and
230
1130 by Martin Pool
- check command writes output through logging not direct
231
    note('checked %d revisions, %d file texts' % (revcount, len(checked_texts)))
705 by Martin Pool
- updated check for revision parents and sha1
232
    
674 by Martin Pool
- check command now also checks new inventory_sha1 and
233
    if missing_inventory_sha_cnt:
1130 by Martin Pool
- check command writes output through logging not direct
234
        note('%d revisions are missing inventory_sha1' % missing_inventory_sha_cnt)
705 by Martin Pool
- updated check for revision parents and sha1
235
236
    if missing_revision_sha_cnt:
1130 by Martin Pool
- check command writes output through logging not direct
237
        note('%d parent links are missing revision_sha1' % missing_revision_sha_cnt)
705 by Martin Pool
- updated check for revision parents and sha1
238
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
239
    if missing_revision_cnt:
1130 by Martin Pool
- check command writes output through logging not direct
240
        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
241
242
    if missing_revision_cnt:
243
        print '%d revisions are mentioned but not present' % missing_revision_cnt
244
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
245
    # stub this out for now because the main bzr branch has references
246
    # to revisions that aren't present in the store -- mbp 20050804
247
#    if (missing_inventory_sha_cnt
248
#        or missing_revision_sha_cnt):
249
#        print '  (use "bzr upgrade" to fix them)'
819 by Martin Pool
- check command checks that all inventory-ids are the same as in the revision.
250
251
    if mismatch_inv_id:
1130 by Martin Pool
- check command writes output through logging not direct
252
        warning('%d revisions have mismatched inventory ids:' % len(mismatch_inv_id))
819 by Martin Pool
- check command checks that all inventory-ids are the same as in the revision.
253
        for rev_id in mismatch_inv_id:
1130 by Martin Pool
- check command writes output through logging not direct
254
            warning('  %s', rev_id)