/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,
278
                file_id, revision_id, parent_invs, lookup_object, 
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,
308
    o, rev, ret_tree, parent_trees, mapping, unusual_modes):
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.929 by Jelmer Vernooij
Fix number of arguments in debug code.
314
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
315
    if rec_o != o:
316
        raise AssertionError("Reconstructed commit differs: %r != %r" % (
317
            rec_o, o))
318
    diff = []
319
    new_objs = {}
320
    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.
321
        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.
322
        old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
323
        new_objs[path] = obj
324
        if obj.id != old_obj_id:
325
            diff.append((path, lookup_object(old_obj_id), obj))
326
    for (path, old_obj, new_obj) in diff:
327
        while (old_obj.type_name == "tree" and
328
               new_obj.type_name == "tree" and
329
               sorted(old_obj) == sorted(new_obj)):
330
            for name in old_obj:
331
                if old_obj[name][0] != new_obj[name][0]:
0.252.25 by Jelmer Vernooij
Reformatting.
332
                    raise AssertionError("Modes for %s differ: %o != %o" %
333
                        (path, old_obj[name][0], new_obj[name][0]))
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
334
                if old_obj[name][1] != new_obj[name][1]:
335
                    # Found a differing child, delve deeper
336
                    path = posixpath.join(path, name)
337
                    old_obj = lookup_object(old_obj[name][1])
338
                    new_obj = new_objs[path]
339
                    break
340
        raise AssertionError("objects differ for %s: %r != %r" % (path,
341
            old_obj, new_obj))
342
343
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
344
def import_git_commit(repo, mapping, head, lookup_object,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
345
                      target_git_object_retriever, trees_cache):
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
346
    o = lookup_object(head)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
347
    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.
348
            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.
349
    # We have to do this here, since we have to walk the tree and
350
    # we need to make sure to import the blobs / trees with the right
351
    # path; this may involve adding them more than once.
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
352
    parent_trees = trees_cache.revision_trees(rev.parent_ids)
353
    if parent_trees == []:
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
354
        base_inv = Inventory(root_id=None)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
355
        base_tree = None
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
356
        base_mode = None
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
357
    else:
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
358
        base_inv = parent_trees[0].inventory
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
359
        base_tree = lookup_object(o.parents[0]).tree
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
360
        base_mode = stat.S_IFDIR
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
361
    store_updater = target_git_object_retriever._get_updater(rev)
0.200.988 by Jelmer Vernooij
Some formatting cleanups.
362
    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.
363
    inv_delta, unusual_modes = import_git_tree(repo.texts,
0.200.988 by Jelmer Vernooij
Some formatting cleanups.
364
            mapping, "", "", (base_tree, o.tree), base_inv,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
365
            None, rev.revision_id, [p.inventory for p in parent_trees],
366
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
0.200.988 by Jelmer Vernooij
Some formatting cleanups.
367
            fileid_map.lookup_file_id,
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
368
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))
369
    if unusual_modes != {}:
370
        for path, mode in unusual_modes.iteritems():
371
            warn_unusual_mode(rev.foreign_revid, path, mode)
372
        mapping.import_unusual_file_modes(rev, unusual_modes)
373
    try:
374
        basis_id = rev.parent_ids[0]
375
    except IndexError:
376
        basis_id = NULL_REVISION
377
        base_inv = None
378
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
0.200.988 by Jelmer Vernooij
Some formatting cleanups.
379
              inv_delta, rev.revision_id, rev.parent_ids, base_inv)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
380
    # FIXME: Check verifiers
381
    testament = StrictTestament3(rev, inv)
382
    calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
383
    if roundtrip_revid is not None:
0.200.1023 by Jelmer Vernooij
Set and verify testament.
384
        original_revid = rev.revision_id
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
385
        rev.revision_id = roundtrip_revid
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
386
        if calculated_verifiers != verifiers:
0.200.1023 by Jelmer Vernooij
Set and verify testament.
387
            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.
388
                         calculated_verifiers["testament3-sha1"],
389
                         rev.revision_id, verifiers["testament3-sha1"])
0.200.1023 by Jelmer Vernooij
Set and verify testament.
390
            rev.revision_id = original_revid
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
391
    store_updater.add_object(o, calculated_verifiers, None)
392
    store_updater.finish()
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
393
    ret_tree = RevisionTree(repo, inv, rev.revision_id)
394
    trees_cache.add(ret_tree)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
395
    repo.add_revision(rev.revision_id, rev)
396
    if "verify" in debug.debug_flags:
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
397
        verify_commit_reconstruction(target_git_object_retriever, 
398
            lookup_object, o, rev, ret_tree, parent_trees, mapping,
399
            unusual_modes)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
400
401
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
402
def import_git_objects(repo, mapping, object_iter,
403
    target_git_object_retriever, heads, pb=None, limit=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
404
    """Import a set of git objects into a bzr repository.
405
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
406
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
407
    :param mapping: Mapping to use
408
    :param object_iter: Iterator over Git objects.
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
409
    :return: Tuple with pack hints and last imported revision id
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
410
    """
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
411
    def lookup_object(sha):
412
        try:
413
            return object_iter[sha]
414
        except KeyError:
415
            return target_git_object_retriever[sha]
0.200.158 by Jelmer Vernooij
fetch works \o/
416
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
417
    checked = set()
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
418
    heads = list(set(heads))
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
419
    trees_cache = LRUTreeCache(repo)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
420
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
421
    while heads:
422
        if pb is not None:
423
            pb.update("finding revisions to fetch", len(graph), None)
424
        head = heads.pop()
425
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
426
        try:
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
427
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
428
        except KeyError:
429
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
430
        if isinstance(o, Commit):
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
431
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
432
                lambda x: None)
433
            if (repo.has_revision(rev.revision_id) or
434
                (roundtrip_revid and repo.has_revision(roundtrip_revid))):
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
435
                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.
436
            graph.append((o.id, o.parents))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
437
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
438
        elif isinstance(o, Tag):
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
439
            if o.object[1] not in checked:
440
                heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
441
        else:
442
            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.
443
        checked.add(o.id)
444
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
445
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
446
    # Create the inventory objects
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
447
    batch_size = 1000
0.200.680 by Jelmer Vernooij
fetch revisions in batches
448
    revision_ids = topo_sort(graph)
449
    pack_hints = []
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
450
    if limit is not None:
451
        revision_ids = revision_ids[:limit]
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
452
    last_imported = None
0.200.680 by Jelmer Vernooij
fetch revisions in batches
453
    for offset in range(0, len(revision_ids), batch_size):
0.254.33 by Jelmer Vernooij
Merge trunk.
454
        target_git_object_retriever.start_write_group() 
0.200.680 by Jelmer Vernooij
fetch revisions in batches
455
        try:
0.254.33 by Jelmer Vernooij
Merge trunk.
456
            repo.start_write_group()
457
            try:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
458
                for i, head in enumerate(
459
                    revision_ids[offset:offset+batch_size]):
0.254.33 by Jelmer Vernooij
Merge trunk.
460
                    if pb is not None:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
461
                        pb.update("fetching revisions", offset+i,
462
                                  len(revision_ids))
0.254.33 by Jelmer Vernooij
Merge trunk.
463
                    import_git_commit(repo, mapping, head, lookup_object,
0.252.25 by Jelmer Vernooij
Reformatting.
464
                        target_git_object_retriever, trees_cache)
0.254.33 by Jelmer Vernooij
Merge trunk.
465
                    last_imported = head
466
            except:
467
                repo.abort_write_group()
468
                raise
469
            else:
470
                hint = repo.commit_write_group()
471
                if hint is not None:
472
                    pack_hints.extend(hint)
0.200.680 by Jelmer Vernooij
fetch revisions in batches
473
        except:
0.254.33 by Jelmer Vernooij
Merge trunk.
474
            target_git_object_retriever.abort_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
475
            raise
476
        else:
0.254.33 by Jelmer Vernooij
Merge trunk.
477
            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
478
    return pack_hints, last_imported
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
479
480
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
481
class InterGitRepository(InterRepository):
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
482
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
483
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
484
485
    @staticmethod
486
    def _get_repo_format_to_test():
487
        return None
488
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
489
    def copy_content(self, revision_id=None, pb=None):
490
        """See InterRepository.copy_content."""
491
        self.fetch(revision_id, pb, find_ghosts=False)
492
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
493
494
class InterGitNonGitRepository(InterGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
495
    """Base InterRepository that copies revisions from a Git into a non-Git
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
496
    repository."""
497
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
498
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
499
        """Fetch objects from a remote server.
500
501
        :param determine_wants: determine_wants callback
502
        :param mapping: BzrGitMapping to use
503
        :param pb: Optional progress bar
504
        :param limit: Maximum number of commits to import.
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
505
        :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().
506
        """
507
        raise NotImplementedError(self.fetch_objects)
508
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
509
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
0.200.247 by Jelmer Vernooij
Fix git-import.
510
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
511
        if mapping is None:
512
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
513
        if revision_id is not None:
514
            interesting_heads = [revision_id]
515
        elif fetch_spec is not None:
516
            interesting_heads = fetch_spec.heads
517
        else:
518
            interesting_heads = None
0.200.247 by Jelmer Vernooij
Fix git-import.
519
        def determine_wants(refs):
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
520
            if interesting_heads is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
521
                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.
522
            else:
0.252.45 by Jelmer Vernooij
Finish fetching roundtripped revisions back into bzr.
523
                ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
524
            return [rev for rev in ret if not self.target.has_revision(self.source.lookup_foreign_revision_id(rev))]
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
525
        (pack_hint, _, remote_refs) = self.fetch_objects(determine_wants, mapping, pb)
0.200.579 by Jelmer Vernooij
Only pack if it makes the target repo smaller.
526
        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.
527
            self.target.pack(hint=pack_hint)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
528
        return remote_refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
529
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
530
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
531
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
532
def report_git_progress(pb, text):
533
    text = text.rstrip("\r\n")
534
    g = _GIT_PROGRESS_RE.match(text)
535
    if g is not None:
536
        (text, pct, current, total) = g.groups()
537
        pb.update(text, int(current), int(total))
538
    else:
539
        pb.update(text, 0, 0)
540
541
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
542
class DetermineWantsRecorder(object):
543
544
    def __init__(self, actual):
545
        self.actual = actual
546
        self.wants = []
547
        self.remote_refs = {}
548
549
    def __call__(self, refs):
550
        self.remote_refs = refs
551
        self.wants = self.actual(refs)
552
        return self.wants
553
554
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
555
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
556
    """InterRepository that copies revisions from a remote Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
557
    repository."""
558
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
559
    def get_target_heads(self):
560
        # FIXME: This should be more efficient
561
        all_revs = self.target.all_revision_ids()
562
        parent_map = self.target.get_parent_map(all_revs)
563
        all_parents = set()
564
        map(all_parents.update, parent_map.itervalues())
565
        return set(all_revs) - all_parents
566
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
567
    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().
568
        """See `InterGitNonGitRepository`."""
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
569
        def progress(text):
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
570
            report_git_progress(pb, text)
0.200.466 by Jelmer Vernooij
Fix finding of heads for fetch_objects.
571
        store = BazaarObjectStore(self.target, mapping)
0.200.484 by Jelmer Vernooij
Cope with kind changes.
572
        self.target.lock_write()
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
573
        try:
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
574
            heads = self.get_target_heads()
0.200.484 by Jelmer Vernooij
Cope with kind changes.
575
            graph_walker = store.get_graph_walker(
576
                    [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().
577
            wants_recorder = DetermineWantsRecorder(determine_wants)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
578
0.200.484 by Jelmer Vernooij
Cope with kind changes.
579
            create_pb = None
580
            if pb is None:
581
                create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
582
            try:
0.200.1000 by Jelmer Vernooij
Fix fetch between local and remote git branches.
583
                objects_iter = self.source.fetch_objects(
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
584
                    wants_recorder, graph_walker, store.get_raw,
0.200.1000 by Jelmer Vernooij
Fix fetch between local and remote git branches.
585
                    progress)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
586
                (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().
587
                    objects_iter, store, wants_recorder.wants, pb, limit)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
588
                return (pack_hint, last_rev, wants_recorder.remote_refs)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
589
            finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
590
                if create_pb:
591
                    create_pb.finished()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
592
        finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
593
            self.target.unlock()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
594
595
    @staticmethod
596
    def is_compatible(source, target):
597
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
598
        return (isinstance(source, RemoteGitRepository) and
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
599
                target.supports_rich_root() and
0.200.906 by Jelmer Vernooij
Check that target supports versionedfile.
600
                not isinstance(target, GitRepository) and
601
                target.texts is not None)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
602
603
604
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
605
    """InterRepository that copies revisions from a local Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
606
    repository."""
607
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
608
    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().
609
        """See `InterGitNonGitRepository`."""
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
610
        remote_refs = self.source._git.get_refs()
611
        wants = determine_wants(remote_refs)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
612
        create_pb = None
613
        if pb is None:
614
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
615
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
616
        try:
617
            self.target.lock_write()
618
            try:
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
619
                (pack_hint, last_rev) = import_git_objects(self.target, mapping,
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
620
                    self.source._git.object_store,
621
                    target_git_object_retriever, wants, pb, limit)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
622
                return (pack_hint, last_rev, remote_refs)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
623
            finally:
624
                self.target.unlock()
625
        finally:
626
            if create_pb:
627
                create_pb.finished()
628
629
    @staticmethod
630
    def is_compatible(source, target):
631
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
632
        return (isinstance(source, LocalGitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
633
                target.supports_rich_root() and
0.200.906 by Jelmer Vernooij
Check that target supports versionedfile.
634
                not isinstance(target, GitRepository) and
635
                target.texts is not None)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
636
637
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
638
class InterGitGitRepository(InterGitRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
639
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
640
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
641
    def fetch_objects(self, determine_wants, mapping, pb=None):
642
        def progress(text):
643
            trace.note("git: %s", text)
644
        graphwalker = self.target._git.get_graph_walker()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
645
        if (isinstance(self.source, LocalGitRepository) and
646
            isinstance(self.target, LocalGitRepository)):
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
647
            refs = self.source._git.fetch(self.target._git, determine_wants,
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
648
                progress)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
649
            return (None, None, refs)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
650
        elif (isinstance(self.source, LocalGitRepository) and
651
              isinstance(self.target, RemoteGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
652
            raise NotImplementedError
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
653
        elif (isinstance(self.source, RemoteGitRepository) and
654
              isinstance(self.target, LocalGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
655
            f, commit = self.target._git.object_store.add_thin_pack()
656
            try:
0.200.1003 by Jelmer Vernooij
Initial work on supporting move_in_thin_pack.
657
                refs = self.source.bzrdir.root_transport.fetch_pack(
658
                    determine_wants, graphwalker, f.write, progress)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
659
                commit()
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
660
                return (None, None, refs)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
661
            except:
662
                f.close()
663
                raise
664
        else:
665
            raise AssertionError
666
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
667
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
668
              mapping=None, fetch_spec=None, branches=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
669
        if mapping is None:
670
            mapping = self.source.get_mapping()
671
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
672
        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.
673
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
674
        elif fetch_spec is not None:
675
            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.
676
        if branches is not None:
677
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
678
        elif fetch_spec is None and revision_id is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
679
            determine_wants = r.object_store.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
680
        else:
0.200.247 by Jelmer Vernooij
Fix git-import.
681
            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.
682
        self.fetch_objects(determine_wants, mapping)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
683
684
    @staticmethod
685
    def is_compatible(source, target):
686
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
687
        return (isinstance(source, GitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
688
                isinstance(target, GitRepository))