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