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