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