/brz/remove-bazaar

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