/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.1350 by Jelmer Vernooij
Implement search_missing_revision_ids.
32
from dulwich.walk import Walker
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
33
import posixpath
0.200.352 by Jelmer Vernooij
Simplify mode handling.
34
import stat
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
35
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
36
from .. import (
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
37
    debug,
0.200.1433 by Jelmer Vernooij
Fix fetching between git repositories.
38
    errors,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
39
    osutils,
0.200.261 by Jelmer Vernooij
More formatting fixes.
40
    trace,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
41
    ui,
42
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
43
from ..errors import (
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
44
    BzrError,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
45
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
46
from ..bzr.inventory import (
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
47
    InventoryDirectory,
48
    InventoryFile,
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
49
    InventoryLink,
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
50
    TreeReference,
0.200.261 by Jelmer Vernooij
More formatting fixes.
51
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
52
from ..repository import (
0.200.261 by Jelmer Vernooij
More formatting fixes.
53
    InterRepository,
54
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
55
from ..revision import (
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
56
    NULL_REVISION,
57
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
58
from ..bzr.inventorytree import InventoryRevisionTree
6986.2.2 by Jelmer Vernooij
Merge trunk.
59
from ..sixish import text_type
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
60
from ..testament import (
0.200.1023 by Jelmer Vernooij
Set and verify testament.
61
    StrictTestament3,
62
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
63
from ..tsort import (
0.200.292 by Jelmer Vernooij
Fix formatting.
64
    topo_sort,
65
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
66
from ..bzr.versionedfile import (
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
67
    ChunkedContentFactory,
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
68
    )
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
69
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
70
from .mapping import (
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
71
    DEFAULT_FILE_MODE,
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
72
    mode_is_executable,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
73
    mode_kind,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
74
    warn_unusual_mode,
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
75
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
76
from .object_store import (
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
77
    LRUTreeCache,
0.423.1 by Jelmer Vernooij
Some performance fixes.
78
    _tree_to_objects,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
79
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
80
from .refs import (
0.200.1487 by Jelmer Vernooij
Use peeling.
81
    is_tag,
0.200.1458 by Jelmer Vernooij
Gather peeled shas rather than unpeeled.
82
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
83
from .remote import (
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
84
    RemoteGitRepository,
85
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
86
from .repository import (
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
87
    GitRepository,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
88
    GitRepositoryFormat,
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
89
    LocalGitRepository,
0.200.261 by Jelmer Vernooij
More formatting fixes.
90
    )
0.216.4 by Jelmer Vernooij
Add basic pack fetch infrastructure.
91
92
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
93
def import_git_blob(texts, mapping, path, name, hexshas,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
94
        base_bzr_tree, parent_id, revision_id,
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
95
        parent_bzr_trees, lookup_object, modes, store_updater,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
96
        lookup_file_id):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
97
    """Import a git blob object into a bzr repository.
98
0.200.261 by Jelmer Vernooij
More formatting fixes.
99
    :param texts: VersionedFiles to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
100
    :param path: Path in the tree
101
    :param blob: A git blob
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
102
    :return: Inventory delta for this file
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
103
    """
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
104
    if not isinstance(path, bytes):
105
        raise TypeError(path)
106
    decoded_path = path.decode('utf-8')
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
107
    (base_mode, mode) = modes
108
    (base_hexsha, hexsha) = hexshas
0.200.1752 by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add.
109
    if mapping.is_special_file(path):
0.252.28 by Jelmer Vernooij
Don't import control files.
110
        return []
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
111
    if base_hexsha == hexsha and base_mode == mode:
112
        # 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.
113
        return []
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
114
    file_id = lookup_file_id(decoded_path)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
115
    if stat.S_ISLNK(mode):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
116
        cls = InventoryLink
117
    else:
118
        cls = InventoryFile
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
119
    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.
120
    if ie.kind == "file":
121
        ie.executable = mode_is_executable(mode)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
122
    if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
123
        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.
124
        if ie.kind == "symlink":
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
125
            ie.symlink_target = base_bzr_tree.get_symlink_target(decoded_path)
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
126
        else:
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
127
            ie.text_size = base_bzr_tree.get_file_size(decoded_path)
128
            ie.text_sha1 = base_bzr_tree.get_file_sha1(decoded_path)
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
129
        if ie.kind == "symlink" or ie.executable == base_exec:
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
130
            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.
131
        else:
132
            blob = lookup_object(hexsha)
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
133
    else:
134
        blob = lookup_object(hexsha)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
135
        if ie.kind == "symlink":
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
136
            ie.revision = None
0.200.1344 by Jelmer Vernooij
Unicode symlinks should be unicode in inventory entries.
137
            ie.symlink_target = blob.data.decode("utf-8")
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
138
        else:
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
139
            ie.text_size = sum(map(len, blob.chunked))
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
140
            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).
141
    # Check what revision we should store
0.200.283 by Jelmer Vernooij
Avoid storing repeated texts for blobs.
142
    parent_keys = []
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
143
    for ptree in parent_bzr_trees:
0.200.1576 by Jelmer Vernooij
Merge a bunch of fixes from store-roundtrip-info.
144
        try:
7069.1.1 by Jelmer Vernooij
Remove incorrect use of find_related_paths_across_trees.
145
            ppath = ptree.id2path(file_id)
146
        except errors.NoSuchId:
0.200.829 by Jelmer Vernooij
Cope with the fact that _type is gone in upstream dulwich.
147
            continue
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
148
        pkind = ptree.kind(ppath, file_id)
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
149
        if (pkind == ie.kind and
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
150
            ((pkind == "symlink" and ptree.get_symlink_target(ppath, file_id) == ie.symlink_target) or
151
             (pkind == "file" and ptree.get_file_sha1(ppath, file_id) == ie.text_sha1 and
152
                ptree.is_executable(ppath, file_id) == ie.executable))):
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
153
            # found a revision in one of the parents to use
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
154
            ie.revision = ptree.get_file_revision(ppath, file_id)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
155
            break
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
156
        parent_key = (file_id, ptree.get_file_revision(ppath, file_id))
0.200.904 by Jelmer Vernooij
Fix inconsistent parents.
157
        if not parent_key in parent_keys:
158
            parent_keys.append(parent_key)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
159
    if ie.revision is None:
160
        # Need to store a new revision
161
        ie.revision = revision_id
0.361.1 by Jelmer Vernooij
Don't use assert.
162
        if ie.revision is None:
163
            raise ValueError("no file revision set")
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
164
        if ie.kind == 'symlink':
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
165
            chunks = []
0.200.1292 by Jelmer Vernooij
Fix repeeling objects when determining what to send.
166
        else:
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
167
            chunks = blob.chunked
0.252.25 by Jelmer Vernooij
Reformatting.
168
        texts.insert_record_stream([
169
            ChunkedContentFactory((file_id, ie.revision),
170
                tuple(parent_keys), ie.text_sha1, chunks)])
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
171
    invdelta = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
172
    if base_hexsha is not None:
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
173
        old_path = decoded_path # Renames are not supported yet
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
174
        if stat.S_ISDIR(base_mode):
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
175
            invdelta.extend(remove_disappeared_children(base_bzr_tree, old_path,
0.200.826 by Jelmer Vernooij
Fix some long lines.
176
                lookup_object(base_hexsha), [], lookup_object))
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
177
    else:
178
        old_path = None
7027.4.8 by Jelmer Vernooij
Fix tests, drop broken tests.
179
    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.
180
    if base_hexsha != hexsha:
0.275.2 by Jelmer Vernooij
Pass tuples around for cache entries, rather than inventory entries.
181
        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.
182
    return invdelta
0.200.261 by Jelmer Vernooij
More formatting fixes.
183
184
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
185
class SubmodulesRequireSubtrees(BzrError):
0.200.1596 by Jelmer Vernooij
Don't mention development-subtree when submodules are encountered.
186
    _fmt = ("The repository you are fetching from contains submodules, "
0.404.2 by Jelmer Vernooij
Clarify error message about nested trees.
187
            "which require a Bazaar format that supports tree references.")
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
188
    internal = False
189
190
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
191
def import_git_submodule(texts, mapping, path, name, hexshas,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
192
    base_bzr_tree, parent_id, revision_id, parent_bzr_trees, lookup_object,
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
193
    modes, store_updater, lookup_file_id):
0.200.1309 by Jelmer Vernooij
Break some more long lines.
194
    """Import a git submodule."""
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
195
    (base_hexsha, hexsha) = hexshas
196
    (base_mode, mode) = modes
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
197
    if base_hexsha == hexsha and base_mode == mode:
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
198
        return [], {}
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
199
    file_id = lookup_file_id(path)
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
200
    invdelta = []
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
201
    ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
202
    ie.revision = revision_id
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
203
    if base_hexsha is not None:
204
        old_path = path.decode("utf-8") # Renames are not supported yet
205
        if stat.S_ISDIR(base_mode):
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
206
            invdelta.extend(remove_disappeared_children(base_bzr_tree, old_path,
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
207
                lookup_object(base_hexsha), [], lookup_object))
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
208
    else:
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
209
        old_path = None
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
210
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
0.252.25 by Jelmer Vernooij
Reformatting.
211
    texts.insert_record_stream([
212
        ChunkedContentFactory((file_id, ie.revision), (), None, [])])
0.200.1408 by Jelmer Vernooij
Remove old ie children when converting directory into tree reference.
213
    invdelta.append((old_path, path, file_id, ie))
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
214
    return invdelta, {}
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
215
216
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
217
def remove_disappeared_children(base_bzr_tree, path, base_tree, existing_children,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
218
        lookup_object):
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
219
    """Generate an inventory delta for removed children.
220
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
221
    :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.
222
        inventory delta.
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
223
    :param path: Path to process (unicode)
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
224
    :param base_tree: Git Tree base object
225
    :param existing_children: Children that still exist
226
    :param lookup_object: Lookup a git object by its SHA1
227
    :return: Inventory delta, as list
228
    """
6973.6.2 by Jelmer Vernooij
Fix more tests.
229
    if not isinstance(path, text_type):
0.361.1 by Jelmer Vernooij
Don't use assert.
230
        raise TypeError(path)
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
231
    ret = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
232
    for name, mode, hexsha in base_tree.iteritems():
233
        if name in existing_children:
234
            continue
235
        c_path = posixpath.join(path, name.decode("utf-8"))
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
236
        file_id = base_bzr_tree.path2id(c_path)
0.361.1 by Jelmer Vernooij
Don't use assert.
237
        if file_id is None:
238
            raise TypeError(file_id)
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
239
        ret.append((c_path, None, file_id, None))
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
240
        if stat.S_ISDIR(mode):
241
            ret.extend(remove_disappeared_children(
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
242
                base_bzr_tree, c_path, lookup_object(hexsha), [], lookup_object))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
243
    return ret
244
245
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
246
def import_git_tree(texts, mapping, path, name, hexshas,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
247
        base_bzr_tree, parent_id, revision_id, parent_bzr_trees,
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
248
        lookup_object, modes, store_updater,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
249
        lookup_file_id, allow_submodules=False):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
250
    """Import a git tree object into a bzr repository.
251
0.200.261 by Jelmer Vernooij
More formatting fixes.
252
    :param texts: VersionedFiles object to add to
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
253
    :param path: Path in the tree (str)
254
    :param name: Name of the tree (str)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
255
    :param tree: A git tree object
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
256
    :param base_bzr_tree: Base inventory against which to return inventory delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
257
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
258
    """
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
259
    (base_hexsha, hexsha) = hexshas
260
    (base_mode, mode) = modes
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
261
    if not isinstance(path, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
262
        raise TypeError(path)
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
263
    if not isinstance(name, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
264
        raise TypeError(name)
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
265
    if base_hexsha == hexsha and base_mode == mode:
266
        # 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.
267
        return [], {}
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
268
    invdelta = []
7018.3.2 by Jelmer Vernooij
Fix some git tests.
269
    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..).
270
    # We just have to hope this is indeed utf-8:
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
271
    ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
272
    tree = lookup_object(hexsha)
273
    if base_hexsha is None:
274
        base_tree = None
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
275
        old_path = None # Newly appeared here
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
276
    else:
277
        base_tree = lookup_object(base_hexsha)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
278
        old_path = path.decode("utf-8") # Renames aren't supported yet
279
    new_path = path.decode("utf-8")
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
280
    if base_tree is None or type(base_tree) is not Tree:
281
        ie.revision = revision_id
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
282
        invdelta.append((old_path, new_path, ie.file_id, ie))
0.252.24 by Jelmer Vernooij
Support reading fileid map.
283
        texts.insert_record_stream([
284
            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).
285
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
286
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
287
    child_modes = {}
0.200.1147 by Jelmer Vernooij
Use Tree.items() rather than Tree.entries().
288
    for name, child_mode, child_hexsha in tree.iteritems():
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
289
        existing_children.add(name)
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
290
        child_path = posixpath.join(path, name)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
291
        if type(base_tree) is Tree:
292
            try:
293
                child_base_mode, child_base_hexsha = base_tree[name]
294
            except KeyError:
295
                child_base_hexsha = None
296
                child_base_mode = 0
297
        else:
298
            child_base_hexsha = None
299
            child_base_mode = 0
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
300
        if stat.S_ISDIR(child_mode):
0.252.25 by Jelmer Vernooij
Reformatting.
301
            subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
302
                child_path, name, (child_base_hexsha, child_hexsha),
303
                base_bzr_tree, file_id, revision_id, parent_bzr_trees,
304
                lookup_object, (child_base_mode, child_mode), store_updater,
305
                lookup_file_id, allow_submodules=allow_submodules)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
306
        elif S_ISGITLINK(child_mode): # submodule
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
307
            if not allow_submodules:
308
                raise SubmodulesRequireSubtrees()
0.252.25 by Jelmer Vernooij
Reformatting.
309
            subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
310
                child_path, name, (child_base_hexsha, child_hexsha),
311
                base_bzr_tree, file_id, revision_id, parent_bzr_trees,
312
                lookup_object, (child_base_mode, child_mode), store_updater,
313
                lookup_file_id)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
314
        else:
0.200.1328 by Jelmer Vernooij
More test fixes.
315
            if not mapping.is_special_file(name):
316
                subinvdelta = import_git_blob(texts, mapping, child_path, name,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
317
                    (child_base_hexsha, child_hexsha), base_bzr_tree, file_id,
318
                    revision_id, parent_bzr_trees, lookup_object,
0.200.1328 by Jelmer Vernooij
More test fixes.
319
                    (child_base_mode, child_mode), store_updater, lookup_file_id)
320
            else:
321
                subinvdelta = []
0.200.757 by Jelmer Vernooij
Use inventory deltas.
322
            grandchildmodes = {}
323
        child_modes.update(grandchildmodes)
324
        invdelta.extend(subinvdelta)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
325
        if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
326
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0o111,
0.200.1407 by Jelmer Vernooij
Don't consider submodule modes unusual.
327
                        S_IFGITLINK):
0.200.879 by Jelmer Vernooij
Fix unusual modes.
328
            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).
329
    # Remove any children that have disappeared
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
330
    if base_tree is not None and type(base_tree) is Tree:
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
331
        invdelta.extend(remove_disappeared_children(base_bzr_tree, old_path,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
332
            base_tree, existing_children, lookup_object))
0.421.6 by Jelmer Vernooij
Some more simplifications.
333
    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.
334
    return invdelta, child_modes
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
335
336
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
337
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
0.200.1047 by Jelmer Vernooij
Fix -Dverify.
338
    o, rev, ret_tree, parent_trees, mapping, 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,
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 = {}
351
    for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
0.200.1309 by Jelmer Vernooij
Break some more long lines.
352
        target_git_object_retriever._cache.idmap, unusual_modes,
353
        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:
359
        while (old_obj.type_name == "tree" and
360
               new_obj.type_name == "tree" and
361
               sorted(old_obj) == sorted(new_obj)):
362
            for name in old_obj:
363
                if old_obj[name][0] != new_obj[name][0]:
0.252.25 by Jelmer Vernooij
Reformatting.
364
                    raise AssertionError("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
372
        raise AssertionError("objects differ for %s: %r != %r" % (path,
373
            old_obj, new_obj))
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,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
385
                      target_git_object_retriever, trees_cache):
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(
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
391
        o, mapping.revision_id_foreign_to_bzr)
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)
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
409
    tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
410
    inv_delta, unusual_modes = import_git_tree(repo.texts,
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
411
            mapping, b"", b"", (base_tree, o.tree), base_bzr_tree,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
412
            None, rev.revision_id, parent_trees,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
413
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
414
            tree_supplement.lookup_file_id,
6989.2.3 by Jelmer Vernooij
Allow testing interrepo formats that don't support roundtripping.
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
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
427
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
428
              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)
0.200.1329 by Jelmer Vernooij
Fix more tests.
434
        calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
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
440
            rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
0.275.3 by Jelmer Vernooij
Avoid inventories in a few more places.
441
              inv_delta, rev.revision_id, rev.parent_ids, 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:
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
450
        verify_commit_reconstruction(target_git_object_retriever,
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
451
            lookup_object, o, rev, ret_tree, parent_trees, mapping,
0.200.1047 by Jelmer Vernooij
Fix -Dverify.
452
            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,
456
    target_git_object_retriever, heads, pb=None, limit=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
457
    """Import a set of git objects into a bzr repository.
458
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
459
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
460
    :param mapping: Mapping to use
461
    :param object_iter: Iterator over Git objects.
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
462
    :return: Tuple with pack hints and last imported revision id
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
463
    """
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
464
    def lookup_object(sha):
465
        try:
466
            return object_iter[sha]
467
        except KeyError:
468
            return target_git_object_retriever[sha]
0.200.158 by Jelmer Vernooij
fetch works \o/
469
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
470
    checked = set()
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
471
    heads = list(set(heads))
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
472
    trees_cache = LRUTreeCache(repo)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
473
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
474
    while heads:
475
        if pb is not None:
476
            pb.update("finding revisions to fetch", len(graph), None)
477
        head = heads.pop()
0.200.1350 by Jelmer Vernooij
Implement search_missing_revision_ids.
478
        if head == ZERO_SHA:
479
            continue
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
480
        if not isinstance(head, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
481
            raise TypeError(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
482
        try:
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
483
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
484
        except KeyError:
485
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
486
        if isinstance(o, Commit):
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
487
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
0.261.6 by Jelmer Vernooij
Use mapping.revision_id_foreign_to_bzr to find parents everywhere.
488
                mapping.revision_id_foreign_to_bzr)
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
489
            if (repo.has_revision(rev.revision_id) or
490
                (roundtrip_revid and repo.has_revision(roundtrip_revid))):
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
491
                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.
492
            graph.append((o.id, o.parents))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
493
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
494
        elif isinstance(o, Tag):
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
495
            if o.object[1] not in checked:
496
                heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
497
        else:
498
            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.
499
        checked.add(o.id)
500
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
501
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
502
    # Create the inventory objects
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
503
    batch_size = 1000
0.200.680 by Jelmer Vernooij
fetch revisions in batches
504
    revision_ids = topo_sort(graph)
505
    pack_hints = []
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
506
    if limit is not None:
507
        revision_ids = revision_ids[:limit]
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
508
    last_imported = None
0.200.680 by Jelmer Vernooij
fetch revisions in batches
509
    for offset in range(0, len(revision_ids), batch_size):
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
510
        target_git_object_retriever.start_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
511
        try:
0.254.33 by Jelmer Vernooij
Merge trunk.
512
            repo.start_write_group()
513
            try:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
514
                for i, head in enumerate(
515
                    revision_ids[offset:offset+batch_size]):
0.254.33 by Jelmer Vernooij
Merge trunk.
516
                    if pb is not None:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
517
                        pb.update("fetching revisions", offset+i,
518
                                  len(revision_ids))
0.254.33 by Jelmer Vernooij
Merge trunk.
519
                    import_git_commit(repo, mapping, head, lookup_object,
0.252.25 by Jelmer Vernooij
Reformatting.
520
                        target_git_object_retriever, trees_cache)
0.254.33 by Jelmer Vernooij
Merge trunk.
521
                    last_imported = head
522
            except:
523
                repo.abort_write_group()
524
                raise
525
            else:
526
                hint = repo.commit_write_group()
527
                if hint is not None:
528
                    pack_hints.extend(hint)
0.200.680 by Jelmer Vernooij
fetch revisions in batches
529
        except:
0.254.33 by Jelmer Vernooij
Merge trunk.
530
            target_git_object_retriever.abort_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
531
            raise
532
        else:
0.254.33 by Jelmer Vernooij
Merge trunk.
533
            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
534
    return pack_hints, last_imported
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
535
536
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
537
class DetermineWantsRecorder(object):
538
539
    def __init__(self, actual):
540
        self.actual = actual
541
        self.wants = []
542
        self.remote_refs = {}
543
544
    def __call__(self, refs):
0.361.1 by Jelmer Vernooij
Don't use assert.
545
        if type(refs) is not dict:
546
            raise TypeError(refs)
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
547
        self.remote_refs = refs
548
        self.wants = self.actual(refs)
549
        return self.wants
550
551
0.401.2 by Jelmer Vernooij
Move all InterRepository implementations into interrepo.
552