/brz/remove-bazaar

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