/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), 
86
        base_inv, base_inv_shamap, 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),
197
        base_inv, base_inv_shamap, 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.821 by Jelmer Vernooij
Remove last references to ID.children.
244
                    base_inv, base_inv_shamap, 
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
245
                    file_id, revision_id, parent_invs, lookup_object,
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
246
                    (child_base_mode, child_mode), store_updater,
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
247
                    allow_submodules=allow_submodules)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
248
        elif S_ISGITLINK(child_mode): # submodule
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
249
            if not allow_submodules:
250
                raise SubmodulesRequireSubtrees()
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
251
            subinvdelta, grandchildmodes = import_git_submodule(
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
252
                    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.
253
                    (child_base_hexsha, child_hexsha),
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
254
                    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.
255
                    (child_base_mode, child_mode), store_updater)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
256
        else:
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
257
            subinvdelta = import_git_blob(texts, mapping,
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
258
                    child_path, name, (child_base_hexsha, child_hexsha),
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
259
                    base_inv, base_inv_shamap,
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
260
                    file_id,
0.200.753 by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object.
261
                    revision_id, parent_invs, lookup_object,
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
262
                    (child_base_mode, child_mode), store_updater)
0.200.757 by Jelmer Vernooij
Use inventory deltas.
263
            grandchildmodes = {}
264
        child_modes.update(grandchildmodes)
265
        invdelta.extend(subinvdelta)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
266
        if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
267
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
268
            child_modes[child_path] = child_mode
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
269
    # Remove any children that have disappeared
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
270
    if base_tree is not None and type(base_tree) is Tree:
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
271
        invdelta.extend(remove_disappeared_children(base_inv, old_path, 
272
            base_tree, existing_children, lookup_object))
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
273
    store_updater.add_object(tree, ie)
274
    return invdelta, child_modes
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
275
276
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
277
def import_git_commit(repo, mapping, head, lookup_object,
0.200.752 by Jelmer Vernooij
Actually use shagitmap again to look up trees.
278
                      target_git_object_retriever, parent_invs_cache):
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
279
    o = lookup_object(head)
280
    rev = mapping.import_commit(o)
281
    # We have to do this here, since we have to walk the tree and
282
    # we need to make sure to import the blobs / trees with the right
283
    # path; this may involve adding them more than once.
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
284
    parent_invs = parent_invs_cache.get_inventories(rev.parent_ids)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
285
    if parent_invs == []:
286
        base_inv = Inventory(root_id=None)
0.200.753 by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object.
287
        base_inv_shamap = None # Should never be accessed
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
288
        base_tree = None
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
289
        base_mode = None
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
290
    else:
291
        base_inv = parent_invs[0]
0.200.753 by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object.
292
        base_inv_shamap = target_git_object_retriever._idmap.get_inventory_sha_map(base_inv.revision_id)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
293
        base_tree = lookup_object(o.parents[0]).tree
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
294
        base_mode = stat.S_IFDIR
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
295
    store_updater = target_git_object_retriever._get_updater(rev)
296
    store_updater.add_object(o, None)
297
    inv_delta, unusual_modes = import_git_tree(repo.texts,
0.200.818 by Jelmer Vernooij
Avoid decoding basename twice.
298
            mapping, "", u"", (base_tree, o.tree), base_inv, base_inv_shamap,
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
299
            None, rev.revision_id, parent_invs, lookup_object,
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
300
            (base_mode, stat.S_IFDIR), store_updater,
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
301
            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.
302
    store_updater.finish()
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
303
    if unusual_modes != {}:
304
        for path, mode in unusual_modes.iteritems():
305
            warn_unusual_mode(rev.foreign_revid, path, mode)
306
        mapping.import_unusual_file_modes(rev, unusual_modes)
307
    try:
308
        basis_id = rev.parent_ids[0]
309
    except IndexError:
310
        basis_id = NULL_REVISION
311
        base_inv = None
312
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
313
              inv_delta, rev.revision_id, rev.parent_ids,
314
              base_inv)
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
315
    parent_invs_cache.add(rev.revision_id, inv)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
316
    repo.add_revision(rev.revision_id, rev)
317
    if "verify" in debug.debug_flags:
318
        new_unusual_modes = mapping.export_unusual_file_modes(rev)
319
        if new_unusual_modes != unusual_modes:
320
            raise AssertionError("unusual modes don't match: %r != %r" % (unusual_modes, new_unusual_modes))
321
        objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping, unusual_modes)
0.200.739 by Jelmer Vernooij
Fix -Dverify
322
        for newsha1, newobj, path in objs:
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
323
            assert path is not None
0.200.739 by Jelmer Vernooij
Fix -Dverify
324
            if path == "":
325
                oldsha1 = o.tree
326
            else:
327
                (oldmode, oldsha1) = tree_lookup_path(lookup_object, o.tree, path)
328
            if oldsha1 != newsha1:
329
                raise AssertionError("%r != %r in %s" % (oldsha1, newsha1, path))
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
330
331
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
332
def import_git_objects(repo, mapping, object_iter,
333
    target_git_object_retriever, heads, pb=None, limit=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
334
    """Import a set of git objects into a bzr repository.
335
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
336
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
337
    :param mapping: Mapping to use
338
    :param object_iter: Iterator over Git objects.
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
339
    :return: Tuple with pack hints and last imported revision id
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
340
    """
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
341
    def lookup_object(sha):
342
        try:
343
            return object_iter[sha]
344
        except KeyError:
345
            return target_git_object_retriever[sha]
0.200.158 by Jelmer Vernooij
fetch works \o/
346
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
347
    checked = set()
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
348
    heads = list(set(heads))
0.200.789 by Jelmer Vernooij
Cope with ghosts, cache inventories.
349
    parent_invs_cache = LRUInventoryCache(repo)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
350
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
351
    while heads:
352
        if pb is not None:
353
            pb.update("finding revisions to fetch", len(graph), None)
354
        head = heads.pop()
355
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
356
        try:
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
357
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
358
        except KeyError:
359
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
360
        if isinstance(o, Commit):
361
            rev = mapping.import_commit(o)
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
362
            if repo.has_revision(rev.revision_id):
363
                continue
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
364
            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.
365
            graph.append((o.id, o.parents))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
366
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
367
        elif isinstance(o, Tag):
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
368
            if o.object[1] not in checked:
369
                heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
370
        else:
371
            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.
372
        checked.add(o.id)
373
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
374
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
375
    # Create the inventory objects
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
376
    batch_size = 1000
0.200.680 by Jelmer Vernooij
fetch revisions in batches
377
    revision_ids = topo_sort(graph)
378
    pack_hints = []
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
379
    if limit is not None:
380
        revision_ids = revision_ids[:limit]
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
381
    last_imported = None
0.200.680 by Jelmer Vernooij
fetch revisions in batches
382
    for offset in range(0, len(revision_ids), batch_size):
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
383
        target_git_object_retriever.start_write_group() # FIXME: try/finally
0.200.680 by Jelmer Vernooij
fetch revisions in batches
384
        try:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
385
            repo.start_write_group()
386
            try:
387
                for i, head in enumerate(
388
                    revision_ids[offset:offset+batch_size]):
389
                    if pb is not None:
390
                        pb.update("fetching revisions", offset+i,
391
                                  len(revision_ids))
392
                    import_git_commit(repo, mapping, head, lookup_object,
393
                                      target_git_object_retriever,
394
                                      parent_invs_cache)
395
                    last_imported = head
396
            except:
397
                repo.abort_write_group()
398
                raise
399
            else:
400
                hint = repo.commit_write_group()
401
                if hint is not None:
402
                    pack_hints.extend(hint)
0.200.680 by Jelmer Vernooij
fetch revisions in batches
403
        except:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
404
            target_git_object_retriever.abort_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
405
            raise
406
        else:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
407
            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
408
    return pack_hints, last_imported
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
409
410
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
411
class InterGitRepository(InterRepository):
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
412
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
413
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
414
415
    @staticmethod
416
    def _get_repo_format_to_test():
417
        return None
418
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
419
    def copy_content(self, revision_id=None, pb=None):
420
        """See InterRepository.copy_content."""
421
        self.fetch(revision_id, pb, find_ghosts=False)
422
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
423
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
424
        mapping=None, fetch_spec=None):
425
        self.fetch_refs(revision_id=revision_id, pb=pb,
426
            find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)
0.200.247 by Jelmer Vernooij
Fix git-import.
427
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
428
429
class InterGitNonGitRepository(InterGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
430
    """Base InterRepository that copies revisions from a Git into a non-Git
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
431
    repository."""
432
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
433
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
0.200.247 by Jelmer Vernooij
Fix git-import.
434
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
435
        if mapping is None:
436
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
437
        if revision_id is not None:
438
            interesting_heads = [revision_id]
439
        elif fetch_spec is not None:
440
            interesting_heads = fetch_spec.heads
441
        else:
442
            interesting_heads = None
0.200.247 by Jelmer Vernooij
Fix git-import.
443
        self._refs = {}
444
        def determine_wants(refs):
445
            self._refs = refs
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
446
            if interesting_heads is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
447
                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.
448
            else:
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
449
                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.
450
            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.
451
        (pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
0.200.579 by Jelmer Vernooij
Only pack if it makes the target repo smaller.
452
        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.
453
            self.target.pack(hint=pack_hint)
0.200.590 by Jelmer Vernooij
Add check to make sure that the requested heads were actually fetched.
454
        if interesting_heads is not None:
455
            present_interesting_heads = self.target.has_revisions(interesting_heads)
456
            missing_interesting_heads = set(interesting_heads) - present_interesting_heads
457
            if missing_interesting_heads:
458
                raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads)
0.200.247 by Jelmer Vernooij
Fix git-import.
459
        return self._refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
460
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
461
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
462
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
463
def report_git_progress(pb, text):
464
    text = text.rstrip("\r\n")
465
    g = _GIT_PROGRESS_RE.match(text)
466
    if g is not None:
467
        (text, pct, current, total) = g.groups()
468
        pb.update(text, int(current), int(total))
469
    else:
470
        pb.update(text, 0, 0)
471
472
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
473
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
474
    """InterRepository that copies revisions from a remote Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
475
    repository."""
476
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
477
    def get_target_heads(self):
478
        # FIXME: This should be more efficient
479
        all_revs = self.target.all_revision_ids()
480
        parent_map = self.target.get_parent_map(all_revs)
481
        all_parents = set()
482
        map(all_parents.update, parent_map.itervalues())
483
        return set(all_revs) - all_parents
484
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
485
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
486
        def progress(text):
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
487
            report_git_progress(pb, text)
0.200.466 by Jelmer Vernooij
Fix finding of heads for fetch_objects.
488
        store = BazaarObjectStore(self.target, mapping)
0.200.484 by Jelmer Vernooij
Cope with kind changes.
489
        self.target.lock_write()
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
490
        try:
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
491
            heads = self.get_target_heads()
0.200.484 by Jelmer Vernooij
Cope with kind changes.
492
            graph_walker = store.get_graph_walker(
493
                    [store._lookup_revision_sha1(head) for head in heads])
494
            recorded_wants = []
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
495
0.200.484 by Jelmer Vernooij
Cope with kind changes.
496
            def record_determine_wants(heads):
497
                wants = determine_wants(heads)
498
                recorded_wants.extend(wants)
499
                return wants
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
500
0.200.484 by Jelmer Vernooij
Cope with kind changes.
501
            create_pb = None
502
            if pb is None:
503
                create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
504
            try:
0.200.680 by Jelmer Vernooij
fetch revisions in batches
505
                objects_iter = self.source.fetch_objects(
506
                            record_determine_wants, graph_walker,
507
                            store.get_raw, progress)
508
                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
509
                    objects_iter, store, recorded_wants, pb, limit)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
510
            finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
511
                if create_pb:
512
                    create_pb.finished()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
513
        finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
514
            self.target.unlock()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
515
516
    @staticmethod
517
    def is_compatible(source, target):
518
        """Be compatible with GitRepository."""
519
        # FIXME: Also check target uses VersionedFile
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
520
        return (isinstance(source, RemoteGitRepository) and
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
521
                target.supports_rich_root() and
522
                not isinstance(target, GitRepository))
523
524
525
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
526
    """InterRepository that copies revisions from a local Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
527
    repository."""
528
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
529
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
530
        """Fetch objects.
531
        """
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
532
        wants = determine_wants(self.source._git.get_refs())
533
        create_pb = None
534
        if pb is None:
535
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
536
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
537
        try:
538
            self.target.lock_write()
539
            try:
0.200.680 by Jelmer Vernooij
fetch revisions in batches
540
                return import_git_objects(self.target, mapping,
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
541
                    self.source._git.object_store,
542
                    target_git_object_retriever, wants, pb, limit)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
543
            finally:
544
                self.target.unlock()
545
        finally:
546
            if create_pb:
547
                create_pb.finished()
548
549
    @staticmethod
550
    def is_compatible(source, target):
551
        """Be compatible with GitRepository."""
552
        # FIXME: Also check target uses VersionedFile
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
553
        return (isinstance(source, LocalGitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
554
                target.supports_rich_root() and
555
                not isinstance(target, GitRepository))
556
557
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
558
class InterGitGitRepository(InterGitRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
559
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
560
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
561
    def fetch_objects(self, determine_wants, mapping, pb=None):
562
        def progress(text):
563
            trace.note("git: %s", text)
564
        graphwalker = self.target._git.get_graph_walker()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
565
        if (isinstance(self.source, LocalGitRepository) and
566
            isinstance(self.target, LocalGitRepository)):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
567
            return self.source._git.fetch(self.target._git, determine_wants,
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
568
                progress)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
569
        elif (isinstance(self.source, LocalGitRepository) and
570
              isinstance(self.target, RemoteGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
571
            raise NotImplementedError
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
572
        elif (isinstance(self.source, RemoteGitRepository) and
573
              isinstance(self.target, LocalGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
574
            f, commit = self.target._git.object_store.add_thin_pack()
575
            try:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
576
                refs = self.source._git.fetch_pack(determine_wants,
577
                    graphwalker, f.write, progress)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
578
                commit()
579
                return refs
580
            except:
581
                f.close()
582
                raise
583
        else:
584
            raise AssertionError
585
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
586
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
587
              mapping=None, fetch_spec=None, branches=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
588
        if mapping is None:
589
            mapping = self.source.get_mapping()
590
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
591
        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.
592
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
593
        elif fetch_spec is not None:
594
            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.
595
        if branches is not None:
596
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
597
        elif fetch_spec is None and revision_id is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
598
            determine_wants = r.object_store.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
599
        else:
0.200.247 by Jelmer Vernooij
Fix git-import.
600
            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
601
        return self.fetch_objects(determine_wants, mapping)[0]
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
602
603
604
    @staticmethod
605
    def is_compatible(source, target):
606
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
607
        return (isinstance(source, GitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
608
                isinstance(target, GitRepository))