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