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