/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
0.200.261 by Jelmer Vernooij
More formatting fixes.
17
from dulwich.objects import (
18
    Commit,
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
19
    Tag,
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
20
    Tree,
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
21
    S_ISGITLINK,
0.200.261 by Jelmer Vernooij
More formatting fixes.
22
    )
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
23
from dulwich.object_store import (
24
    tree_lookup_path,
25
    )
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
26
import posixpath
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
27
import re
0.200.352 by Jelmer Vernooij
Simplify mode handling.
28
import stat
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
29
30
from bzrlib import (
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
31
    debug,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
32
    osutils,
0.200.261 by Jelmer Vernooij
More formatting fixes.
33
    trace,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
34
    ui,
35
    )
36
from bzrlib.errors import (
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
37
    BzrError,
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
38
    NoSuchId,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
39
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
40
from bzrlib.inventory import (
41
    Inventory,
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
42
    InventoryDirectory,
43
    InventoryFile,
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
44
    InventoryLink,
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
45
    TreeReference,
0.200.261 by Jelmer Vernooij
More formatting fixes.
46
    )
47
from bzrlib.repository import (
48
    InterRepository,
49
    )
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
50
from bzrlib.revision import (
51
    NULL_REVISION,
52
    )
0.200.292 by Jelmer Vernooij
Fix formatting.
53
from bzrlib.tsort import (
54
    topo_sort,
55
    )
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
56
from bzrlib.versionedfile import (
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
57
    ChunkedContentFactory,
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
58
    )
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
59
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
60
from bzrlib.plugins.git.mapping import (
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
61
    DEFAULT_FILE_MODE,
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
62
    inventory_to_tree_and_blobs,
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
63
    mode_is_executable,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
64
    mode_kind,
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
65
    squash_revision,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
66
    warn_unusual_mode,
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
67
    )
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
68
from bzrlib.plugins.git.object_store import (
69
    BazaarObjectStore,
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
70
    LRUInventoryCache,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
71
    )
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
72
from bzrlib.plugins.git.remote import (
73
    RemoteGitRepository,
74
    )
0.200.169 by Jelmer Vernooij
Fix branch cloning.
75
from bzrlib.plugins.git.repository import (
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
76
    GitRepository,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
77
    GitRepositoryFormat,
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
78
    LocalGitRepository,
0.200.261 by Jelmer Vernooij
More formatting fixes.
79
    )
0.216.4 by Jelmer Vernooij
Add basic pack fetch infrastructure.
80
81
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
82
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha), 
83
        base_inv, base_inv_shamap, parent_id, revision_id,
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
84
        parent_invs, lookup_object, (base_mode, mode)):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
85
    """Import a git blob object into a bzr repository.
86
0.200.261 by Jelmer Vernooij
More formatting fixes.
87
    :param texts: VersionedFiles to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
88
    :param path: Path in the tree
89
    :param blob: A git blob
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
90
    :return: Inventory delta for this file
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
91
    """
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
92
    if base_hexsha == hexsha and base_mode == mode:
93
        # If nothing has changed since the base revision, we're done
94
        return [], []
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
95
    file_id = mapping.generate_file_id(path)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
96
    if stat.S_ISLNK(mode):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
97
        cls = InventoryLink
98
    else:
99
        cls = InventoryFile
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
100
    ie = cls(file_id, name.decode("utf-8"), parent_id)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
101
    ie.executable = mode_is_executable(mode)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
102
    if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
103
        base_ie = base_inv[base_inv.path2id(path)]
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
104
        ie.text_size = base_ie.text_size
105
        ie.text_sha1 = base_ie.text_sha1
106
        ie.symlink_target = base_ie.symlink_target
0.200.537 by Jelmer Vernooij
Fix handling of not-executable files becoming executable without any other changes.
107
        if ie.executable == base_ie.executable:
108
            ie.revision = base_ie.revision
109
        else:
110
            blob = lookup_object(hexsha)
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
111
    else:
112
        blob = lookup_object(hexsha)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
113
        if ie.kind == "symlink":
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
114
            ie.revision = None
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
115
            ie.symlink_target = blob.data
116
            ie.text_size = None
117
            ie.text_sha1 = None
118
        else:
119
            ie.text_size = len(blob.data)
120
            ie.text_sha1 = osutils.sha_string(blob.data)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
121
    # Check what revision we should store
0.200.283 by Jelmer Vernooij
Avoid storing repeated texts for blobs.
122
    parent_keys = []
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
123
    for pinv in parent_invs[1:]:
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
124
        if pinv.revision_id == base_inv.revision_id:
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
125
            pie = base_ie
126
            if pie is None:
127
                continue
128
        else:
129
            try:
130
                pie = pinv[file_id]
131
            except NoSuchId:
132
                continue
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
133
        if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
134
            # found a revision in one of the parents to use
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
135
            ie.revision = pie.revision
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
136
            break
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
137
        parent_keys.append((file_id, pie.revision))
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
138
    if ie.revision is None:
139
        # Need to store a new revision
140
        ie.revision = revision_id
141
        assert ie.revision is not None
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
142
        if ie.kind == 'symlink':
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
143
            chunks = []
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
144
        else: 
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
145
            try:
146
                chunks = blob.chunked
147
            except AttributeError: # older version of dulwich
148
                chunks = [blob.data]
149
        texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, chunks)])
0.200.771 by Jelmer Vernooij
Always set shamap.
150
    shamap = { ie.file_id: hexsha }
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
151
    invdelta = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
152
    if base_hexsha is not None:
153
        old_path = path # Renames are not supported yet
154
        if stat.S_ISDIR(base_mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
155
            invdelta.extend(remove_disappeared_children(base_inv, old_path,
156
                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).
157
    else:
158
        old_path = None
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
159
    invdelta.append((old_path, path, file_id, ie))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
160
    return (invdelta, shamap)
0.200.261 by Jelmer Vernooij
More formatting fixes.
161
162
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
163
class SubmodulesRequireSubtrees(BzrError):
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
164
    _fmt = """The repository you are fetching from contains submodules. To continue, upgrade your Bazaar repository to a format that supports nested trees, such as 'development-subtree'."""
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
165
    internal = False
166
167
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
168
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
169
    base_inv, parent_id, revision_id, parent_invs, lookup_object,
170
    (base_mode, mode)):
171
    if base_hexsha == hexsha and base_mode == mode:
172
        return [], {}, {}
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
173
    file_id = mapping.generate_file_id(path)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
174
    ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
175
    ie.revision = revision_id
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
176
    if base_hexsha is None:
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
177
        oldpath = None
178
    else:
179
        oldpath = path
180
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
181
    texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), (), None, [])])
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
182
    invdelta = [(oldpath, path, file_id, ie)]
183
    return invdelta, {}, {}
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
184
185
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
186
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
187
        lookup_object):
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
188
    ret = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
189
    for name, mode, hexsha in base_tree.iteritems():
190
        if name in existing_children:
191
            continue
192
        c_path = posixpath.join(path, name.decode("utf-8"))
193
        ret.append((c_path, None, base_inv.path2id(c_path), None))
194
        if stat.S_ISDIR(mode):
195
            ret.extend(remove_disappeared_children(
196
                base_inv, c_path, lookup_object(hexsha), [], lookup_object))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
197
    return ret
198
199
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
200
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
201
        base_inv, base_inv_shamap, parent_id, revision_id, parent_invs,
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
202
    lookup_object, (base_mode, mode), allow_submodules=False):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
203
    """Import a git tree object into a bzr repository.
204
0.200.261 by Jelmer Vernooij
More formatting fixes.
205
    :param texts: VersionedFiles object to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
206
    :param path: Path in the tree
207
    :param tree: A git tree object
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
208
    :param base_inv: Base inventory against which to return inventory delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
209
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
210
    """
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
211
    if base_hexsha == hexsha and base_mode == mode:
212
        # If nothing has changed since the base revision, we're done
213
        return [], {}, []
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
214
    invdelta = []
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
215
    file_id = mapping.generate_file_id(path)
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
216
    # We just have to hope this is indeed utf-8:
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
217
    ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
218
    tree = lookup_object(hexsha)
219
    if base_hexsha is None:
220
        base_tree = None
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
221
        old_path = None # Newly appeared here
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
222
    else:
223
        base_tree = lookup_object(base_hexsha)
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
224
        old_path = path # Renames aren't supported yet
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
225
    if base_tree is None or type(base_tree) is not Tree:
226
        ie.revision = revision_id
227
        invdelta.append((old_path, path, ie.file_id, ie))
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
228
        texts.insert_record_stream([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).
229
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
230
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
231
    child_modes = {}
0.200.757 by Jelmer Vernooij
Use inventory deltas.
232
    shamap = {}
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
233
    for child_mode, name, child_hexsha in tree.entries():
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
234
        existing_children.add(name)
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
235
        child_path = posixpath.join(path, name)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
236
        if type(base_tree) is Tree:
237
            try:
238
                child_base_mode, child_base_hexsha = base_tree[name]
239
            except KeyError:
240
                child_base_hexsha = None
241
                child_base_mode = 0
242
        else:
243
            child_base_hexsha = None
244
            child_base_mode = 0
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
245
        if stat.S_ISDIR(child_mode):
0.200.555 by Jelmer Vernooij
Change kind when turning symlink into dir.
246
            subinvdelta, grandchildmodes, subshamap = import_git_tree(
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
247
                    texts, mapping, child_path, name,
0.200.815 by Jelmer Vernooij
Pass tuple with base_sha, sha to make the argument list for import_git_* a bit more understandable.
248
                    (child_base_hexsha, child_hexsha),
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
249
                    base_inv, base_inv_shamap, 
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
250
                    file_id, revision_id, parent_invs, lookup_object,
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
251
                    (child_base_mode, child_mode),
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
252
                    allow_submodules=allow_submodules)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
253
        elif S_ISGITLINK(child_mode): # submodule
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
254
            if not allow_submodules:
255
                raise SubmodulesRequireSubtrees()
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
256
            subinvdelta, grandchildmodes, subshamap = import_git_submodule(
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
257
                    texts, mapping, child_path, name,
0.200.815 by Jelmer Vernooij
Pass tuple with base_sha, sha to make the argument list for import_git_* a bit more understandable.
258
                    (child_base_hexsha, child_hexsha),
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
259
                    base_inv, file_id, revision_id, parent_invs, lookup_object,
260
                    (child_base_mode, child_mode))
0.200.352 by Jelmer Vernooij
Simplify mode handling.
261
        else:
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
262
            subinvdelta, subshamap = import_git_blob(texts, mapping,
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
263
                    child_path, name, (child_base_hexsha, child_hexsha),
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
264
                    base_inv, base_inv_shamap,
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
265
                    file_id,
0.200.753 by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object.
266
                    revision_id, parent_invs, lookup_object,
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
267
                    (child_base_mode, child_mode))
0.200.757 by Jelmer Vernooij
Use inventory deltas.
268
            grandchildmodes = {}
269
        child_modes.update(grandchildmodes)
270
        invdelta.extend(subinvdelta)
271
        shamap.update(subshamap)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
272
        if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
273
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
274
            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).
275
    # Remove any children that have disappeared
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
276
    if base_tree is not None and type(base_tree) is Tree:
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
277
        invdelta.extend(remove_disappeared_children(base_inv, old_path, 
278
            base_tree, existing_children, lookup_object))
0.200.757 by Jelmer Vernooij
Use inventory deltas.
279
    shamap[file_id] = hexsha
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
280
    return invdelta, child_modes, shamap
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
281
282
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
283
def import_git_commit(repo, mapping, head, lookup_object,
0.200.752 by Jelmer Vernooij
Actually use shagitmap again to look up trees.
284
                      target_git_object_retriever, parent_invs_cache):
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
285
    o = lookup_object(head)
286
    rev = mapping.import_commit(o)
287
    # We have to do this here, since we have to walk the tree and
288
    # we need to make sure to import the blobs / trees with the right
289
    # path; this may involve adding them more than once.
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
290
    parent_invs = parent_invs_cache.get_inventories(rev.parent_ids)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
291
    if parent_invs == []:
292
        base_inv = Inventory(root_id=None)
0.200.753 by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object.
293
        base_inv_shamap = None # Should never be accessed
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
294
        base_tree = None
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
295
        base_mode = None
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
296
    else:
297
        base_inv = parent_invs[0]
0.200.753 by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object.
298
        base_inv_shamap = target_git_object_retriever._idmap.get_inventory_sha_map(base_inv.revision_id)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
299
        base_tree = lookup_object(o.parents[0]).tree
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
300
        base_mode = stat.S_IFDIR
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
301
    inv_delta, unusual_modes, shamap = import_git_tree(repo.texts,
0.200.818 by Jelmer Vernooij
Avoid decoding basename twice.
302
            mapping, "", u"", (base_tree, o.tree), base_inv, base_inv_shamap,
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
303
            None, rev.revision_id, parent_invs, lookup_object,
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
304
            (base_mode, stat.S_IFDIR),
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
305
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))
0.200.759 by Jelmer Vernooij
Prepare for using add_entries everywhere.
306
    entries = []
307
    for (oldpath, newpath, fileid, new_ie) in inv_delta:
308
        if newpath is None:
309
            entries.append((fileid, None, None, None))
310
        else:
311
            if new_ie.kind in ("file", "symlink"):
312
                entries.append((fileid, "blob", shamap[fileid], new_ie.revision))
313
            elif new_ie.kind == "directory":
314
                entries.append((fileid, "tree", shamap[fileid], rev.revision_id))
315
            else:
316
                raise AssertionError
0.200.755 by Jelmer Vernooij
Add parent revids argument to add_entries.
317
    target_git_object_retriever._idmap.add_entries(rev.revision_id,
0.200.759 by Jelmer Vernooij
Prepare for using add_entries everywhere.
318
        rev.parent_ids, head, o.tree, entries)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
319
    if unusual_modes != {}:
320
        for path, mode in unusual_modes.iteritems():
321
            warn_unusual_mode(rev.foreign_revid, path, mode)
322
        mapping.import_unusual_file_modes(rev, unusual_modes)
323
    try:
324
        basis_id = rev.parent_ids[0]
325
    except IndexError:
326
        basis_id = NULL_REVISION
327
        base_inv = None
328
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
329
              inv_delta, rev.revision_id, rev.parent_ids,
330
              base_inv)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
331
    parent_invs_cache.add(rev.revision_id, inv)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
332
    repo.add_revision(rev.revision_id, rev)
333
    if "verify" in debug.debug_flags:
334
        new_unusual_modes = mapping.export_unusual_file_modes(rev)
335
        if new_unusual_modes != unusual_modes:
336
            raise AssertionError("unusual modes don't match: %r != %r" % (unusual_modes, new_unusual_modes))
337
        objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping, unusual_modes)
0.200.739 by Jelmer Vernooij
Fix -Dverify
338
        for newsha1, newobj, path in objs:
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
339
            assert path is not None
0.200.739 by Jelmer Vernooij
Fix -Dverify
340
            if path == "":
341
                oldsha1 = o.tree
342
            else:
343
                (oldmode, oldsha1) = tree_lookup_path(lookup_object, o.tree, path)
344
            if oldsha1 != newsha1:
345
                raise AssertionError("%r != %r in %s" % (oldsha1, newsha1, path))
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
346
347
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
348
def import_git_objects(repo, mapping, object_iter,
349
    target_git_object_retriever, heads, pb=None, limit=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
350
    """Import a set of git objects into a bzr repository.
351
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
352
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
353
    :param mapping: Mapping to use
354
    :param object_iter: Iterator over Git objects.
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
355
    :return: Tuple with pack hints and last imported revision id
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
356
    """
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
357
    def lookup_object(sha):
358
        try:
359
            return object_iter[sha]
360
        except KeyError:
361
            return target_git_object_retriever[sha]
0.200.158 by Jelmer Vernooij
fetch works \o/
362
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
363
    checked = set()
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
364
    heads = list(set(heads))
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
365
    parent_invs_cache = LRUInventoryCache(repo)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
366
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
367
    while heads:
368
        if pb is not None:
369
            pb.update("finding revisions to fetch", len(graph), None)
370
        head = heads.pop()
371
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
372
        try:
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
373
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
374
        except KeyError:
375
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
376
        if isinstance(o, Commit):
377
            rev = mapping.import_commit(o)
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
378
            if repo.has_revision(rev.revision_id):
379
                continue
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
380
            squash_revision(repo, rev)
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.
381
            graph.append((o.id, o.parents))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
382
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
383
        elif isinstance(o, Tag):
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
384
            if o.object[1] not in checked:
385
                heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
386
        else:
387
            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.
388
        checked.add(o.id)
389
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
390
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
391
    # Create the inventory objects
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
392
    batch_size = 1000
0.200.680 by Jelmer Vernooij
fetch revisions in batches
393
    revision_ids = topo_sort(graph)
394
    pack_hints = []
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
395
    if limit is not None:
396
        revision_ids = revision_ids[:limit]
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
397
    last_imported = None
0.200.680 by Jelmer Vernooij
fetch revisions in batches
398
    for offset in range(0, len(revision_ids), batch_size):
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
399
        target_git_object_retriever.start_write_group() # FIXME: try/finally
0.200.680 by Jelmer Vernooij
fetch revisions in batches
400
        try:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
401
            repo.start_write_group()
402
            try:
403
                for i, head in enumerate(
404
                    revision_ids[offset:offset+batch_size]):
405
                    if pb is not None:
406
                        pb.update("fetching revisions", offset+i,
407
                                  len(revision_ids))
408
                    import_git_commit(repo, mapping, head, lookup_object,
409
                                      target_git_object_retriever,
410
                                      parent_invs_cache)
411
                    last_imported = head
412
            except:
413
                repo.abort_write_group()
414
                raise
415
            else:
416
                hint = repo.commit_write_group()
417
                if hint is not None:
418
                    pack_hints.extend(hint)
0.200.680 by Jelmer Vernooij
fetch revisions in batches
419
        except:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
420
            target_git_object_retriever.abort_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
421
            raise
422
        else:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
423
            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
424
    return pack_hints, last_imported
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
425
426
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
427
class InterGitRepository(InterRepository):
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
428
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
429
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
430
431
    @staticmethod
432
    def _get_repo_format_to_test():
433
        return None
434
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
435
    def copy_content(self, revision_id=None, pb=None):
436
        """See InterRepository.copy_content."""
437
        self.fetch(revision_id, pb, find_ghosts=False)
438
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
439
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
440
        mapping=None, fetch_spec=None):
441
        self.fetch_refs(revision_id=revision_id, pb=pb,
442
            find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)
0.200.247 by Jelmer Vernooij
Fix git-import.
443
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
444
445
class InterGitNonGitRepository(InterGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
446
    """Base InterRepository that copies revisions from a Git into a non-Git
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
447
    repository."""
448
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
449
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
0.200.247 by Jelmer Vernooij
Fix git-import.
450
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
451
        if mapping is None:
452
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
453
        if revision_id is not None:
454
            interesting_heads = [revision_id]
455
        elif fetch_spec is not None:
456
            interesting_heads = fetch_spec.heads
457
        else:
458
            interesting_heads = None
0.200.247 by Jelmer Vernooij
Fix git-import.
459
        self._refs = {}
460
        def determine_wants(refs):
461
            self._refs = refs
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
462
            if interesting_heads is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
463
                ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
464
            else:
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
465
                ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
466
            return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
467
        (pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
0.200.579 by Jelmer Vernooij
Only pack if it makes the target repo smaller.
468
        if pack_hint is not None and self.target._format.pack_compresses:
0.200.578 by Jelmer Vernooij
Only do optimal packing on bzr >= 1.17.
469
            self.target.pack(hint=pack_hint)
0.200.590 by Jelmer Vernooij
Add check to make sure that the requested heads were actually fetched.
470
        if interesting_heads is not None:
471
            present_interesting_heads = self.target.has_revisions(interesting_heads)
472
            missing_interesting_heads = set(interesting_heads) - present_interesting_heads
473
            if missing_interesting_heads:
474
                raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads)
0.200.247 by Jelmer Vernooij
Fix git-import.
475
        return self._refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
476
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
477
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
478
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
479
def report_git_progress(pb, text):
480
    text = text.rstrip("\r\n")
481
    g = _GIT_PROGRESS_RE.match(text)
482
    if g is not None:
483
        (text, pct, current, total) = g.groups()
484
        pb.update(text, int(current), int(total))
485
    else:
486
        pb.update(text, 0, 0)
487
488
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
489
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
490
    """InterRepository that copies revisions from a remote Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
491
    repository."""
492
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
493
    def get_target_heads(self):
494
        # FIXME: This should be more efficient
495
        all_revs = self.target.all_revision_ids()
496
        parent_map = self.target.get_parent_map(all_revs)
497
        all_parents = set()
498
        map(all_parents.update, parent_map.itervalues())
499
        return set(all_revs) - all_parents
500
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
501
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
502
        def progress(text):
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
503
            report_git_progress(pb, text)
0.200.466 by Jelmer Vernooij
Fix finding of heads for fetch_objects.
504
        store = BazaarObjectStore(self.target, mapping)
0.200.484 by Jelmer Vernooij
Cope with kind changes.
505
        self.target.lock_write()
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
506
        try:
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
507
            heads = self.get_target_heads()
0.200.484 by Jelmer Vernooij
Cope with kind changes.
508
            graph_walker = store.get_graph_walker(
509
                    [store._lookup_revision_sha1(head) for head in heads])
510
            recorded_wants = []
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
511
0.200.484 by Jelmer Vernooij
Cope with kind changes.
512
            def record_determine_wants(heads):
513
                wants = determine_wants(heads)
514
                recorded_wants.extend(wants)
515
                return wants
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
516
0.200.484 by Jelmer Vernooij
Cope with kind changes.
517
            create_pb = None
518
            if pb is None:
519
                create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
520
            try:
0.200.680 by Jelmer Vernooij
fetch revisions in batches
521
                objects_iter = self.source.fetch_objects(
522
                            record_determine_wants, graph_walker,
523
                            store.get_raw, progress)
524
                return import_git_objects(self.target, mapping,
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
525
                    objects_iter, store, recorded_wants, pb, limit)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
526
            finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
527
                if create_pb:
528
                    create_pb.finished()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
529
        finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
530
            self.target.unlock()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
531
532
    @staticmethod
533
    def is_compatible(source, target):
534
        """Be compatible with GitRepository."""
535
        # FIXME: Also check target uses VersionedFile
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
536
        return (isinstance(source, RemoteGitRepository) and
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
537
                target.supports_rich_root() and
538
                not isinstance(target, GitRepository))
539
540
541
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
542
    """InterRepository that copies revisions from a local Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
543
    repository."""
544
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
545
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
546
        """Fetch objects.
547
        """
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
548
        wants = determine_wants(self.source._git.get_refs())
549
        create_pb = None
550
        if pb is None:
551
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
552
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
553
        try:
554
            self.target.lock_write()
555
            try:
0.200.680 by Jelmer Vernooij
fetch revisions in batches
556
                return import_git_objects(self.target, mapping,
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
557
                    self.source._git.object_store,
558
                    target_git_object_retriever, wants, pb, limit)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
559
            finally:
560
                self.target.unlock()
561
        finally:
562
            if create_pb:
563
                create_pb.finished()
564
565
    @staticmethod
566
    def is_compatible(source, target):
567
        """Be compatible with GitRepository."""
568
        # FIXME: Also check target uses VersionedFile
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
569
        return (isinstance(source, LocalGitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
570
                target.supports_rich_root() and
571
                not isinstance(target, GitRepository))
572
573
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
574
class InterGitGitRepository(InterGitRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
575
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
576
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
577
    def fetch_objects(self, determine_wants, mapping, pb=None):
578
        def progress(text):
579
            trace.note("git: %s", text)
580
        graphwalker = self.target._git.get_graph_walker()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
581
        if (isinstance(self.source, LocalGitRepository) and
582
            isinstance(self.target, LocalGitRepository)):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
583
            return self.source._git.fetch(self.target._git, determine_wants,
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
584
                progress)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
585
        elif (isinstance(self.source, LocalGitRepository) and
586
              isinstance(self.target, RemoteGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
587
            raise NotImplementedError
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
588
        elif (isinstance(self.source, RemoteGitRepository) and
589
              isinstance(self.target, LocalGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
590
            f, commit = self.target._git.object_store.add_thin_pack()
591
            try:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
592
                refs = self.source._git.fetch_pack(determine_wants,
593
                    graphwalker, f.write, progress)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
594
                commit()
595
                return refs
596
            except:
597
                f.close()
598
                raise
599
        else:
600
            raise AssertionError
601
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
602
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
603
              mapping=None, fetch_spec=None, branches=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
604
        if mapping is None:
605
            mapping = self.source.get_mapping()
606
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
607
        if revision_id is not None:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
608
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
609
        elif fetch_spec is not None:
610
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
611
        if branches is not None:
612
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
613
        elif fetch_spec is None and revision_id is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
614
            determine_wants = r.object_store.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
615
        else:
0.200.247 by Jelmer Vernooij
Fix git-import.
616
            determine_wants = lambda x: [y for y in args if not y in r.object_store]
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
617
        return self.fetch_objects(determine_wants, mapping)[0]
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
618
619
620
    @staticmethod
621
    def is_compatible(source, target):
622
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
623
        return (isinstance(source, GitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
624
                isinstance(target, GitRepository))