/brz/remove-bazaar

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