/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) 2008-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
0.358.1 by Jelmer Vernooij
Fix FSF address.
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
16
0.358.3 by Jelmer Vernooij
Enable absolute import.
17
"""Fetching from git into bzr."""
18
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
19
from __future__ import absolute_import
20
0.200.261 by Jelmer Vernooij
More formatting fixes.
21
from dulwich.objects import (
22
    Commit,
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
23
    Tag,
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
24
    Tree,
0.200.1407 by Jelmer Vernooij
Don't consider submodule modes unusual.
25
    S_IFGITLINK,
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
26
    S_ISGITLINK,
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
27
    ZERO_SHA,
0.200.261 by Jelmer Vernooij
More formatting fixes.
28
    )
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
29
from dulwich.object_store import (
30
    tree_lookup_path,
31
    )
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
32
import posixpath
0.200.352 by Jelmer Vernooij
Simplify mode handling.
33
import stat
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
34
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
35
from .. import (
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
36
    debug,
0.200.1433 by Jelmer Vernooij
Fix fetching between git repositories.
37
    errors,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
38
    osutils,
0.200.261 by Jelmer Vernooij
More formatting fixes.
39
    trace,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
40
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
41
from ..errors import (
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
42
    BzrError,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
43
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
44
from ..bzr.inventory import (
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
45
    InventoryDirectory,
46
    InventoryFile,
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
47
    InventoryLink,
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
48
    TreeReference,
0.200.261 by Jelmer Vernooij
More formatting fixes.
49
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
50
from ..revision import (
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
51
    NULL_REVISION,
52
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
53
from ..bzr.inventorytree import InventoryRevisionTree
7206.4.1 by Jelmer Vernooij
Move breezy.testament to breezy.bzr.testament.
54
from ..bzr.testament import (
0.200.1023 by Jelmer Vernooij
Set and verify testament.
55
    StrictTestament3,
56
    )
7357.1.8 by Jelmer Vernooij
Remove the InterTree object.
57
from ..tree import InterTree
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
58
from ..tsort import (
0.200.292 by Jelmer Vernooij
Fix formatting.
59
    topo_sort,
60
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
61
from ..bzr.versionedfile import (
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
62
    ChunkedContentFactory,
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
63
    )
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
64
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
65
from .mapping import (
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
66
    DEFAULT_FILE_MODE,
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
67
    mode_is_executable,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
68
    mode_kind,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
69
    warn_unusual_mode,
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
70
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
71
from .object_store import (
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
72
    LRUTreeCache,
0.423.1 by Jelmer Vernooij
Some performance fixes.
73
    _tree_to_objects,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
74
    )
0.216.4 by Jelmer Vernooij
Add basic pack fetch infrastructure.
75
76
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
77
def import_git_blob(texts, mapping, path, name, hexshas,
7143.15.2 by Jelmer Vernooij
Run autopep8.
78
                    base_bzr_tree, parent_id, revision_id,
79
                    parent_bzr_trees, lookup_object, modes, store_updater,
80
                    lookup_file_id):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
81
    """Import a git blob object into a bzr repository.
82
0.200.261 by Jelmer Vernooij
More formatting fixes.
83
    :param texts: VersionedFiles to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
84
    :param path: Path in the tree
85
    :param blob: A git blob
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
86
    :return: Inventory delta for this file
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
87
    """
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
88
    if not isinstance(path, bytes):
89
        raise TypeError(path)
90
    decoded_path = path.decode('utf-8')
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
91
    (base_mode, mode) = modes
92
    (base_hexsha, hexsha) = hexshas
0.200.1752 by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add.
93
    if mapping.is_special_file(path):
0.252.28 by Jelmer Vernooij
Don't import control files.
94
        return []
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
95
    if base_hexsha == hexsha and base_mode == mode:
96
        # If nothing has changed since the base revision, we're done
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
97
        return []
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
98
    file_id = lookup_file_id(decoded_path)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
99
    if stat.S_ISLNK(mode):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
100
        cls = InventoryLink
101
    else:
102
        cls = InventoryFile
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
103
    ie = cls(file_id, name.decode("utf-8"), parent_id)
0.200.995 by Jelmer Vernooij
Support newer versions of bzr where only some InventoryFile/InventoryLink attributes are writable.
104
    if ie.kind == "file":
105
        ie.executable = mode_is_executable(mode)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
106
    if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
107
        base_exec = base_bzr_tree.is_executable(decoded_path)
0.200.995 by Jelmer Vernooij
Support newer versions of bzr where only some InventoryFile/InventoryLink attributes are writable.
108
        if ie.kind == "symlink":
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
109
            ie.symlink_target = base_bzr_tree.get_symlink_target(decoded_path)
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
110
        else:
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
111
            ie.text_size = base_bzr_tree.get_file_size(decoded_path)
112
            ie.text_sha1 = base_bzr_tree.get_file_sha1(decoded_path)
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
113
        if ie.kind == "symlink" or ie.executable == base_exec:
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
114
            ie.revision = base_bzr_tree.get_file_revision(decoded_path)
0.200.537 by Jelmer Vernooij
Fix handling of not-executable files becoming executable without any other changes.
115
        else:
116
            blob = lookup_object(hexsha)
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
117
    else:
118
        blob = lookup_object(hexsha)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
119
        if ie.kind == "symlink":
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
120
            ie.revision = None
0.200.1344 by Jelmer Vernooij
Unicode symlinks should be unicode in inventory entries.
121
            ie.symlink_target = blob.data.decode("utf-8")
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
122
        else:
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
123
            ie.text_size = sum(map(len, blob.chunked))
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
124
            ie.text_sha1 = osutils.sha_strings(blob.chunked)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
125
    # Check what revision we should store
0.200.283 by Jelmer Vernooij
Avoid storing repeated texts for blobs.
126
    parent_keys = []
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
127
    for ptree in parent_bzr_trees:
7357.1.8 by Jelmer Vernooij
Remove the InterTree object.
128
        intertree = InterTree.get(ptree, base_bzr_tree)
7357.1.7 by Jelmer Vernooij
Add tests.
129
        try:
7357.1.8 by Jelmer Vernooij
Remove the InterTree object.
130
            ppath = intertree.find_source_paths(decoded_path, recurse='none')
7357.1.7 by Jelmer Vernooij
Add tests.
131
        except errors.NoSuchFile:
132
            continue
7447.1.1 by Jelmer Vernooij
Use find_previous_path rather than id2path.
133
        if ppath is None:
0.200.829 by Jelmer Vernooij
Cope with the fact that _type is gone in upstream dulwich.
134
            continue
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
135
        pkind = ptree.kind(ppath)
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
136
        if (pkind == ie.kind and
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
137
            ((pkind == "symlink" and ptree.get_symlink_target(ppath) == ie.symlink_target) or
138
             (pkind == "file" and ptree.get_file_sha1(ppath) == ie.text_sha1 and
139
                ptree.is_executable(ppath) == ie.executable))):
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
140
            # found a revision in one of the parents to use
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
141
            ie.revision = ptree.get_file_revision(ppath)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
142
            break
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
143
        parent_key = (file_id, ptree.get_file_revision(ppath))
7183.3.1 by Martin
Fix E71* lint errors
144
        if parent_key not in parent_keys:
0.200.904 by Jelmer Vernooij
Fix inconsistent parents.
145
            parent_keys.append(parent_key)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
146
    if ie.revision is None:
147
        # Need to store a new revision
148
        ie.revision = revision_id
0.361.1 by Jelmer Vernooij
Don't use assert.
149
        if ie.revision is None:
150
            raise ValueError("no file revision set")
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
151
        if ie.kind == 'symlink':
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
152
            chunks = []
0.200.1292 by Jelmer Vernooij
Fix repeeling objects when determining what to send.
153
        else:
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
154
            chunks = blob.chunked
0.252.25 by Jelmer Vernooij
Reformatting.
155
        texts.insert_record_stream([
156
            ChunkedContentFactory((file_id, ie.revision),
7143.15.2 by Jelmer Vernooij
Run autopep8.
157
                                  tuple(parent_keys), ie.text_sha1, chunks)])
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
158
    invdelta = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
159
    if base_hexsha is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
160
        old_path = decoded_path  # Renames are not supported yet
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
161
        if stat.S_ISDIR(base_mode):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
162
            invdelta.extend(remove_disappeared_children(
163
                base_bzr_tree, old_path, lookup_object(base_hexsha), [],
164
                lookup_object))
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
165
    else:
166
        old_path = None
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
167
    invdelta.append((old_path, decoded_path, file_id, ie))
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
168
    if base_hexsha != hexsha:
0.275.2 by Jelmer Vernooij
Pass tuples around for cache entries, rather than inventory entries.
169
        store_updater.add_object(blob, (ie.file_id, ie.revision), path)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
170
    return invdelta
0.200.261 by Jelmer Vernooij
More formatting fixes.
171
172
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
173
class SubmodulesRequireSubtrees(BzrError):
0.200.1596 by Jelmer Vernooij
Don't mention development-subtree when submodules are encountered.
174
    _fmt = ("The repository you are fetching from contains submodules, "
0.404.2 by Jelmer Vernooij
Clarify error message about nested trees.
175
            "which require a Bazaar format that supports tree references.")
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
176
    internal = False
177
178
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
179
def import_git_submodule(texts, mapping, path, name, hexshas,
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
180
                         base_bzr_tree, parent_id, revision_id,
181
                         parent_bzr_trees, lookup_object,
7143.15.2 by Jelmer Vernooij
Run autopep8.
182
                         modes, store_updater, lookup_file_id):
0.200.1309 by Jelmer Vernooij
Break some more long lines.
183
    """Import a git submodule."""
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
184
    (base_hexsha, hexsha) = hexshas
185
    (base_mode, mode) = modes
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
186
    if base_hexsha == hexsha and base_mode == mode:
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
187
        return [], {}
7458.1.2 by Jelmer Vernooij
Fix tests on Python 3.
188
    path = path.decode('utf-8')
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
189
    file_id = lookup_file_id(path)
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
190
    invdelta = []
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
191
    ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
192
    ie.revision = revision_id
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
193
    if base_hexsha is not None:
7458.1.2 by Jelmer Vernooij
Fix tests on Python 3.
194
        old_path = path  # Renames are not supported yet
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
195
        if stat.S_ISDIR(base_mode):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
196
            invdelta.extend(remove_disappeared_children(
197
                base_bzr_tree, old_path, lookup_object(base_hexsha), [],
198
                lookup_object))
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
199
    else:
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
200
        old_path = None
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
201
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
0.252.25 by Jelmer Vernooij
Reformatting.
202
    texts.insert_record_stream([
203
        ChunkedContentFactory((file_id, ie.revision), (), None, [])])
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
204
    invdelta.append((old_path, path, file_id, ie))
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
205
    return invdelta, {}
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
206
207
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
208
def remove_disappeared_children(base_bzr_tree, path, base_tree,
209
                                existing_children, lookup_object):
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
210
    """Generate an inventory delta for removed children.
211
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
212
    :param base_bzr_tree: Base bzr tree against which to generate the
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
213
        inventory delta.
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
214
    :param path: Path to process (unicode)
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
215
    :param base_tree: Git Tree base object
216
    :param existing_children: Children that still exist
217
    :param lookup_object: Lookup a git object by its SHA1
218
    :return: Inventory delta, as list
219
    """
7479.2.1 by Jelmer Vernooij
Drop python2 support.
220
    if not isinstance(path, str):
0.361.1 by Jelmer Vernooij
Don't use assert.
221
        raise TypeError(path)
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
222
    ret = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
223
    for name, mode, hexsha in base_tree.iteritems():
224
        if name in existing_children:
225
            continue
226
        c_path = posixpath.join(path, name.decode("utf-8"))
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
227
        file_id = base_bzr_tree.path2id(c_path)
0.361.1 by Jelmer Vernooij
Don't use assert.
228
        if file_id is None:
229
            raise TypeError(file_id)
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
230
        ret.append((c_path, None, file_id, None))
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
231
        if stat.S_ISDIR(mode):
232
            ret.extend(remove_disappeared_children(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
233
                base_bzr_tree, c_path, lookup_object(hexsha), [],
234
                lookup_object))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
235
    return ret
236
237
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
238
def import_git_tree(texts, mapping, path, name, hexshas,
7143.15.2 by Jelmer Vernooij
Run autopep8.
239
                    base_bzr_tree, parent_id, revision_id, parent_bzr_trees,
240
                    lookup_object, modes, store_updater,
241
                    lookup_file_id, allow_submodules=False):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
242
    """Import a git tree object into a bzr repository.
243
0.200.261 by Jelmer Vernooij
More formatting fixes.
244
    :param texts: VersionedFiles object to add to
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
245
    :param path: Path in the tree (str)
246
    :param name: Name of the tree (str)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
247
    :param tree: A git tree object
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
248
    :param base_bzr_tree: Base inventory against which to return inventory
249
        delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
250
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
251
    """
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
252
    (base_hexsha, hexsha) = hexshas
253
    (base_mode, mode) = modes
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
254
    if not isinstance(path, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
255
        raise TypeError(path)
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
256
    if not isinstance(name, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
257
        raise TypeError(name)
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
258
    if base_hexsha == hexsha and base_mode == mode:
259
        # If nothing has changed since the base revision, we're done
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
260
        return [], {}
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
261
    invdelta = []
7018.3.2 by Jelmer Vernooij
Fix some git tests.
262
    file_id = lookup_file_id(osutils.safe_unicode(path))
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
263
    # We just have to hope this is indeed utf-8:
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
264
    ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
265
    tree = lookup_object(hexsha)
266
    if base_hexsha is None:
267
        base_tree = None
7143.15.2 by Jelmer Vernooij
Run autopep8.
268
        old_path = None  # Newly appeared here
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
269
    else:
270
        base_tree = lookup_object(base_hexsha)
7143.15.2 by Jelmer Vernooij
Run autopep8.
271
        old_path = path.decode("utf-8")  # Renames aren't supported yet
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
272
    new_path = path.decode("utf-8")
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
273
    if base_tree is None or type(base_tree) is not Tree:
274
        ie.revision = revision_id
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
275
        invdelta.append((old_path, new_path, ie.file_id, ie))
0.252.24 by Jelmer Vernooij
Support reading fileid map.
276
        texts.insert_record_stream([
277
            ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
278
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
279
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
280
    child_modes = {}
0.200.1147 by Jelmer Vernooij
Use Tree.items() rather than Tree.entries().
281
    for name, child_mode, child_hexsha in tree.iteritems():
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
282
        existing_children.add(name)
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
283
        child_path = posixpath.join(path, name)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
284
        if type(base_tree) is Tree:
285
            try:
286
                child_base_mode, child_base_hexsha = base_tree[name]
287
            except KeyError:
288
                child_base_hexsha = None
289
                child_base_mode = 0
290
        else:
291
            child_base_hexsha = None
292
            child_base_mode = 0
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
293
        if stat.S_ISDIR(child_mode):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
294
            subinvdelta, grandchildmodes = import_git_tree(
295
                texts, mapping, child_path, name,
296
                (child_base_hexsha, child_hexsha), base_bzr_tree, file_id,
297
                revision_id, parent_bzr_trees, lookup_object,
298
                (child_base_mode, child_mode), store_updater, lookup_file_id,
299
                allow_submodules=allow_submodules)
7143.15.2 by Jelmer Vernooij
Run autopep8.
300
        elif S_ISGITLINK(child_mode):  # submodule
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
301
            if not allow_submodules:
302
                raise SubmodulesRequireSubtrees()
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
303
            subinvdelta, grandchildmodes = import_git_submodule(
304
                texts, mapping, child_path, name,
305
                (child_base_hexsha, child_hexsha),
306
                base_bzr_tree, file_id, revision_id, parent_bzr_trees,
307
                lookup_object, (child_base_mode, child_mode), store_updater,
308
                lookup_file_id)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
309
        else:
0.200.1328 by Jelmer Vernooij
More test fixes.
310
            if not mapping.is_special_file(name):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
311
                subinvdelta = import_git_blob(
312
                    texts, mapping, child_path, name,
313
                    (child_base_hexsha, child_hexsha), base_bzr_tree, file_id,
314
                    revision_id, parent_bzr_trees, lookup_object,
315
                    (child_base_mode, child_mode), store_updater,
316
                    lookup_file_id)
0.200.1328 by Jelmer Vernooij
More test fixes.
317
            else:
318
                subinvdelta = []
0.200.757 by Jelmer Vernooij
Use inventory deltas.
319
            grandchildmodes = {}
320
        child_modes.update(grandchildmodes)
321
        invdelta.extend(subinvdelta)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
322
        if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
7143.15.2 by Jelmer Vernooij
Run autopep8.
323
                              stat.S_IFLNK, DEFAULT_FILE_MODE | 0o111,
324
                              S_IFGITLINK):
0.200.879 by Jelmer Vernooij
Fix unusual modes.
325
            child_modes[child_path] = child_mode
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
326
    # Remove any children that have disappeared
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
327
    if base_tree is not None and type(base_tree) is Tree:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
328
        invdelta.extend(remove_disappeared_children(
329
            base_bzr_tree, old_path, base_tree, existing_children,
330
            lookup_object))
0.421.6 by Jelmer Vernooij
Some more simplifications.
331
    store_updater.add_object(tree, (file_id, revision_id), path)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
332
    return invdelta, child_modes
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
333
334
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
335
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
336
                                 o, rev, ret_tree, parent_trees, mapping,
337
                                 unusual_modes, verifiers):
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
338
    new_unusual_modes = mapping.export_unusual_file_modes(rev)
339
    if new_unusual_modes != unusual_modes:
340
        raise AssertionError("unusual modes don't match: %r != %r" % (
341
            unusual_modes, new_unusual_modes))
342
    # Verify that we can reconstruct the commit properly
0.200.1047 by Jelmer Vernooij
Fix -Dverify.
343
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
7143.15.2 by Jelmer Vernooij
Run autopep8.
344
                                                            verifiers)
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
345
    if rec_o != o:
346
        raise AssertionError("Reconstructed commit differs: %r != %r" % (
347
            rec_o, o))
348
    diff = []
349
    new_objs = {}
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
350
    for path, obj, ie in _tree_to_objects(
351
            ret_tree, parent_trees, target_git_object_retriever._cache.idmap,
352
            unusual_modes, mapping.BZR_DUMMY_FILE):
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
353
        old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
354
        new_objs[path] = obj
355
        if obj.id != old_obj_id:
356
            diff.append((path, lookup_object(old_obj_id), obj))
357
    for (path, old_obj, new_obj) in diff:
7143.15.2 by Jelmer Vernooij
Run autopep8.
358
        while (old_obj.type_name == "tree"
359
               and new_obj.type_name == "tree"
360
               and sorted(old_obj) == sorted(new_obj)):
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
361
            for name in old_obj:
362
                if old_obj[name][0] != new_obj[name][0]:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
363
                    raise AssertionError(
364
                        "Modes for %s differ: %o != %o" %
365
                        (path, old_obj[name][0], new_obj[name][0]))
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
366
                if old_obj[name][1] != new_obj[name][1]:
367
                    # Found a differing child, delve deeper
368
                    path = posixpath.join(path, name)
369
                    old_obj = lookup_object(old_obj[name][1])
370
                    new_obj = new_objs[path]
371
                    break
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
372
        raise AssertionError(
373
            "objects differ for %s: %r != %r" % (path, old_obj, new_obj))
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
374
375
0.200.1409 by Jelmer Vernooij
Support fetching into repositories that are stacked.
376
def ensure_inventories_in_repo(repo, trees):
377
    real_inv_vf = repo.inventories.without_fallbacks()
378
    for t in trees:
379
        revid = t.get_revision_id()
380
        if not real_inv_vf.get_parent_map([(revid, )]):
6989.2.2 by Jelmer Vernooij
Fix a few tests against git repositories.
381
            repo.add_inventory(revid, t.root_inventory, t.get_parent_ids())
0.200.1409 by Jelmer Vernooij
Support fetching into repositories that are stacked.
382
383
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
384
def import_git_commit(repo, mapping, head, lookup_object,
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
385
                      target_git_object_retriever, trees_cache, strict):
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
386
    o = lookup_object(head)
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
387
    # Note that this uses mapping.revision_id_foreign_to_bzr. If the parents
388
    # were bzr roundtripped revisions they would be specified in the
389
    # roundtrip data.
0.261.4 by Jelmer Vernooij
Fix tests.
390
    rev, roundtrip_revid, verifiers = mapping.import_commit(
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
391
        o, mapping.revision_id_foreign_to_bzr, strict)
0.200.1329 by Jelmer Vernooij
Fix more tests.
392
    if roundtrip_revid is not None:
393
        original_revid = rev.revision_id
394
        rev.revision_id = roundtrip_revid
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
395
    # We have to do this here, since we have to walk the tree and
396
    # we need to make sure to import the blobs / trees with the right
397
    # path; this may involve adding them more than once.
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
398
    parent_trees = trees_cache.revision_trees(rev.parent_ids)
0.200.1409 by Jelmer Vernooij
Support fetching into repositories that are stacked.
399
    ensure_inventories_in_repo(repo, parent_trees)
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
400
    if parent_trees == []:
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
401
        base_bzr_tree = trees_cache.revision_tree(NULL_REVISION)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
402
        base_tree = None
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
403
        base_mode = None
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
404
    else:
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
405
        base_bzr_tree = parent_trees[0]
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
406
        base_tree = lookup_object(o.parents[0]).tree
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
407
        base_mode = stat.S_IFDIR
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
408
    store_updater = target_git_object_retriever._get_updater(rev)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
409
    inv_delta, unusual_modes = import_git_tree(
410
        repo.texts, mapping, b"", b"", (base_tree, o.tree), base_bzr_tree,
411
        None, rev.revision_id, parent_trees, lookup_object,
412
        (base_mode, stat.S_IFDIR), store_updater,
7358.13.1 by Jelmer Vernooij
Drop file id roundtripping support in Git.
413
        mapping.generate_file_id,
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
414
        allow_submodules=repo._format.supports_tree_reference)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
415
    if unusual_modes != {}:
416
        for path, mode in unusual_modes.iteritems():
417
            warn_unusual_mode(rev.foreign_revid, path, mode)
418
        mapping.import_unusual_file_modes(rev, unusual_modes)
419
    try:
420
        basis_id = rev.parent_ids[0]
421
    except IndexError:
422
        basis_id = NULL_REVISION
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
423
        base_bzr_inventory = None
424
    else:
6989.2.2 by Jelmer Vernooij
Fix a few tests against git repositories.
425
        base_bzr_inventory = base_bzr_tree.root_inventory
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
426
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(
427
        basis_id, inv_delta, rev.revision_id, rev.parent_ids,
428
        base_bzr_inventory)
0.200.1195 by Jelmer Vernooij
Cope with new StrictTestament3 arguments.
429
    ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
0.200.1329 by Jelmer Vernooij
Fix more tests.
430
    # Check verifiers
431
    if verifiers and roundtrip_revid is not None:
0.200.1559 by Jelmer Vernooij
Fix compatibility with bzr 2.5.
432
        testament = StrictTestament3(rev, ret_tree)
7143.15.2 by Jelmer Vernooij
Run autopep8.
433
        calculated_verifiers = {"testament3-sha1": testament.as_sha1()}
0.200.1329 by Jelmer Vernooij
Fix more tests.
434
        if calculated_verifiers != verifiers:
435
            trace.mutter("Testament SHA1 %r for %r did not match %r.",
436
                         calculated_verifiers["testament3-sha1"],
437
                         rev.revision_id, verifiers["testament3-sha1"])
438
            rev.revision_id = original_revid
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
439
            rev.inventory_sha1, inv = repo.add_inventory_by_delta(
440
                basis_id, inv_delta, rev.revision_id, rev.parent_ids,
441
                base_bzr_tree)
0.200.1329 by Jelmer Vernooij
Fix more tests.
442
            ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
0.200.1179 by Jelmer Vernooij
Avoid using verifiers for natively imported revisions, save a lot of time.
443
    else:
444
        calculated_verifiers = {}
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
445
    store_updater.add_object(o, calculated_verifiers, None)
446
    store_updater.finish()
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
447
    trees_cache.add(ret_tree)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
448
    repo.add_revision(rev.revision_id, rev)
449
    if "verify" in debug.debug_flags:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
450
        verify_commit_reconstruction(
451
            target_git_object_retriever, lookup_object, o, rev, ret_tree,
452
            parent_trees, mapping, unusual_modes, verifiers)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
453
454
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
455
def import_git_objects(repo, mapping, object_iter,
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
456
                       target_git_object_retriever, heads, pb=None,
457
                       limit=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
458
    """Import a set of git objects into a bzr repository.
459
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
460
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
461
    :param mapping: Mapping to use
462
    :param object_iter: Iterator over Git objects.
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
463
    :return: Tuple with pack hints and last imported revision id
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
464
    """
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
465
    def lookup_object(sha):
466
        try:
467
            return object_iter[sha]
468
        except KeyError:
469
            return target_git_object_retriever[sha]
0.200.158 by Jelmer Vernooij
fetch works \o/
470
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
471
    checked = set()
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
472
    heads = list(set(heads))
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
473
    trees_cache = LRUTreeCache(repo)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
474
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
475
    while heads:
476
        if pb is not None:
477
            pb.update("finding revisions to fetch", len(graph), None)
478
        head = heads.pop()
0.200.1350 by Jelmer Vernooij
Implement search_missing_revision_ids.
479
        if head == ZERO_SHA:
480
            continue
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
481
        if not isinstance(head, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
482
            raise TypeError(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
483
        try:
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
484
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
485
        except KeyError:
486
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
487
        if isinstance(o, Commit):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
488
            rev, roundtrip_revid, verifiers = mapping.import_commit(
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
489
                o, mapping.revision_id_foreign_to_bzr, strict=True)
7143.15.2 by Jelmer Vernooij
Run autopep8.
490
            if (repo.has_revision(rev.revision_id)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
491
                    or (roundtrip_revid and
492
                        repo.has_revision(roundtrip_revid))):
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
493
                continue
0.200.668 by Jelmer Vernooij
Fix some places where we were way too much memory for repositories with a large number of entries in the inventory and a large number of revisions.
494
            graph.append((o.id, o.parents))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
495
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
496
        elif isinstance(o, Tag):
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
497
            if o.object[1] not in checked:
498
                heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
499
        else:
500
            trace.warning("Unable to import head object %r" % o)
0.200.668 by Jelmer Vernooij
Fix some places where we were way too much memory for repositories with a large number of entries in the inventory and a large number of revisions.
501
        checked.add(o.id)
502
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
503
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
504
    # Create the inventory objects
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
505
    batch_size = 1000
0.200.680 by Jelmer Vernooij
fetch revisions in batches
506
    revision_ids = topo_sort(graph)
507
    pack_hints = []
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
508
    if limit is not None:
509
        revision_ids = revision_ids[:limit]
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
510
    last_imported = None
0.200.680 by Jelmer Vernooij
fetch revisions in batches
511
    for offset in range(0, len(revision_ids), batch_size):
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
512
        target_git_object_retriever.start_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
513
        try:
0.254.33 by Jelmer Vernooij
Merge trunk.
514
            repo.start_write_group()
515
            try:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
516
                for i, head in enumerate(
7143.15.2 by Jelmer Vernooij
Run autopep8.
517
                        revision_ids[offset:offset + batch_size]):
0.254.33 by Jelmer Vernooij
Merge trunk.
518
                    if pb is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
519
                        pb.update("fetching revisions", offset + i,
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
520
                                  len(revision_ids))
0.254.33 by Jelmer Vernooij
Merge trunk.
521
                    import_git_commit(repo, mapping, head, lookup_object,
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
522
                                      target_git_object_retriever, trees_cache,
523
                                      strict=True)
0.254.33 by Jelmer Vernooij
Merge trunk.
524
                    last_imported = head
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
525
            except BaseException:
0.254.33 by Jelmer Vernooij
Merge trunk.
526
                repo.abort_write_group()
527
                raise
528
            else:
529
                hint = repo.commit_write_group()
530
                if hint is not None:
531
                    pack_hints.extend(hint)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
532
        except BaseException:
0.254.33 by Jelmer Vernooij
Merge trunk.
533
            target_git_object_retriever.abort_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
534
            raise
535
        else:
0.254.33 by Jelmer Vernooij
Merge trunk.
536
            target_git_object_retriever.commit_write_group()
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
537
    return pack_hints, last_imported
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
538
539
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
540
class DetermineWantsRecorder(object):
541
542
    def __init__(self, actual):
543
        self.actual = actual
544
        self.wants = []
545
        self.remote_refs = {}
546
547
    def __call__(self, refs):
0.361.1 by Jelmer Vernooij
Don't use assert.
548
        if type(refs) is not dict:
549
            raise TypeError(refs)
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
550
        self.remote_refs = refs
551
        self.wants = self.actual(refs)
552
        return self.wants