/brz/remove-bazaar

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