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