/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.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
21
    Commit,
0.200.864 by Jelmer Vernooij
Cope with the first commit being pointless.
22
    Tree,
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
23
    sha_to_hex,
0.200.1153 by Jelmer Vernooij
Import ZERO_SHA from dulwich.objects.
24
    ZERO_SHA,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
25
    )
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
26
from dulwich.object_store import (
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
27
    BaseObjectStore,
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
28
    )
0.200.249 by Jelmer Vernooij
Implement Tree.
29
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
30
from bzrlib import (
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
31
    errors,
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
32
    lru_cache,
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
33
    trace,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
34
    ui,
0.200.773 by Jelmer Vernooij
Implement inventory_to_objects
35
    urlutils,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
36
    )
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
37
from bzrlib.revision import (
38
    NULL_REVISION,
39
    )
0.200.1023 by Jelmer Vernooij
Set and verify testament.
40
from bzrlib.testament import(
41
    StrictTestament3,
42
    )
0.200.228 by Jelmer Vernooij
Split out map.
43
0.200.229 by Jelmer Vernooij
More work on converter.
44
from bzrlib.plugins.git.mapping import (
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
45
    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.
46
    directory_to_tree,
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
47
    extract_unusual_modes,
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
48
    mapping_registry,
0.200.795 by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once.
49
    symlink_to_blob,
0.200.229 by Jelmer Vernooij
More work on converter.
50
    )
0.200.938 by Jelmer Vernooij
Rename shamap to cache, as it can also do content caching now.
51
from bzrlib.plugins.git.cache import (
0.200.842 by Jelmer Vernooij
Allow content cache to be provided.
52
    from_repository as cache_from_repository,
0.200.231 by Jelmer Vernooij
Partially fix pull.
53
    )
54
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
55
import posixpath
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
56
import stat
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
57
0.200.228 by Jelmer Vernooij
Split out map.
58
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
59
def get_object_store(repo, mapping=None):
60
    git = getattr(repo, "_git", None)
61
    if git is not None:
62
        return git.object_store
63
    return BazaarObjectStore(repo, mapping)
64
65
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
66
MAX_TREE_CACHE_SIZE = 50 * 1024 * 1024
67
68
69
class LRUTreeCache(object):
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
70
71
    def __init__(self, repository):
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
72
        def approx_tree_size(tree):
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
73
            # Very rough estimate, 1k per inventory entry
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
74
            return len(tree.inventory) * 1024
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
75
        self.repository = repository
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
76
        self._cache = lru_cache.LRUSizeCache(max_size=MAX_TREE_CACHE_SIZE,
77
            after_cleanup_size=None, compute_size=approx_tree_size)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
78
0.200.963 by Jelmer Vernooij
Add some tests for LRUTreeCache.
79
    def revision_tree(self, revid):
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
80
        try:
0.200.989 by Jelmer Vernooij
Add asserts.
81
            tree = self._cache[revid]
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
82
        except KeyError:
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
83
            tree = self.repository.revision_tree(revid)
84
            self.add(tree)
0.200.989 by Jelmer Vernooij
Add asserts.
85
        assert tree.get_revision_id() == tree.inventory.revision_id
86
        return tree
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
87
88
    def iter_revision_trees(self, revids):
0.200.989 by Jelmer Vernooij
Add asserts.
89
        trees = {}
90
        todo = []
91
        for revid in revids:
92
            try:
93
                tree = self._cache[revid]
94
            except KeyError:
95
                todo.append(revid)
96
            else:
97
                assert tree.get_revision_id() == revid
98
                trees[revid] = tree
99
        for tree in self.repository.revision_trees(todo):
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
100
            trees[tree.get_revision_id()] = tree
101
            self.add(tree)
102
        return (trees[r] for r in revids)
103
104
    def revision_trees(self, revids):
105
        return list(self.iter_revision_trees(revids))
106
107
    def add(self, tree):
108
        self._cache.add(tree.get_revision_id(), tree)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
109
110
0.200.1053 by Jelmer Vernooij
Fix find_missing_bzr_revids.
111
def _find_missing_bzr_revids(graph, want, have):
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
112
    """Find the revisions that have to be pushed.
113
114
    :param get_parent_map: Function that returns the parents for a sequence
115
        of revisions.
116
    :param want: Revisions the target wants
117
    :param have: Revisions the target already has
118
    :return: Set of revisions to fetch
119
    """
0.200.899 by Jelmer Vernooij
Add tests for find_missing_bzr_revids.
120
    todo = set()
0.200.1053 by Jelmer Vernooij
Fix find_missing_bzr_revids.
121
    for rev in want:
122
        todo.update(graph.find_unique_ancestors(rev, have))
0.200.899 by Jelmer Vernooij
Add tests for find_missing_bzr_revids.
123
    if NULL_REVISION in todo:
124
        todo.remove(NULL_REVISION)
125
    return todo
126
127
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
128
def _check_expected_sha(expected_sha, object):
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
129
    """Check whether an object matches an expected SHA.
130
131
    :param expected_sha: None or expected SHA as either binary or as hex digest
132
    :param object: Object to verify
133
    """
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
134
    if expected_sha is None:
135
        return
136
    if len(expected_sha) == 40:
137
        if expected_sha != object.sha().hexdigest():
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
138
            raise AssertionError("Invalid sha for %r: %s" % (object,
139
                expected_sha))
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
140
    elif len(expected_sha) == 20:
141
        if expected_sha != object.sha().digest():
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
142
            raise AssertionError("Invalid sha for %r: %s" % (object,
143
                sha_to_hex(expected_sha)))
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
144
    else:
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
145
        raise AssertionError("Unknown length %d for %r" % (len(expected_sha),
146
            expected_sha))
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
147
148
0.200.931 by Jelmer Vernooij
Update docstring, deal with kind changes appropriately in _tree_to_objects
149
def _tree_to_objects(tree, parent_trees, idmap, unusual_modes,
150
                     dummy_file_name=None):
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
151
    """Iterate over the objects that were introduced in a revision.
152
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
153
    :param idmap: id map
0.200.931 by Jelmer Vernooij
Update docstring, deal with kind changes appropriately in _tree_to_objects
154
    :param parent_trees: Parent revision trees
155
    :param unusual_modes: Unusual file modes dictionary
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
156
    :param dummy_file_name: File name to use for dummy files
157
        in empty directories. None to skip empty directories
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
158
    :return: Yields (path, object, ie) entries
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
159
    """
160
    new_trees = {}
161
    new_blobs = []
162
    shamap = {}
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
163
    try:
164
        base_tree = parent_trees[0]
165
        other_parent_trees = parent_trees[1:]
166
    except IndexError:
167
        base_tree = tree._repository.revision_tree(NULL_REVISION)
168
        other_parent_trees = []
0.200.868 by Jelmer Vernooij
Cope with no-change merges.
169
    def find_unchanged_parent_ie(ie, parent_trees):
170
        assert ie.kind in ("symlink", "file")
171
        for ptree in parent_trees:
172
            try:
173
                pie = ptree.inventory[ie.file_id]
174
            except errors.NoSuchId:
175
                pass
176
            else:
177
                if (pie.text_sha1 == ie.text_sha1 and 
178
                    pie.kind == ie.kind and
179
                    pie.symlink_target == ie.symlink_target):
180
                    return pie
181
        raise KeyError
0.200.965 by Jelmer Vernooij
Formatting fixes.
182
0.200.931 by Jelmer Vernooij
Update docstring, deal with kind changes appropriately in _tree_to_objects
183
    # Find all the changed blobs
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
184
    for (file_id, path, changed_content, versioned, parent, name, kind,
185
         executable) in tree.iter_changes(base_tree):
186
        if kind[1] == "file":
187
            ie = tree.inventory[file_id]
188
            if changed_content:
0.200.868 by Jelmer Vernooij
Cope with no-change merges.
189
                try:
190
                    pie = find_unchanged_parent_ie(ie, other_parent_trees)
191
                except KeyError:
192
                    pass
193
                else:
0.252.40 by Jelmer Vernooij
Checks for roundtripping.
194
                    try:
195
                        shamap[ie.file_id] = idmap.lookup_blob_id(
196
                            pie.file_id, pie.revision)
197
                    except KeyError:
198
                        # no-change merge ?
199
                        blob = Blob()
200
                        blob.data = tree.get_file_text(ie.file_id)
201
                        shamap[ie.file_id] = blob.id
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
202
            if not file_id in shamap:
203
                new_blobs.append((path[1], ie))
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
204
            new_trees[posixpath.dirname(path[1])] = parent[1]
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
205
        elif kind[1] == "symlink":
206
            ie = tree.inventory[file_id]
207
            if changed_content:
208
                blob = symlink_to_blob(ie)
0.200.868 by Jelmer Vernooij
Cope with no-change merges.
209
                shamap[file_id] = blob.id
210
                try:
211
                    find_unchanged_parent_ie(ie, other_parent_trees)
212
                except KeyError:
213
                    yield path[1], blob, ie
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
214
            new_trees[posixpath.dirname(path[1])] = parent[1]
0.250.3 by Jelmer Vernooij
Simplify..
215
        elif kind[1] not in (None, "directory"):
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
216
            raise AssertionError(kind[1])
0.200.1017 by Jelmer Vernooij
Cope with root moving.
217
        if (path[0] not in (None, "") and
218
            parent[0] in tree.inventory and
219
            tree.inventory[parent[0]].kind == "directory"):
0.200.931 by Jelmer Vernooij
Update docstring, deal with kind changes appropriately in _tree_to_objects
220
            # Removal
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
221
            new_trees[posixpath.dirname(path[0])] = parent[0]
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
222
    
0.200.931 by Jelmer Vernooij
Update docstring, deal with kind changes appropriately in _tree_to_objects
223
    # Fetch contents of the blobs that were changed
0.250.2 by Jelmer Vernooij
Make it work for evolution.
224
    for (path, ie), chunks in tree.iter_files_bytes(
225
        [(ie.file_id, (path, ie)) for (path, ie) in new_blobs]):
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
226
        obj = Blob()
0.200.851 by Jelmer Vernooij
Use blob.chunked.
227
        obj.chunked = chunks
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
228
        yield path, obj, ie
229
        shamap[ie.file_id] = obj.id
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
230
0.200.879 by Jelmer Vernooij
Fix unusual modes.
231
    for path in unusual_modes:
232
        parent_path = posixpath.dirname(path)
233
        new_trees[parent_path] = tree.path2id(parent_path)
0.200.989 by Jelmer Vernooij
Add asserts.
234
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
235
    trees = {}
236
    while new_trees:
237
        items = new_trees.items()
238
        new_trees = {}
239
        for path, file_id in items:
0.200.931 by Jelmer Vernooij
Update docstring, deal with kind changes appropriately in _tree_to_objects
240
            parent_id = tree.inventory[file_id].parent_id
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
241
            if parent_id is not None:
242
                parent_path = urlutils.dirname(path)
243
                new_trees[parent_path] = parent_id
244
            trees[path] = file_id
245
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
246
    def ie_to_hexsha(ie):
247
        try:
248
            return shamap[ie.file_id]
249
        except KeyError:
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
250
            # FIXME: Should be the same as in parent
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
251
            if ie.kind in ("file", "symlink"):
0.200.868 by Jelmer Vernooij
Cope with no-change merges.
252
                try:
253
                    return idmap.lookup_blob_id(ie.file_id, ie.revision)
254
                except KeyError:
255
                    # no-change merge ?
256
                    blob = Blob()
257
                    blob.data = tree.get_file_text(ie.file_id)
258
                    return blob.id
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
259
            elif ie.kind == "directory":
260
                # Not all cache backends store the tree information, 
261
                # calculate again from scratch
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
262
                ret = directory_to_tree(ie, ie_to_hexsha, unusual_modes,
263
                    dummy_file_name)
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
264
                if ret is None:
265
                    return ret
266
                return ret.id
267
            else:
268
                raise AssertionError
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
269
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
270
    for path in sorted(trees.keys(), reverse=True):
0.250.1 by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory.
271
        ie = tree.inventory[trees[path]]
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
272
        assert ie.kind == "directory"
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
273
        obj = directory_to_tree(ie, ie_to_hexsha, unusual_modes,
274
            dummy_file_name)
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
275
        if obj is not None:
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
276
            yield path, obj, ie
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
277
            shamap[ie.file_id] = obj.id
278
279
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
280
class BazaarObjectStore(BaseObjectStore):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
281
    """A Git-style object store backed onto a Bazaar repository."""
0.200.228 by Jelmer Vernooij
Split out map.
282
283
    def __init__(self, repository, mapping=None):
284
        self.repository = repository
285
        if mapping is None:
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
286
            self.mapping = default_mapping
0.200.228 by Jelmer Vernooij
Split out map.
287
        else:
288
            self.mapping = mapping
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
289
        self._cache = cache_from_repository(repository)
0.254.40 by Jelmer Vernooij
Add content cache infrastructure.
290
        self._content_cache_types = ("tree")
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
291
        self.start_write_group = self._cache.idmap.start_write_group
292
        self.abort_write_group = self._cache.idmap.abort_write_group
293
        self.commit_write_group = self._cache.idmap.commit_write_group
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
294
        self.tree_cache = LRUTreeCache(self.repository)
0.200.228 by Jelmer Vernooij
Split out map.
295
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
296
    def _update_sha_map(self, stop_revision=None):
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
297
        graph = self.repository.get_graph()
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
298
        if stop_revision is None:
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
299
            heads = graph.heads(self.repository.all_revision_ids())
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
300
        else:
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
301
            heads = set([stop_revision])
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
302
        missing_revids = self._cache.idmap.missing_revisions(heads)
0.200.683 by Jelmer Vernooij
Lazier checking of which revisions need to be fetched.
303
        while heads:
304
            parents = graph.get_parent_map(heads)
305
            todo = set()
306
            for p in parents.values():
0.200.684 by Jelmer Vernooij
Properly close write groups.
307
                todo.update([x for x in p if x not in missing_revids])
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
308
            heads = self._cache.idmap.missing_revisions(todo)
0.200.684 by Jelmer Vernooij
Properly close write groups.
309
            missing_revids.update(heads)
0.200.694 by Jelmer Vernooij
Avoid processing NULL_REVISION.
310
        if NULL_REVISION in missing_revids:
311
            missing_revids.remove(NULL_REVISION)
0.254.16 by Jelmer Vernooij
Add optimization preventing recursive index updating.
312
        missing_revids = self.repository.has_revisions(missing_revids)
313
        if not missing_revids:
314
            return
0.200.735 by Jelmer Vernooij
Use convenience functions for start/stop write groups.
315
        self.start_write_group()
0.200.231 by Jelmer Vernooij
Partially fix pull.
316
        try:
0.254.4 by Jelmer Vernooij
Merge trunk.
317
            pb = ui.ui_factory.nested_progress_bar()
318
            try:
319
                for i, revid in enumerate(graph.iter_topo_order(missing_revids)):
0.254.16 by Jelmer Vernooij
Add optimization preventing recursive index updating.
320
                    trace.mutter('processing %r', revid)
0.254.4 by Jelmer Vernooij
Merge trunk.
321
                    pb.update("updating git map", i, len(missing_revids))
322
                    self._update_sha_map_revision(revid)
323
            finally:
324
                pb.finished()
0.200.735 by Jelmer Vernooij
Use convenience functions for start/stop write groups.
325
        except:
326
            self.abort_write_group()
327
            raise
328
        else:
329
            self.commit_write_group()
0.200.229 by Jelmer Vernooij
More work on converter.
330
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
331
    def __iter__(self):
332
        self._update_sha_map()
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
333
        return iter(self._cache.idmap.sha1s())
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
334
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
335
    def _reconstruct_commit(self, rev, tree_sha, roundtrip, verifiers):
336
        """Reconstruct a Commit object.
337
338
        :param rev: Revision object
339
        :param tree_sha: SHA1 of the root tree object
340
        :param roundtrip: Whether or not to roundtrip bzr metadata
341
        :param verifiers: Verifiers for the commits
342
        :return: Commit object
343
        """
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
344
        def parent_lookup(revid):
345
            try:
346
                return self._lookup_revision_sha1(revid)
347
            except errors.NoSuchRevision:
348
                return None
0.252.4 by Jelmer Vernooij
More work on roundtripping.
349
        return self.mapping.export_commit(rev, tree_sha, parent_lookup,
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
350
            roundtrip, verifiers)
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
351
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
352
    def _create_fileid_map_blob(self, inv):
353
        # FIXME: This can probably be a lot more efficient, 
354
        # not all files necessarily have to be processed.
355
        file_ids = {}
356
        for (path, ie) in inv.iter_entries():
357
            if self.mapping.generate_file_id(path) != ie.file_id:
358
                file_ids[path] = ie.file_id
359
        return self.mapping.export_fileid_map(file_ids)
360
0.252.4 by Jelmer Vernooij
More work on roundtripping.
361
    def _revision_to_objects(self, rev, tree, roundtrip):
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
362
        """Convert a revision to a set of git objects.
363
364
        :param rev: Bazaar revision object
365
        :param tree: Bazaar revision tree
366
        :param roundtrip: Whether to roundtrip all Bazaar revision data
367
        """
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
368
        unusual_modes = extract_unusual_modes(rev)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
369
        present_parents = self.repository.has_revisions(rev.parent_ids)
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
370
        parent_trees = self.tree_cache.revision_trees(
0.200.797 by Jelmer Vernooij
Add docstring, fix formatting.
371
            [p for p in rev.parent_ids if p in present_parents])
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
372
        root_tree = None
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
373
        for path, obj, ie in _tree_to_objects(tree, parent_trees,
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
374
                self._cache.idmap, unusual_modes, self.mapping.BZR_DUMMY_FILE):
0.200.773 by Jelmer Vernooij
Implement inventory_to_objects
375
            if path == "":
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
376
                root_tree = obj
0.252.34 by Jelmer Vernooij
Yield the proper object for the tree root.
377
                root_ie = ie
378
                # Don't yield just yet
379
            else:
380
                yield path, obj, ie
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
381
        if root_tree is None:
0.250.2 by Jelmer Vernooij
Make it work for evolution.
382
            # Pointless commit - get the tree sha elsewhere
0.200.864 by Jelmer Vernooij
Cope with the first commit being pointless.
383
            if not rev.parent_ids:
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
384
                root_tree = Tree()
0.200.864 by Jelmer Vernooij
Cope with the first commit being pointless.
385
            else:
386
                base_sha1 = self._lookup_revision_sha1(rev.parent_ids[0])
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
387
                root_tree = self[self[base_sha1].tree]
0.252.35 by Jelmer Vernooij
Ignore control files in inventories.
388
            root_ie = tree.inventory.root
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
389
        if roundtrip and self.mapping.BZR_FILE_IDS_FILE is not None:
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
390
            b = self._create_fileid_map_blob(tree.inventory)
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
391
            if b is not None:
392
                root_tree[self.mapping.BZR_FILE_IDS_FILE] = ((stat.S_IFREG | 0644), b.id)
393
                yield self.mapping.BZR_FILE_IDS_FILE, b, None
0.252.34 by Jelmer Vernooij
Yield the proper object for the tree root.
394
        yield "", root_tree, root_ie
0.200.1023 by Jelmer Vernooij
Set and verify testament.
395
        if roundtrip:
0.200.1195 by Jelmer Vernooij
Cope with new StrictTestament3 arguments.
396
            if getattr(StrictTestament3, "from_revision_tree", None):
397
                testament3 = StrictTestament3(rev, tree)
398
            else: # bzr < 2.4
399
                testament3 = StrictTestament3(rev, tree.inventory)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
400
            verifiers = { "testament3-sha1": testament3.as_sha1() }
0.200.1023 by Jelmer Vernooij
Set and verify testament.
401
        else:
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
402
            verifiers = {}
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
403
        commit_obj = self._reconstruct_commit(rev, root_tree.id,
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
404
            roundtrip=roundtrip, verifiers=verifiers)
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
405
        try:
0.200.841 by Jelmer Vernooij
Eliminate InventorySHAMap.
406
            foreign_revid, mapping = mapping_registry.parse_revision_id(
407
                rev.revision_id)
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
408
        except errors.InvalidRevisionId:
409
            pass
410
        else:
0.200.794 by Jelmer Vernooij
Use _check_expected_sha rather than custom checks.
411
            _check_expected_sha(foreign_revid, commit_obj)
0.200.837 by Jelmer Vernooij
Return inventory entries when creating git objects for a revision.
412
        yield None, commit_obj, None
0.200.783 by Jelmer Vernooij
Move object generation into a separate function.
413
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
414
    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.
415
        return self._cache.get_updater(rev)
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
416
0.200.783 by Jelmer Vernooij
Move object generation into a separate function.
417
    def _update_sha_map_revision(self, revid):
418
        rev = self.repository.get_revision(revid)
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
419
        tree = self.tree_cache.revision_tree(rev.revision_id)
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
420
        updater = self._get_updater(rev)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
421
        for path, obj, ie in self._revision_to_objects(rev, tree,
422
            roundtrip=True):
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
423
            if isinstance(obj, Commit):
0.200.1195 by Jelmer Vernooij
Cope with new StrictTestament3 arguments.
424
                if getattr(StrictTestament3, "from_revision_tree", None):
425
                    testament3 = StrictTestament3(rev, tree)
426
                else: # bzr < 2.4
427
                    testament3 = StrictTestament3(rev, tree.inventory)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
428
                ie = { "testament3-sha1": testament3.as_sha1() }
0.200.952 by Jelmer Vernooij
Write git pack files rather than loose objects.
429
            updater.add_object(obj, ie, path)
0.200.838 by Jelmer Vernooij
Add convenience object for updating the object store.
430
        commit_obj = updater.finish()
0.200.781 by Jelmer Vernooij
Return commit id after converting a revision.
431
        return commit_obj.id
0.200.229 by Jelmer Vernooij
More work on converter.
432
0.200.855 by Jelmer Vernooij
_get_ -> _reconstruct_.
433
    def _reconstruct_blobs(self, keys):
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
434
        """Return a Git Blob object from a fileid and revision stored in bzr.
435
436
        :param fileid: File id of the text
437
        :param revision: Revision of the text
438
        """
0.250.2 by Jelmer Vernooij
Make it work for evolution.
439
        stream = self.repository.iter_files_bytes(
440
            ((key[0], key[1], key) for key in keys))
0.200.856 by Jelmer Vernooij
Support reconstructing multiple blobs at the same time.
441
        for (fileid, revision, expected_sha), chunks in stream:
0.200.854 by Jelmer Vernooij
_get_blob -> _get_blobs.
442
            blob = Blob()
443
            blob.chunked = chunks
0.200.868 by Jelmer Vernooij
Cope with no-change merges.
444
            if blob.id != expected_sha and blob.data == "":
0.200.854 by Jelmer Vernooij
_get_blob -> _get_blobs.
445
                # Perhaps it's a symlink ?
446
                tree = self.tree_cache.revision_tree(revision)
447
                entry = tree.inventory[fileid]
0.200.868 by Jelmer Vernooij
Cope with no-change merges.
448
                if entry.kind == 'symlink':
449
                    blob = symlink_to_blob(entry)
0.200.854 by Jelmer Vernooij
_get_blob -> _get_blobs.
450
            _check_expected_sha(expected_sha, blob)
451
            yield blob
0.200.229 by Jelmer Vernooij
More work on converter.
452
0.200.855 by Jelmer Vernooij
_get_ -> _reconstruct_.
453
    def _reconstruct_tree(self, fileid, revid, inv, unusual_modes,
454
        expected_sha=None):
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
455
        """Return a Git Tree object from a file id and a revision stored in bzr.
0.200.249 by Jelmer Vernooij
Implement Tree.
456
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
457
        :param fileid: fileid in the tree.
0.200.249 by Jelmer Vernooij
Implement Tree.
458
        :param revision: Revision of the tree.
459
        """
0.200.776 by Jelmer Vernooij
Remove unnecessary lookups.
460
        def get_ie_sha1(entry):
461
            if entry.kind == "directory":
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
462
                try:
0.200.859 by Jelmer Vernooij
Trivial cleanups.
463
                    return self._cache.idmap.lookup_tree_id(entry.file_id,
464
                        revid)
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.
465
                except (NotImplementedError, KeyError):
0.200.855 by Jelmer Vernooij
_get_ -> _reconstruct_.
466
                    obj = self._reconstruct_tree(entry.file_id, revid, inv,
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
467
                        unusual_modes)
468
                    if obj is None:
469
                        return None
470
                    else:
471
                        return obj.id
0.200.776 by Jelmer Vernooij
Remove unnecessary lookups.
472
            elif entry.kind in ("file", "symlink"):
0.200.868 by Jelmer Vernooij
Cope with no-change merges.
473
                try:
474
                    return self._cache.idmap.lookup_blob_id(entry.file_id,
475
                        entry.revision)
476
                except KeyError:
477
                    # no-change merge?
478
                    return self._reconstruct_blobs(
479
                        [(entry.file_id, entry.revision, None)]).next().id
0.200.776 by Jelmer Vernooij
Remove unnecessary lookups.
480
            else:
481
                raise AssertionError("unknown entry kind '%s'" % entry.kind)
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
482
        tree = directory_to_tree(inv[fileid], get_ie_sha1, unusual_modes,
483
            self.mapping.BZR_DUMMY_FILE)
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
484
        if (inv.root.file_id == fileid and
485
            self.mapping.BZR_FILE_IDS_FILE is not None):
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
486
            b = self._create_fileid_map_blob(inv)
487
            # If this is the root tree, add the file ids
488
            tree[self.mapping.BZR_FILE_IDS_FILE] = ((stat.S_IFREG | 0644), b.id)
0.200.793 by Jelmer Vernooij
Make _check_expected_sha a global fn.
489
        _check_expected_sha(expected_sha, tree)
0.200.249 by Jelmer Vernooij
Implement Tree.
490
        return tree
0.200.229 by Jelmer Vernooij
More work on converter.
491
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
492
    def get_parents(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
493
        """Retrieve the parents of a Git commit by SHA1.
494
495
        :param sha: SHA1 of the commit
496
        :raises: KeyError, NotCommitError
497
        """
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
498
        return self[sha].parents
499
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
500
    def _lookup_revision_sha1(self, revid):
0.200.449 by Jelmer Vernooij
Use BazaarObjectStore to find matching SHA1s for bzr revisions.
501
        """Return the SHA1 matching a Bazaar revision."""
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
502
        if revid == NULL_REVISION:
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
503
            return ZERO_SHA
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
504
        try:
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
505
            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.
506
        except KeyError:
0.200.682 by Jelmer Vernooij
Avoid doing a full sha map update if we already know the SHA1.
507
            try:
508
                return mapping_registry.parse_revision_id(revid)[0]
509
            except errors.InvalidRevisionId:
0.252.47 by Jelmer Vernooij
Fix handling of HEAD refs.
510
                self.repository.lock_read()
511
                try:
512
                    self._update_sha_map(revid)
513
                finally:
514
                    self.repository.unlock()
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
515
                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.
516
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
517
    def get_raw(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
518
        """Get the raw representation of a Git object by SHA1.
519
520
        :param sha: SHA1 of the git object
521
        """
0.200.566 by Jelmer Vernooij
Fix ObjectStore.get_raw() .
522
        obj = self[sha]
523
        return (obj.type, obj.as_raw_string())
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
524
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
525
    def __contains__(self, sha):
526
        # See if sha is in map
527
        try:
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
528
            for (type, type_data) in self.lookup_git_sha(sha):
529
                if type == "commit":
530
                    if self.repository.has_revision(type_data[0]):
531
                        return True
532
                elif type == "blob":
533
                    if self.repository.texts.has_key(type_data):
534
                        return True
535
                elif type == "tree":
536
                    if self.repository.has_revision(type_data[1]):
537
                        return True
538
                else:
539
                    raise AssertionError("Unknown object type '%s'" % type)
0.200.568 by Jelmer Vernooij
Properly check that matching bzr objects exist.
540
            else:
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
541
                return False
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
542
        except KeyError:
543
            return False
544
0.200.898 by Jelmer Vernooij
Optimize finding of git shas.
545
    def lookup_git_shas(self, shas, update_map=True):
546
        ret = {}
547
        for sha in shas:
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
548
            if sha == ZERO_SHA:
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
549
                ret[sha] = [("commit", (NULL_REVISION, None, {}))]
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
550
                continue
0.200.898 by Jelmer Vernooij
Optimize finding of git shas.
551
            try:
0.261.3 by Jelmer Vernooij
Fix more tests.
552
                ret[sha] = list(self._cache.idmap.lookup_git_sha(sha))
0.200.898 by Jelmer Vernooij
Optimize finding of git shas.
553
            except KeyError:
554
                if update_map:
555
                    # if not, see if there are any unconverted revisions and add
556
                    # them to the map, search for sha in map again
557
                    self._update_sha_map()
558
                    update_map = False
559
                    try:
0.261.3 by Jelmer Vernooij
Fix more tests.
560
                        ret[sha] = list(self._cache.idmap.lookup_git_sha(sha))
0.200.898 by Jelmer Vernooij
Optimize finding of git shas.
561
                    except KeyError:
562
                        pass
563
        return ret
564
565
    def lookup_git_sha(self, sha, update_map=True):
566
        return self.lookup_git_shas([sha], update_map=update_map)[sha]
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
567
568
    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.
569
        if self._cache.content_cache is not None:
0.200.840 by Jelmer Vernooij
Support using content cache.
570
            try:
0.200.847 by Jelmer Vernooij
Add BzrGitCache object.
571
                return self._cache.content_cache[sha]
0.200.840 by Jelmer Vernooij
Support using content cache.
572
            except KeyError:
573
                pass
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
574
        for (kind, type_data) in self.lookup_git_sha(sha):
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
575
            # convert object to git object
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
576
            if kind == "commit":
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
577
                (revid, tree_sha, verifiers) = type_data
578
                try:
579
                    rev = self.repository.get_revision(revid)
580
                except errors.NoSuchRevision:
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
581
                    trace.mutter('entry for %s %s in shamap: %r, but not '
582
                                 'found in repository', kind, sha, type_data)
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
583
                    raise KeyError(sha)
584
                commit = self._reconstruct_commit(rev, tree_sha, roundtrip=True,
585
                    verifiers=verifiers)
586
                _check_expected_sha(sha, commit)
587
                return commit
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
588
            elif kind == "blob":
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
589
                (fileid, revision) = type_data
590
                return self._reconstruct_blobs([(fileid, revision, sha)]).next()
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
591
            elif kind == "tree":
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
592
                (fileid, revid) = type_data
593
                try:
594
                    tree = self.tree_cache.revision_tree(revid)
595
                    rev = self.repository.get_revision(revid)
596
                except errors.NoSuchRevision:
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
597
                    trace.mutter('entry for %s %s in shamap: %r, but not found in repository', kind, sha, type_data)
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
598
                    raise KeyError(sha)
599
                unusual_modes = extract_unusual_modes(rev)
600
                try:
601
                    return self._reconstruct_tree(fileid, revid,
602
                        tree.inventory, unusual_modes, expected_sha=sha)
603
                except errors.NoSuchRevision:
604
                    raise KeyError(sha)
605
            else:
0.200.1169 by Jelmer Vernooij
Fix some sha lookups.
606
                raise AssertionError("Unknown object type '%s'" % kind)
0.200.228 by Jelmer Vernooij
Split out map.
607
        else:
0.261.1 by Jelmer Vernooij
Initial work on supporting multiple results for git shas.
608
            raise KeyError(sha)
0.200.782 by Jelmer Vernooij
Add custom generate_pack_contents implementation.
609
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
610
    def generate_lossy_pack_contents(self, have, want, progress=None,
611
            get_tagged=None):
612
        return self.generate_pack_contents(have, want, progress, get_tagged,
613
            lossy=True)
614
0.200.899 by Jelmer Vernooij
Add tests for find_missing_bzr_revids.
615
    def generate_pack_contents(self, have, want, progress=None,
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
616
            get_tagged=None, lossy=False):
0.200.782 by Jelmer Vernooij
Add custom generate_pack_contents implementation.
617
        """Iterate over the contents of a pack file.
618
619
        :param have: List of SHA1s of objects that should not be sent
620
        :param want: List of SHA1s of objects that should be sent
621
        """
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
622
        processed = set()
0.200.898 by Jelmer Vernooij
Optimize finding of git shas.
623
        ret = self.lookup_git_shas(have + want)
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
624
        for commit_sha in have:
625
            try:
0.200.1180 by Jelmer Vernooij
Some dpush fixes.
626
                for (type, type_data) in ret[commit_sha]:
627
                    assert type == "commit"
628
                    processed.add(type_data[0])
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
629
            except KeyError:
630
                pass
631
        pending = set()
632
        for commit_sha in want:
633
            if commit_sha in have:
634
                continue
0.200.898 by Jelmer Vernooij
Optimize finding of git shas.
635
            try:
0.200.1180 by Jelmer Vernooij
Some dpush fixes.
636
                for (type, type_data) in ret[commit_sha]:
637
                    assert type == "commit"
638
                    pending.add(type_data[0])
0.200.898 by Jelmer Vernooij
Optimize finding of git shas.
639
            except KeyError:
640
                pass
0.200.899 by Jelmer Vernooij
Add tests for find_missing_bzr_revids.
641
0.200.1053 by Jelmer Vernooij
Fix find_missing_bzr_revids.
642
        graph = self.repository.get_graph()
643
        todo = _find_missing_bzr_revids(graph, pending, processed)
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
644
        trace.mutter('sending revisions %r', todo)
645
        ret = []
646
        pb = ui.ui_factory.nested_progress_bar()
647
        try:
648
            for i, revid in enumerate(todo):
649
                pb.update("generating git objects", i, len(todo))
0.200.1059 by Jelmer Vernooij
Fix graph tests.
650
                try:
651
                    rev = self.repository.get_revision(revid)
652
                except errors.NoSuchRevision:
653
                    continue
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
654
                tree = self.tree_cache.revision_tree(revid)
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
655
                for path, obj, ie in self._revision_to_objects(rev, tree,
656
                    roundtrip=not lossy):
0.200.787 by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents.
657
                    ret.append((obj, path))
658
        finally:
659
            pb.finished()
660
        return ret
0.251.1 by Jelmer Vernooij
Implement ObjectStore.add_{thin_,}pack.
661
662
    def add_thin_pack(self):
663
        import tempfile
664
        import os
665
        fd, path = tempfile.mkstemp(suffix=".pack")
666
        f = os.fdopen(fd, 'wb')
667
        def commit():
668
            from dulwich.pack import PackData, Pack
669
            from bzrlib.plugins.git.fetch import import_git_objects
670
            os.fsync(fd)
671
            f.close()
672
            if os.path.getsize(path) == 0:
673
                return
674
            pd = PackData(path)
675
            pd.create_index_v2(path[:-5]+".idx", self.object_store.get_raw)
676
677
            p = Pack(path[:-5])
678
            self.repository.lock_write()
679
            try:
680
                self.repository.start_write_group()
681
                try:
682
                    import_git_objects(self.repository, self.mapping, 
683
                        p.iterobjects(get_raw=self.get_raw),
684
                        self.object_store)
685
                except:
686
                    self.repository.abort_write_group()
687
                    raise
688
                else:
689
                    self.repository.commit_write_group()
690
            finally:
691
                self.repository.unlock()
692
        return f, commit
693
694
    # The pack isn't kept around anyway, so no point 
695
    # in treating full packs different from thin packs
696
    add_pack = add_thin_pack