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