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