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