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