/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.784 by Jelmer Vernooij
Use common object generation code in push.
21
    Tree,
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
22
    sha_to_hex,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
23
    )
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
24
from dulwich.object_store import (
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
25
    BaseObjectStore,
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
26
    )
0.200.249 by Jelmer Vernooij
Implement Tree.
27
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
28
from bzrlib import (
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
29
    errors,
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
30
    lru_cache,
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
31
    trace,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
32
    ui,
0.200.773 by Jelmer Vernooij
Implement inventory_to_objects
33
    urlutils,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
34
    )
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
35
from bzrlib.revision import (
36
    NULL_REVISION,
37
    )
0.200.228 by Jelmer Vernooij
Split out map.
38
0.200.229 by Jelmer Vernooij
More work on converter.
39
from bzrlib.plugins.git.mapping import (
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
40
    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.
41
    directory_to_tree,
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
42
    extract_unusual_modes,
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
43
    mapping_registry,
0.200.795 by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once.
44
    symlink_to_blob,
0.200.229 by Jelmer Vernooij
More work on converter.
45
    )
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
46
from bzrlib.plugins.git.shamap import (
0.200.842 by Jelmer Vernooij
Allow content cache to be provided.
47
    from_repository as cache_from_repository,
0.200.231 by Jelmer Vernooij
Partially fix pull.
48
    )
49
0.200.228 by Jelmer Vernooij
Split out map.
50
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
51
def get_object_store(repo, mapping=None):
52
    git = getattr(repo, "_git", None)
53
    if git is not None:
54
        return git.object_store
55
    return BazaarObjectStore(repo, mapping)
56
57
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
58
MAX_TREE_CACHE_SIZE = 50 * 1024 * 1024
59
60
61
class LRUTreeCache(object):
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
62
63
    def __init__(self, repository):
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
64
        def approx_tree_size(tree):
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
65
            # Very rough estimate, 1k per inventory entry
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
66
            return len(tree.inventory) * 1024
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
67
        self.repository = repository
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
68
        self._cache = lru_cache.LRUSizeCache(max_size=MAX_TREE_CACHE_SIZE,
69
            after_cleanup_size=None, compute_size=approx_tree_size)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
70
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
71
    def revision_tree(self, revid):            
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
72
        try:
73
            return self._cache[revid] 
74
        except KeyError:
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
75
            tree = self.repository.revision_tree(revid)
76
            self.add(tree)
77
            return tree
78
79
    def iter_revision_trees(self, revids):
80
        trees = dict([(k, self._cache.get(k)) for k in revids]) 
81
        for tree in self.repository.revision_trees(
82
                [r for r, v in trees.iteritems() if v is None]):
83
            trees[tree.get_revision_id()] = tree
84
            self.add(tree)
85
        return (trees[r] for r in revids)
86
87
    def revision_trees(self, revids):
88
        return list(self.iter_revision_trees(revids))
89
90
    def add(self, tree):
91
        self._cache.add(tree.get_revision_id(), tree)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
92
93
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
94
def _check_expected_sha(expected_sha, object):
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
95
    """Check whether an object matches an expected SHA.
96
97
    :param expected_sha: None or expected SHA as either binary or as hex digest
98
    :param object: Object to verify
99
    """
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
100
    if expected_sha is None:
101
        return
102
    if len(expected_sha) == 40:
103
        if expected_sha != object.sha().hexdigest():
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
104
            raise AssertionError("Invalid sha for %r: %s" % (object,
105
                expected_sha))
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
106
    elif len(expected_sha) == 20:
107
        if expected_sha != object.sha().digest():
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
108
            raise AssertionError("Invalid sha for %r: %s" % (object,
109
                sha_to_hex(expected_sha)))
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
110
    else:
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
111
        raise AssertionError("Unknown length %d for %r" % (len(expected_sha),
112
            expected_sha))
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
113
114
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
115
def _tree_to_objects(tree, parent_trees, idmap,
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
116
        unusual_modes, iter_files_bytes, has_ghost_parents):
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
117
    """Iterate over the objects that were introduced in a revision.
118
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
119
    :param idmap: id map
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
120
    :param unusual_modes: Unusual file modes
121
    :param iter_files_bytes: Repository.iter_files_bytes-like callback
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
122
    :return: Yields (path, object, ie) entries
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
123
    """
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
124
    inv = tree.inventory
125
    parent_invs = [t.inventory for t in parent_trees]
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
126
    new_trees = {}
127
    new_blobs = []
128
    shamap = {}
129
    for path, ie in inv.entries():
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
130
        if ie.kind == "file":
0.200.800 by Jelmer Vernooij
Simplify object generation code a bit.
131
            if ie.revision != inv.revision_id:
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
132
                for pinv in parent_invs:
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
133
                    try:
134
                        pie = pinv[ie.file_id]
135
                    except errors.NoSuchId:
136
                        pass
137
                    else:
0.200.800 by Jelmer Vernooij
Simplify object generation code a bit.
138
                        if (pie.text_sha1 == ie.text_sha1 and 
139
                            pie.kind == ie.kind):
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
140
                            shamap[ie.file_id] = idmap.lookup_blob_id(
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
141
                                pie.file_id, pie.revision)
142
                            break
0.200.800 by Jelmer Vernooij
Simplify object generation code a bit.
143
            if not ie.file_id in shamap:
144
                new_blobs.append((path, ie))
145
                new_trees[urlutils.dirname(path)] = ie.parent_id
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
146
        elif ie.kind == "symlink":
147
            blob = symlink_to_blob(ie)
148
            for pinv in parent_invs:
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
149
                try:
150
                    pie = pinv[ie.file_id]
151
                except errors.NoSuchId:
152
                    pass
153
                else:
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
154
                    if (ie.kind == pie.kind and
155
                        ie.symlink_target == pie.symlink_target):
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
156
                        break
157
            else:
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
158
                yield path, blob, ie
0.200.801 by Jelmer Vernooij
Avoid creating trees again when they contain unchanged symlinks.
159
                new_trees[urlutils.dirname(path)] = ie.parent_id
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
160
            shamap[ie.file_id] = blob.id
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
161
        elif ie.kind == "directory":
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
162
            for pinv in parent_invs:
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
163
                try:
164
                    pie = pinv[ie.file_id]
165
                except errors.NoSuchId:
166
                    pass
167
                else:
168
                    if (pie.kind == ie.kind and 
169
                        pie.children.keys() == ie.children.keys()):
170
                        try:
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
171
                            shamap[ie.file_id] = idmap.lookup_tree_id(
0.200.844 by Jelmer Vernooij
Add infrastructure for multiple cache formats.
172
                                ie.file_id, inv.revision_id)
0.200.812 by Jelmer Vernooij
Catch KeyError from lookup_tree as well - some caches (such as sqlite) don't store all trees, only some.
173
                        except (NotImplementedError, KeyError):
0.200.804 by Jelmer Vernooij
Remove overly optimistic optimization.
174
                            pass
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
175
                        else:
176
                            break
177
            else:
178
                new_trees[path] = ie.file_id
179
        else:
180
            raise AssertionError(ie.kind)
181
    
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
182
    for (path, ie), chunks in iter_files_bytes(
0.200.844 by Jelmer Vernooij
Add infrastructure for multiple cache formats.
183
        [(ie.file_id, ie.revision, (path, ie))
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
184
            for (path, ie) in new_blobs]):
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
185
        obj = Blob()
0.200.851 by Jelmer Vernooij
Use blob.chunked.
186
        obj.chunked = chunks
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
187
        yield path, obj, ie
188
        shamap[ie.file_id] = obj.id
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
189
190
    for fid in unusual_modes:
191
        new_trees[inv.id2path(fid)] = inv[fid].parent_id
192
    
193
    trees = {}
194
    while new_trees:
195
        items = new_trees.items()
196
        new_trees = {}
197
        for path, file_id in items:
198
            parent_id = inv[file_id].parent_id
199
            if parent_id is not None:
200
                parent_path = urlutils.dirname(path)
201
                new_trees[parent_path] = parent_id
202
            trees[path] = file_id
203
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
204
    def ie_to_hexsha(ie):
205
        try:
206
            return shamap[ie.file_id]
207
        except KeyError:
208
            # Not all cache backends store the tree information, 
209
            # calculate again from scratch
210
            ret = directory_to_tree(ie, ie_to_hexsha, unusual_modes)
211
            if ret is None:
212
                return ret
213
            return ret.id
214
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
215
    for path in sorted(trees.keys(), reverse=True):
216
        ie = inv[trees[path]]
217
        assert ie.kind == "directory"
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
218
        obj = directory_to_tree(ie, ie_to_hexsha, unusual_modes)
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
219
        if obj is not None:
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
220
            yield path, obj, ie
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
221
            shamap[ie.file_id] = obj.id
222
223
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
224
class BazaarObjectStore(BaseObjectStore):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
225
    """A Git-style object store backed onto a Bazaar repository."""
0.200.228 by Jelmer Vernooij
Split out map.
226
227
    def __init__(self, repository, mapping=None):
228
        self.repository = repository
229
        if mapping is None:
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
230
            self.mapping = default_mapping
0.200.228 by Jelmer Vernooij
Split out map.
231
        else:
232
            self.mapping = mapping
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
233
        self._cache = cache_from_repository(repository)
0.200.842 by Jelmer Vernooij
Allow content cache to be provided.
234
        self._content_cache_types = ("tree")
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
235
        self.start_write_group = self._cache.idmap.start_write_group
236
        self.abort_write_group = self._cache.idmap.abort_write_group
237
        self.commit_write_group = self._cache.idmap.commit_write_group
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
238
        self.tree_cache = LRUTreeCache(self.repository)
0.200.228 by Jelmer Vernooij
Split out map.
239
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
240
    def _update_sha_map(self, stop_revision=None):
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
241
        graph = self.repository.get_graph()
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
242
        if stop_revision is None:
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
243
            heads = graph.heads(self.repository.all_revision_ids())
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
244
        else:
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
245
            heads = set([stop_revision])
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
246
        missing_revids = self._cache.idmap.missing_revisions(heads)
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
247
        while heads:
248
            parents = graph.get_parent_map(heads)
249
            todo = set()
250
            for p in parents.values():
0.200.684 by Jelmer Vernooij
Properly close write groups.
251
                todo.update([x for x in p if x not in missing_revids])
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
252
            heads = self._cache.idmap.missing_revisions(todo)
0.200.684 by Jelmer Vernooij
Properly close write groups.
253
            missing_revids.update(heads)
0.200.694 by Jelmer Vernooij
Avoid processing NULL_REVISION.
254
        if NULL_REVISION in missing_revids:
255
            missing_revids.remove(NULL_REVISION)
0.200.750 by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps.
256
        missing_revids = self.repository.has_revisions(missing_revids)
257
        if not missing_revids:
258
            return
0.200.735 by Jelmer Vernooij
Use convenience functions for start/stop write groups.
259
        self.start_write_group()
0.200.231 by Jelmer Vernooij
Partially fix pull.
260
        try:
0.200.733 by Jelmer Vernooij
Use start/stop commit write group.
261
            pb = ui.ui_factory.nested_progress_bar()
262
            try:
263
                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.
264
                    trace.mutter('processing %r', revid)
0.200.733 by Jelmer Vernooij
Use start/stop commit write group.
265
                    pb.update("updating git map", i, len(missing_revids))
266
                    self._update_sha_map_revision(revid)
267
            finally:
268
                pb.finished()
0.200.735 by Jelmer Vernooij
Use convenience functions for start/stop write groups.
269
        except:
270
            self.abort_write_group()
271
            raise
272
        else:
273
            self.commit_write_group()
0.200.229 by Jelmer Vernooij
More work on converter.
274
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
275
    def __iter__(self):
276
        self._update_sha_map()
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
277
        return iter(self._cache.idmap.sha1s())
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
278
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
279
    def _revision_to_commit(self, rev, tree_sha):
280
        def parent_lookup(revid):
281
            try:
282
                return self._lookup_revision_sha1(revid)
283
            except errors.NoSuchRevision:
284
                trace.warning("Ignoring ghost parent %s", revid)
285
                return None
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
286
        return self.mapping.export_commit(rev, tree_sha, parent_lookup)
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
287
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
288
    def _revision_to_objects(self, rev, tree):
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
289
        unusual_modes = extract_unusual_modes(rev)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
290
        present_parents = self.repository.has_revisions(rev.parent_ids)
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
291
        has_ghost_parents = (len(rev.parent_ids) < len(present_parents))
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
292
        parent_trees = self.tree_cache.revision_trees(
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
293
            [p for p in rev.parent_ids if p in present_parents])
0.200.773 by Jelmer Vernooij
Implement inventory_to_objects
294
        tree_sha = None
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
295
        for path, obj, ie in _tree_to_objects(tree, parent_trees,
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
296
                self._cache.idmap, unusual_modes,
0.200.799 by Jelmer Vernooij
Add trivial object store tests.
297
                self.repository.iter_files_bytes, has_ghost_parents):
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
298
            yield path, obj, ie
0.200.773 by Jelmer Vernooij
Implement inventory_to_objects
299
            if path == "":
300
                tree_sha = obj.id
0.200.784 by Jelmer Vernooij
Use common object generation code in push.
301
        if tree_sha is None:
302
            if not rev.parent_ids:
303
                tree_sha = Tree().id
304
            else:
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
305
                raise AssertionError
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
306
        commit_obj = self._revision_to_commit(rev, tree_sha)
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
307
        try:
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
308
            foreign_revid, mapping = mapping_registry.parse_revision_id(
309
                rev.revision_id)
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
310
        except errors.InvalidRevisionId:
311
            pass
312
        else:
0.200.794 by Jelmer Vernooij
Use _check_expected_sha rather than custom checks.
313
            _check_expected_sha(foreign_revid, commit_obj)
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
314
        yield None, commit_obj, None
0.200.783 by Jelmer Vernooij
Move object generation into a separate function.
315
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
316
    def _get_updater(self, rev):
0.200.849 by Jelmer Vernooij
Allow cache backends to decide when to add entries rather than adding once per commit.
317
        return self._cache.get_updater(rev)
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
318
0.200.783 by Jelmer Vernooij
Move object generation into a separate function.
319
    def _update_sha_map_revision(self, revid):
320
        rev = self.repository.get_revision(revid)
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
321
        tree = self.tree_cache.revision_tree(rev.revision_id)
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
322
        updater = self._get_updater(rev)
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
323
        for path, obj, ie in self._revision_to_objects(rev, tree):
0.200.844 by Jelmer Vernooij
Add infrastructure for multiple cache formats.
324
            updater.add_object(obj, ie)
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
325
        commit_obj = updater.finish()
0.200.781 by Jelmer Vernooij
Return commit id after converting a revision.
326
        return commit_obj.id
0.200.229 by Jelmer Vernooij
More work on converter.
327
0.200.796 by Jelmer Vernooij
Avoid doing get_inventory calls if they can be avoided.
328
    def _get_blob(self, fileid, revision, expected_sha):
0.200.236 by Jelmer Vernooij
require bzr 1.13.
329
        """Return a Git Blob object from a fileid and revision stored in bzr.
0.200.670 by Jelmer Vernooij
Fix symlinks.
330
0.200.236 by Jelmer Vernooij
require bzr 1.13.
331
        :param fileid: File id of the text
332
        :param revision: Revision of the text
333
        """
0.200.796 by Jelmer Vernooij
Avoid doing get_inventory calls if they can be avoided.
334
        blob = Blob()
335
        chunks = self.repository.iter_files_bytes([(fileid, revision, None)]).next()[1]
0.200.851 by Jelmer Vernooij
Use blob.chunked.
336
        blob.chunked = chunks
0.200.796 by Jelmer Vernooij
Avoid doing get_inventory calls if they can be avoided.
337
        if blob.id != expected_sha:
338
            # Perhaps it's a symlink ?
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
339
            tree = self.tree_cache.revision_tree(revision)
340
            entry = tree.inventory[fileid]
0.200.796 by Jelmer Vernooij
Avoid doing get_inventory calls if they can be avoided.
341
            assert entry.kind == 'symlink'
0.200.795 by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once.
342
            blob = symlink_to_blob(entry)
343
        _check_expected_sha(expected_sha, blob)
344
        return blob
0.200.229 by Jelmer Vernooij
More work on converter.
345
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
346
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
347
        """Return a Git Tree object from a file id and a revision stored in bzr.
0.200.249 by Jelmer Vernooij
Implement Tree.
348
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
349
        :param fileid: fileid in the tree.
0.200.249 by Jelmer Vernooij
Implement Tree.
350
        :param revision: Revision of the tree.
351
        """
0.200.776 by Jelmer Vernooij
Remove unnecessary lookups.
352
        def get_ie_sha1(entry):
353
            if entry.kind == "directory":
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
354
                try:
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
355
                    return self._cache.idmap.lookup_tree_id(entry.file_id)
0.200.812 by Jelmer Vernooij
Catch KeyError from lookup_tree as well - some caches (such as sqlite) don't store all trees, only some.
356
                except (NotImplementedError, KeyError):
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
357
                    obj = self._get_tree(entry.file_id, revid, inv,
358
                        unusual_modes)
359
                    if obj is None:
360
                        return None
361
                    else:
362
                        return obj.id
0.200.776 by Jelmer Vernooij
Remove unnecessary lookups.
363
            elif entry.kind in ("file", "symlink"):
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
364
                return self._cache.idmap.lookup_blob_id(entry.file_id, entry.revision)
0.200.776 by Jelmer Vernooij
Remove unnecessary lookups.
365
            else:
366
                raise AssertionError("unknown entry kind '%s'" % entry.kind)
367
        tree = directory_to_tree(inv[fileid], get_ie_sha1, unusual_modes)
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
368
        _check_expected_sha(expected_sha, tree)
0.200.249 by Jelmer Vernooij
Implement Tree.
369
        return tree
0.200.229 by Jelmer Vernooij
More work on converter.
370
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
371
    def get_parents(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
372
        """Retrieve the parents of a Git commit by SHA1.
373
374
        :param sha: SHA1 of the commit
375
        :raises: KeyError, NotCommitError
376
        """
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
377
        return self[sha].parents
378
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
379
    def _lookup_revision_sha1(self, revid):
0.200.449 by Jelmer Vernooij
Use BazaarObjectStore to find matching SHA1s for bzr revisions.
380
        """Return the SHA1 matching a Bazaar revision."""
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
381
        if revid == NULL_REVISION:
382
            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.
383
        try:
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
384
            return self._cache.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.
385
        except KeyError:
0.200.682 by Jelmer Vernooij
Avoid doing a full sha map update if we already know the SHA1.
386
            try:
387
                return mapping_registry.parse_revision_id(revid)[0]
388
            except errors.InvalidRevisionId:
389
                self._update_sha_map(revid)
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
390
                return self._cache.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.
391
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
392
    def get_raw(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
393
        """Get the raw representation of a Git object by SHA1.
394
395
        :param sha: SHA1 of the git object
396
        """
0.200.566 by Jelmer Vernooij
Fix ObjectStore.get_raw() .
397
        obj = self[sha]
398
        return (obj.type, obj.as_raw_string())
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
399
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
400
    def __contains__(self, sha):
401
        # See if sha is in map
402
        try:
0.200.568 by Jelmer Vernooij
Properly check that matching bzr objects exist.
403
            (type, type_data) = self._lookup_git_sha(sha)
404
            if type == "commit":
405
                return self.repository.has_revision(type_data[0])
406
            elif type == "blob":
407
                return self.repository.texts.has_version(type_data)
408
            elif type == "tree":
409
                return self.repository.has_revision(type_data[1])
410
            else:
411
                raise AssertionError("Unknown object type '%s'" % type)
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
412
        except KeyError:
413
            return False
414
415
    def _lookup_git_sha(self, sha):
416
        # See if sha is in map
417
        try:
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
418
            return self._cache.idmap.lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
419
        except KeyError:
0.200.670 by Jelmer Vernooij
Fix symlinks.
420
            # if not, see if there are any unconverted revisions and add them
0.200.228 by Jelmer Vernooij
Split out map.
421
            # to the map, search for sha in map again
422
            self._update_sha_map()
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
423
            return self._cache.idmap.lookup_git_sha(sha)
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
424
425
    def __getitem__(self, sha):
0.200.849 by Jelmer Vernooij
Allow cache backends to decide when to add entries rather than adding once per commit.
426
        if self._cache.content_cache is not None:
0.200.840 by Jelmer Vernooij
Support using content cache.
427
            try:
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
428
                return self._cache.content_cache[sha]
0.200.840 by Jelmer Vernooij
Support using content cache.
429
            except KeyError:
430
                pass
0.200.850 by Jelmer Vernooij
Fix tests.
431
        (type, type_data) = self._lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
432
        # convert object to git object
0.200.229 by Jelmer Vernooij
More work on converter.
433
        if type == "commit":
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
434
            (revid, tree_sha) = type_data
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
435
            try:
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
436
                rev = self.repository.get_revision(revid)
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
437
            except errors.NoSuchRevision:
0.200.836 by Jelmer Vernooij
Allow content cache.
438
                trace.mutter('entry for %s %s in shamap: %r, but not found in '
439
                             'repository', type, sha, type_data)
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
440
                raise KeyError(sha)
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
441
            commit = self._revision_to_commit(rev, tree_sha)
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
442
            _check_expected_sha(sha, commit)
0.200.785 by Jelmer Vernooij
Eliminate _get_commit.
443
            return commit
0.200.229 by Jelmer Vernooij
More work on converter.
444
        elif type == "blob":
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
445
            (fileid, revision) = type_data
446
            return self._get_blob(fileid, revision, expected_sha=sha)
0.200.229 by Jelmer Vernooij
More work on converter.
447
        elif type == "tree":
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
448
            (fileid, revid) = type_data
0.200.561 by Jelmer Vernooij
Cope with revisions pointed to by trees in the shamap disappearing.
449
            try:
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
450
                tree = self.tree_cache.revision_tree(revid)
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
451
                rev = self.repository.get_revision(revid)
0.200.561 by Jelmer Vernooij
Cope with revisions pointed to by trees in the shamap disappearing.
452
            except errors.NoSuchRevision:
453
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
454
                raise KeyError(sha)
0.200.556 by Jelmer Vernooij
Fix syntax error.
455
            unusual_modes = extract_unusual_modes(rev)
0.200.491 by Jelmer Vernooij
Cope with map for Tree objects becoming invalid.
456
            try:
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
457
                return self._get_tree(fileid, revid, tree.inventory,
458
                    unusual_modes, expected_sha=sha)
0.200.491 by Jelmer Vernooij
Cope with map for Tree objects becoming invalid.
459
            except errors.NoSuchRevision:
460
                raise KeyError(sha)
0.200.228 by Jelmer Vernooij
Split out map.
461
        else:
462
            raise AssertionError("Unknown object type '%s'" % type)
0.200.782 by Jelmer Vernooij
Add custom generate_pack_contents implementation.
463
464
    def generate_pack_contents(self, have, want):
465
        """Iterate over the contents of a pack file.
466
467
        :param have: List of SHA1s of objects that should not be sent
468
        :param want: List of SHA1s of objects that should be sent
469
        """
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
470
        processed = set()
471
        for commit_sha in have:
472
            try:
473
                (type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha)
474
            except KeyError:
475
                pass
476
            else:
477
                assert type == "commit"
478
                processed.add(revid)
479
        pending = set()
480
        for commit_sha in want:
481
            if commit_sha in have:
482
                continue
483
            (type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha)
484
            assert type == "commit"
485
            pending.add(revid)
486
        todo = set()
487
        while pending:
488
            processed.update(pending)
489
            next_map = self.repository.get_parent_map(pending)
490
            next_pending = set()
491
            for item in next_map.iteritems():
492
                todo.add(item[0])
493
                next_pending.update(p for p in item[1] if p not in processed)
494
            pending = next_pending
495
        if NULL_REVISION in todo:
496
            todo.remove(NULL_REVISION)
497
        trace.mutter('sending revisions %r', todo)
498
        ret = []
499
        pb = ui.ui_factory.nested_progress_bar()
500
        try:
501
            for i, revid in enumerate(todo):
502
                pb.update("generating git objects", i, len(todo))
503
                rev = self.repository.get_revision(revid)
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
504
                tree = self.tree_cache.revision_tree(revid)
505
                for path, obj, ie in self._revision_to_objects(rev, tree):
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
506
                    ret.append((obj, path))
507
        finally:
508
            pb.finished()
509
        return ret