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