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