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