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