/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
0.200.228 by Jelmer Vernooij
Split out map.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Map from Git sha's to Bazaar objects."""
18
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
19
from dulwich.objects import (
20
    Blob,
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
21
    sha_to_hex,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
22
    )
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
23
from dulwich.object_store import (
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
24
    BaseObjectStore,
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
25
    )
0.200.249 by Jelmer Vernooij
Implement Tree.
26
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
27
from bzrlib import (
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
28
    debug,
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
29
    errors,
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
30
    trace,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
31
    ui,
32
    )
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
33
from bzrlib.revision import (
34
    NULL_REVISION,
35
    )
0.200.228 by Jelmer Vernooij
Split out map.
36
0.200.229 by Jelmer Vernooij
More work on converter.
37
from bzrlib.plugins.git.mapping import (
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
38
    default_mapping,
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
39
    directory_to_tree,
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
40
    extract_unusual_modes,
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
41
    mapping_registry,
0.200.229 by Jelmer Vernooij
More work on converter.
42
    )
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
43
from bzrlib.plugins.git.shamap import (
0.200.750 by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps.
44
    from_repository as idmap_from_repository,
0.200.231 by Jelmer Vernooij
Partially fix pull.
45
    )
46
0.200.228 by Jelmer Vernooij
Split out map.
47
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
48
def get_object_store(repo, mapping=None):
49
    git = getattr(repo, "_git", None)
50
    if git is not None:
51
        return git.object_store
52
    return BazaarObjectStore(repo, mapping)
53
54
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
55
class BazaarObjectStore(BaseObjectStore):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
56
    """A Git-style object store backed onto a Bazaar repository."""
0.200.228 by Jelmer Vernooij
Split out map.
57
58
    def __init__(self, repository, mapping=None):
59
        self.repository = repository
60
        if mapping is None:
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
61
            self.mapping = default_mapping
0.200.228 by Jelmer Vernooij
Split out map.
62
        else:
63
            self.mapping = mapping
0.200.750 by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps.
64
        self._idmap = idmap_from_repository(repository)
0.200.735 by Jelmer Vernooij
Use convenience functions for start/stop write groups.
65
        self.start_write_group = self._idmap.start_write_group
66
        self.abort_write_group = self._idmap.abort_write_group
67
        self.commit_write_group = self._idmap.commit_write_group
0.200.228 by Jelmer Vernooij
Split out map.
68
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
69
    def _update_sha_map(self, stop_revision=None):
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
70
        graph = self.repository.get_graph()
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
71
        if stop_revision is None:
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
72
            heads = graph.heads(self.repository.all_revision_ids())
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
73
        else:
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
74
            heads = set([stop_revision])
0.200.689 by Jelmer Vernooij
Also consider todo heads.
75
        missing_revids = self._idmap.missing_revisions(heads)
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
76
        while heads:
77
            parents = graph.get_parent_map(heads)
78
            todo = set()
79
            for p in parents.values():
0.200.684 by Jelmer Vernooij
Properly close write groups.
80
                todo.update([x for x in p if x not in missing_revids])
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
81
            heads = self._idmap.missing_revisions(todo)
0.200.684 by Jelmer Vernooij
Properly close write groups.
82
            missing_revids.update(heads)
0.200.694 by Jelmer Vernooij
Avoid processing NULL_REVISION.
83
        if NULL_REVISION in missing_revids:
84
            missing_revids.remove(NULL_REVISION)
0.200.750 by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps.
85
        missing_revids = self.repository.has_revisions(missing_revids)
86
        if not missing_revids:
87
            return
0.200.735 by Jelmer Vernooij
Use convenience functions for start/stop write groups.
88
        self.start_write_group()
0.200.231 by Jelmer Vernooij
Partially fix pull.
89
        try:
0.200.733 by Jelmer Vernooij
Use start/stop commit write group.
90
            pb = ui.ui_factory.nested_progress_bar()
91
            try:
92
                for i, revid in enumerate(graph.iter_topo_order(missing_revids)):
0.200.750 by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps.
93
                    trace.mutter('processing %r', revid)
0.200.733 by Jelmer Vernooij
Use start/stop commit write group.
94
                    pb.update("updating git map", i, len(missing_revids))
95
                    self._update_sha_map_revision(revid)
96
            finally:
97
                pb.finished()
0.200.735 by Jelmer Vernooij
Use convenience functions for start/stop write groups.
98
        except:
99
            self.abort_write_group()
100
            raise
101
        else:
102
            self.commit_write_group()
0.200.229 by Jelmer Vernooij
More work on converter.
103
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
104
    def __iter__(self):
105
        self._update_sha_map()
106
        return iter(self._idmap.sha1s())
107
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
108
    def _revision_to_commit(self, rev, tree_sha):
109
        def parent_lookup(revid):
110
            try:
111
                return self._lookup_revision_sha1(revid)
112
            except errors.NoSuchRevision:
113
                trace.warning("Ignoring ghost parent %s", revid)
114
                return None
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
115
        return self.mapping.export_commit(rev, tree_sha, parent_lookup)
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
116
0.200.229 by Jelmer Vernooij
More work on converter.
117
    def _update_sha_map_revision(self, revid):
118
        inv = self.repository.get_inventory(revid)
119
        rev = self.repository.get_revision(revid)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
120
        unusual_modes = extract_unusual_modes(rev)
121
        tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
122
        commit_obj = self._revision_to_commit(rev, tree_sha)
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
123
        try:
124
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
125
        except errors.InvalidRevisionId:
126
            pass
127
        else:
128
            if foreign_revid != commit_obj.id:
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
129
                if not "fix-shamap" in debug.debug_flags:
130
                    raise AssertionError("recreated git commit had different sha1: expected %s, got %s" % (foreign_revid, commit_obj.id))
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
131
        self._idmap.add_entry(commit_obj.id, "commit", (revid, tree_sha))
0.200.229 by Jelmer Vernooij
More work on converter.
132
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
133
    def _check_expected_sha(self, expected_sha, object):
134
        if expected_sha is None:
135
            return
0.200.565 by Jelmer Vernooij
Cope with 'binary' shas.
136
        if len(expected_sha) == 40:
137
            if expected_sha != object.sha().hexdigest():
138
                raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
139
        elif len(expected_sha) == 20:
140
            if expected_sha != object.sha().digest():
141
                raise AssertionError("Invalid sha for %r: %s" % (object, sha_to_hex(expected_sha)))
142
        else:
143
            raise AssertionError("Unknown length %d for %r" % (len(expected_sha), expected_sha))
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
144
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
145
    def _get_ie_object(self, entry, inv, unusual_modes):
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
146
        if entry.kind == "directory":
0.200.750 by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps.
147
            return self._get_tree(entry.file_id, inv.revision_id, inv,
148
                unusual_modes)
0.244.1 by INADA Naoki
Fix sha1s for symlinks.
149
        elif entry.kind == "symlink":
150
            return self._get_blob_for_symlink(entry.symlink_target)
151
        elif entry.kind == "file":
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
152
            return self._get_blob_for_file(entry.file_id, entry.revision)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
153
        else:
154
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
155
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
156
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
157
        if entry.kind == "directory":
0.200.752 by Jelmer Vernooij
Actually use shagitmap again to look up trees.
158
            try:
159
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
160
            except (KeyError, NotImplementedError):
161
                ret = self._get_ie_object(entry, inv, unusual_modes)
162
                if ret is None:
163
                    # Empty directory
164
                    hexsha = None
165
                else:
166
                    hexsha = ret.id
167
                self._idmap.add_entry(hexsha, "tree",
168
                    (entry.file_id, inv.revision_id))
169
                return hexsha, ret
0.200.670 by Jelmer Vernooij
Fix symlinks.
170
        elif entry.kind in ("file", "symlink"):
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
171
            try:
172
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
173
            except KeyError:
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
174
                ret = self._get_ie_object(entry, inv, unusual_modes)
0.200.749 by Jelmer Vernooij
Avoid storing entries for trees in the cache, use blobs instead
175
                self._idmap.add_entry(ret.id, "blob", (entry.file_id,
176
                    entry.revision))
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
177
                return ret.id, ret
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
178
        else:
179
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
180
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
181
    def _get_ie_sha1(self, entry, inv, unusual_modes):
182
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
183
0.244.1 by INADA Naoki
Fix sha1s for symlinks.
184
    def _get_blob_for_symlink(self, symlink_target, expected_sha=None):
185
        """Return a Git Blob object for symlink.
186
187
        :param symlink_target: target of symlink.
188
        """
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
189
        if type(symlink_target) == unicode:
0.244.1 by INADA Naoki
Fix sha1s for symlinks.
190
            symlink_target = symlink_target.encode('utf-8')
191
        blob = Blob()
192
        blob._text = symlink_target
193
        self._check_expected_sha(expected_sha, blob)
194
        return blob
195
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
196
    def _get_blob_for_file(self, fileid, revision, expected_sha=None):
197
        """Return a Git Blob object from a fileid and revision stored in bzr.
198
199
        :param fileid: File id of the text
200
        :param revision: Revision of the text
201
        """
202
        blob = Blob()
203
        chunks = self.repository.iter_files_bytes([(fileid, revision, None)]).next()[1]
204
        blob._text = "".join(chunks)
205
        self._check_expected_sha(expected_sha, blob)
206
        return blob
207
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
208
    def _get_blob(self, fileid, revision, expected_sha=None):
0.200.236 by Jelmer Vernooij
require bzr 1.13.
209
        """Return a Git Blob object from a fileid and revision stored in bzr.
0.200.670 by Jelmer Vernooij
Fix symlinks.
210
0.200.236 by Jelmer Vernooij
require bzr 1.13.
211
        :param fileid: File id of the text
212
        :param revision: Revision of the text
213
        """
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
214
        inv = self.repository.get_inventory(revision)
215
        entry = inv[fileid]
0.244.1 by INADA Naoki
Fix sha1s for symlinks.
216
217
        if entry.kind == 'file':
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
218
            return self._get_blob_for_file(entry.file_id, entry.revision,
219
                                           expected_sha=expected_sha)
0.244.1 by INADA Naoki
Fix sha1s for symlinks.
220
        elif entry.kind == 'symlink':
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
221
            return self._get_blob_for_symlink(entry.symlink_target,
222
                                              expected_sha=expected_sha)
223
        else:
224
            raise AssertionError
0.200.229 by Jelmer Vernooij
More work on converter.
225
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
226
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
227
        """Return a Git Tree object from a file id and a revision stored in bzr.
0.200.249 by Jelmer Vernooij
Implement Tree.
228
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
229
        :param fileid: fileid in the tree.
0.200.249 by Jelmer Vernooij
Implement Tree.
230
        :param revision: Revision of the tree.
231
        """
0.200.665 by Jelmer Vernooij
Add more checks for submodules.
232
        tree = directory_to_tree(inv[fileid],
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
233
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
234
            unusual_modes)
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
235
        self._check_expected_sha(expected_sha, tree)
0.200.249 by Jelmer Vernooij
Implement Tree.
236
        return tree
0.200.229 by Jelmer Vernooij
More work on converter.
237
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
238
    def _get_commit(self, rev, tree_sha, expected_sha=None):
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
239
        commit = self._revision_to_commit(rev, tree_sha)
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
240
        self._check_expected_sha(expected_sha, commit)
241
        return commit
0.200.228 by Jelmer Vernooij
Split out map.
242
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
243
    def get_parents(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
244
        """Retrieve the parents of a Git commit by SHA1.
245
246
        :param sha: SHA1 of the commit
247
        :raises: KeyError, NotCommitError
248
        """
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
249
        return self[sha].parents
250
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
251
    def _lookup_revision_sha1(self, revid):
0.200.449 by Jelmer Vernooij
Use BazaarObjectStore to find matching SHA1s for bzr revisions.
252
        """Return the SHA1 matching a Bazaar revision."""
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
253
        if revid == NULL_REVISION:
254
            return "0" * 40
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
255
        try:
0.200.487 by Jelmer Vernooij
Prevent deep recursion if the shamap is out of date.
256
            return self._idmap.lookup_commit(revid)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
257
        except KeyError:
0.200.682 by Jelmer Vernooij
Avoid doing a full sha map update if we already know the SHA1.
258
            try:
259
                return mapping_registry.parse_revision_id(revid)[0]
260
            except errors.InvalidRevisionId:
261
                self._update_sha_map(revid)
262
                return self._idmap.lookup_commit(revid)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
263
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
264
    def get_raw(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
265
        """Get the raw representation of a Git object by SHA1.
266
267
        :param sha: SHA1 of the git object
268
        """
0.200.566 by Jelmer Vernooij
Fix ObjectStore.get_raw() .
269
        obj = self[sha]
270
        return (obj.type, obj.as_raw_string())
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
271
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
272
    def __contains__(self, sha):
273
        # See if sha is in map
274
        try:
0.200.568 by Jelmer Vernooij
Properly check that matching bzr objects exist.
275
            (type, type_data) = self._lookup_git_sha(sha)
276
            if type == "commit":
277
                return self.repository.has_revision(type_data[0])
278
            elif type == "blob":
279
                return self.repository.texts.has_version(type_data)
280
            elif type == "tree":
281
                return self.repository.has_revision(type_data[1])
282
            else:
283
                raise AssertionError("Unknown object type '%s'" % type)
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
284
        except KeyError:
285
            return False
286
        else:
287
            return True
288
289
    def _lookup_git_sha(self, sha):
290
        # See if sha is in map
291
        try:
292
            return self._idmap.lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
293
        except KeyError:
0.200.670 by Jelmer Vernooij
Fix symlinks.
294
            # if not, see if there are any unconverted revisions and add them
0.200.228 by Jelmer Vernooij
Split out map.
295
            # to the map, search for sha in map again
296
            self._update_sha_map()
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
297
            return self._idmap.lookup_git_sha(sha)
298
299
    def __getitem__(self, sha):
300
        (type, type_data) = self._lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
301
        # convert object to git object
0.200.229 by Jelmer Vernooij
More work on converter.
302
        if type == "commit":
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
303
            try:
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
304
                rev = self.repository.get_revision(type_data[0])
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
305
            except errors.NoSuchRevision:
306
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
307
                raise KeyError(sha)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
308
            return self._get_commit(rev, type_data[1], expected_sha=sha)
0.200.229 by Jelmer Vernooij
More work on converter.
309
        elif type == "blob":
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
310
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
0.200.229 by Jelmer Vernooij
More work on converter.
311
        elif type == "tree":
0.200.561 by Jelmer Vernooij
Cope with revisions pointed to by trees in the shamap disappearing.
312
            try:
313
                inv = self.repository.get_inventory(type_data[1])
314
                rev = self.repository.get_revision(type_data[1])
315
            except errors.NoSuchRevision:
316
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
317
                raise KeyError(sha)
0.200.556 by Jelmer Vernooij
Fix syntax error.
318
            unusual_modes = extract_unusual_modes(rev)
0.200.491 by Jelmer Vernooij
Cope with map for Tree objects becoming invalid.
319
            try:
0.200.749 by Jelmer Vernooij
Avoid storing entries for trees in the cache, use blobs instead
320
                return self._get_tree(type_data[0], type_data[1], inv,
321
                    unusual_modes, expected_sha=sha)
0.200.491 by Jelmer Vernooij
Cope with map for Tree objects becoming invalid.
322
            except errors.NoSuchRevision:
323
                raise KeyError(sha)
0.200.228 by Jelmer Vernooij
Split out map.
324
        else:
325
            raise AssertionError("Unknown object type '%s'" % type)