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