/brz/remove-bazaar

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