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