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