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