/brz/remove-bazaar

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