/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
1287 by Martin Pool
- update check code for weave stores and new inventories
20
from bzrlib.osutils import rename, sha_string
1 by mbp at sourcefrog
import from baz patch-364
21
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
22
def _update_store_entry(obj, obj_id, branch, store_name, store):
23
    """This is just a meta-function, which handles both revision entries
24
    and inventory entries.
25
    """
26
    from bzrlib.trace import mutter
27
    import tempfile, os, errno
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
    """
1223 by Martin Pool
- store inventories in weave
75
    raise NotImplementedError("can't update existing inventory entry")
1 by mbp at sourcefrog
import from baz patch-364
76
1104 by Martin Pool
- Add a simple UIFactory
77
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
78
def check(branch):
654 by Martin Pool
- update check command to use aaron's progress code
79
    """Run consistency checks on a branch.
705 by Martin Pool
- updated check for revision parents and sha1
80
813 by Martin Pool
doc
81
    TODO: Also check non-mainline revisions mentioned as parents.
82
83
    TODO: Check for extra files in the control directory.
654 by Martin Pool
- update check command to use aaron's progress code
84
    """
651 by Martin Pool
- clean up imports
85
    from bzrlib.trace import mutter
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
86
    from bzrlib.errors import BzrCheckError, NoSuchRevision
651 by Martin Pool
- clean up imports
87
    from bzrlib.osutils import fingerprint_file
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
88
    from bzrlib.inventory import ROOT_ID
89
    from bzrlib.branch import gen_root_id
676 by Martin Pool
- lock branch while checking
90
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
91
    branch.lock_read()
676 by Martin Pool
- lock branch while checking
92
93
    try:
705 by Martin Pool
- updated check for revision parents and sha1
94
        last_rev_id = None
676 by Martin Pool
- lock branch while checking
95
96
        missing_inventory_sha_cnt = 0
705 by Martin Pool
- updated check for revision parents and sha1
97
        missing_revision_sha_cnt = 0
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
98
        missing_revision_cnt = 0
676 by Martin Pool
- lock branch while checking
99
100
        history = branch.revision_history()
101
        revno = 0
102
        revcount = len(history)
103
1287 by Martin Pool
- update check code for weave stores and new inventories
104
        checked_text_count = 0
676 by Martin Pool
- lock branch while checking
105
1104 by Martin Pool
- Add a simple UIFactory
106
        progress = bzrlib.ui.ui_factory.progress_bar()
107
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
108
        for rev_id in history:
676 by Martin Pool
- lock branch while checking
109
            revno += 1
1104 by Martin Pool
- Add a simple UIFactory
110
            progress.update('checking revision', revno, revcount)
1097 by Martin Pool
- send trace messages out through python logging module
111
            # mutter('    revision {%s}' % rev_id)
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
112
            rev = branch.get_revision(rev_id)
113
            if rev.revision_id != rev_id:
705 by Martin Pool
- updated check for revision parents and sha1
114
                raise BzrCheckError('wrong internal revision id in revision {%s}'
115
                                    % rev_id)
116
117
            # 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
118
            if rev.parent_ids:
705 by Martin Pool
- updated check for revision parents and sha1
119
                if last_rev_id is None:
120
                    raise BzrCheckError("revision {%s} has %d parents, but is the "
121
                                        "start of the branch"
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
122
                                        % (rev_id, len(rev.parent_ids)))
123
                for parent_id in rev.parent_ids:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
124
                    if parent_id == last_rev_id:
705 by Martin Pool
- updated check for revision parents and sha1
125
                        break
126
                else:
127
                    raise BzrCheckError("previous revision {%s} not listed among "
128
                                        "parents of {%s}"
129
                                        % (last_rev_id, rev_id))
130
            elif last_rev_id:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
131
                raise BzrCheckError("revision {%s} has no parents listed "
132
                                    "but preceded by {%s}"
705 by Martin Pool
- updated check for revision parents and sha1
133
                                    % (rev_id, last_rev_id))
676 by Martin Pool
- lock branch while checking
134
135
            ## TODO: Check all the required fields are present on the revision.
136
137
            if rev.inventory_sha1:
1222 by Martin Pool
- remove some more references to inventory_id
138
                inv_sha1 = branch.get_inventory_sha1(rev_id)
676 by Martin Pool
- lock branch while checking
139
                if inv_sha1 != rev.inventory_sha1:
140
                    raise BzrCheckError('Inventory sha1 hash doesn\'t match'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
141
                        ' value in revision {%s}' % rev_id)
676 by Martin Pool
- lock branch while checking
142
            else:
143
                missing_inventory_sha_cnt += 1
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
144
                mutter("no inventory_sha1 on revision {%s}" % rev_id)
676 by Martin Pool
- lock branch while checking
145
1287 by Martin Pool
- update check code for weave stores and new inventories
146
            tree = branch.revision_tree(rev_id)
147
            inv = tree.inventory
676 by Martin Pool
- lock branch while checking
148
            seen_ids = {}
149
            seen_names = {}
150
151
            ## p('revision %d/%d file ids' % (revno, revcount))
152
            for file_id in inv:
153
                if file_id in seen_ids:
154
                    raise BzrCheckError('duplicated file_id {%s} '
155
                                        'in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
156
                                        % (file_id, rev_id))
676 by Martin Pool
- lock branch while checking
157
                seen_ids[file_id] = True
158
159
            i = 0
160
            for file_id in inv:
161
                i += 1
162
                if i & 31 == 0:
1104 by Martin Pool
- Add a simple UIFactory
163
                    progress.tick()
676 by Martin Pool
- lock branch while checking
164
165
                ie = inv[file_id]
166
167
                if ie.parent_id != None:
168
                    if ie.parent_id not in seen_ids:
169
                        raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
170
                                % (ie.parent_id, rev_id))
676 by Martin Pool
- lock branch while checking
171
172
                if ie.kind == 'file':
1287 by Martin Pool
- update check code for weave stores and new inventories
173
                    text = tree.get_file_text(file_id)
174
                    checked_text_count += 1 
175
                    if ie.text_size != len(text):
676 by Martin Pool
- lock branch while checking
176
                        raise BzrCheckError('text {%s} wrong size' % ie.text_id)
1287 by Martin Pool
- update check code for weave stores and new inventories
177
                    if ie.text_sha1 != sha_string(text):
676 by Martin Pool
- lock branch while checking
178
                        raise BzrCheckError('text {%s} wrong sha1' % ie.text_id)
179
                elif ie.kind == 'directory':
180
                    if ie.text_sha1 != None or ie.text_size != None or ie.text_id != None:
181
                        raise BzrCheckError('directory {%s} has text in revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
182
                                % (file_id, rev_id))
676 by Martin Pool
- lock branch while checking
183
1104 by Martin Pool
- Add a simple UIFactory
184
            progress.tick()
676 by Martin Pool
- lock branch while checking
185
            for path, ie in inv.iter_entries():
186
                if path in seen_names:
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
187
                    raise BzrCheckError('duplicated path %s '
676 by Martin Pool
- lock branch while checking
188
                                        'in inventory for revision {%s}'
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
189
                                        % (path, rev_id))
1287 by Martin Pool
- update check code for weave stores and new inventories
190
                seen_names[path] = True
705 by Martin Pool
- updated check for revision parents and sha1
191
            last_rev_id = rev_id
125 by mbp at sourcefrog
- check progress indicator for file texts
192
676 by Martin Pool
- lock branch while checking
193
    finally:
194
        branch.unlock()
121 by mbp at sourcefrog
- progress indicator while checking
195
1104 by Martin Pool
- Add a simple UIFactory
196
    progress.clear()
674 by Martin Pool
- check command now also checks new inventory_sha1 and
197
1287 by Martin Pool
- update check code for weave stores and new inventories
198
    note('checked %d revisions, %d file texts' % (revcount, checked_text_count))
705 by Martin Pool
- updated check for revision parents and sha1
199
    
674 by Martin Pool
- check command now also checks new inventory_sha1 and
200
    if missing_inventory_sha_cnt:
1130 by Martin Pool
- check command writes output through logging not direct
201
        note('%d revisions are missing inventory_sha1' % missing_inventory_sha_cnt)
705 by Martin Pool
- updated check for revision parents and sha1
202
1287 by Martin Pool
- update check code for weave stores and new inventories
203
    ##if missing_revision_sha_cnt:
204
    ##    note('%d parent links are missing revision_sha1' % missing_revision_sha_cnt)
705 by Martin Pool
- updated check for revision parents and sha1
205
1118 by Martin Pool
- bzr check doesn't abort when trying to read a revision that's not
206
    if missing_revision_cnt:
1130 by Martin Pool
- check command writes output through logging not direct
207
        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
208
209
    if missing_revision_cnt:
210
        print '%d revisions are mentioned but not present' % missing_revision_cnt
211
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
212
    # stub this out for now because the main bzr branch has references
213
    # to revisions that aren't present in the store -- mbp 20050804
214
#    if (missing_inventory_sha_cnt
215
#        or missing_revision_sha_cnt):
216
#        print '  (use "bzr upgrade" to fix them)'