/brz/remove-bazaar

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