/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2008 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.540 by Jelmer Vernooij
Handle submodules explicitly.
20
    S_ISGITLINK,
0.200.261 by Jelmer Vernooij
More formatting fixes.
21
    )
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
22
from dulwich.object_store import (
23
    tree_lookup_path,
24
    )
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
25
import re
0.200.352 by Jelmer Vernooij
Simplify mode handling.
26
import stat
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
27
28
from bzrlib import (
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
29
    debug,
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.
30
    lru_cache,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
31
    osutils,
0.200.261 by Jelmer Vernooij
More formatting fixes.
32
    trace,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
33
    ui,
34
    urlutils,
35
    )
36
from bzrlib.errors import (
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
37
    BzrError,
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
38
    NoSuchId,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
39
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
40
from bzrlib.inventory import (
41
    Inventory,
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
42
    InventoryDirectory,
43
    InventoryFile,
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
44
    InventoryLink,
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
45
    TreeReference,
0.200.261 by Jelmer Vernooij
More formatting fixes.
46
    )
47
from bzrlib.repository import (
48
    InterRepository,
49
    )
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
50
from bzrlib.revision import (
51
    NULL_REVISION,
52
    )
0.200.292 by Jelmer Vernooij
Fix formatting.
53
from bzrlib.tsort import (
54
    topo_sort,
55
    )
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
56
from bzrlib.versionedfile import (
57
    FulltextContentFactory,
58
    )
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
59
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
60
from bzrlib.plugins.git.mapping import (
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
61
    DEFAULT_FILE_MODE,
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
62
    inventory_to_tree_and_blobs,
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
63
    mode_is_executable,
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
64
    squash_revision,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
65
    warn_unusual_mode,
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
66
    )
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
67
from bzrlib.plugins.git.object_store import (
68
    BazaarObjectStore,
69
    )
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
70
from bzrlib.plugins.git.remote import (
71
    RemoteGitRepository,
72
    )
0.200.169 by Jelmer Vernooij
Fix branch cloning.
73
from bzrlib.plugins.git.repository import (
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
74
    GitRepository,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
75
    GitRepositoryFormat,
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
76
    LocalGitRepository,
0.200.261 by Jelmer Vernooij
More formatting fixes.
77
    )
0.216.4 by Jelmer Vernooij
Add basic pack fetch infrastructure.
78
79
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.
80
MAX_INV_CACHE_SIZE = 50 * 1024 * 1024
81
82
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
83
def import_git_blob(texts, mapping, path, hexsha, base_inv, base_ie, parent_id,
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
84
    revision_id, parent_invs, shagitmap, lookup_object, executable, symlink):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
85
    """Import a git blob object into a bzr repository.
86
0.200.261 by Jelmer Vernooij
More formatting fixes.
87
    :param texts: VersionedFiles to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
88
    :param path: Path in the tree
89
    :param blob: A git blob
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
90
    :return: Inventory delta for this file
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
91
    """
92
    file_id = mapping.generate_file_id(path)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
93
    if symlink:
94
        cls = InventoryLink
95
    else:
96
        cls = InventoryFile
97
    # We just have to hope this is indeed utf-8:
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
98
    ie = cls(file_id, urlutils.basename(path).decode("utf-8"), parent_id)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
99
    ie.executable = executable
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
100
    # See if this has changed at all
0.200.571 by Jelmer Vernooij
Keep inventory entry children around once we've fetched them.
101
    if base_ie is None:
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
102
        base_sha = None
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
103
    else:
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
104
        try:
0.200.555 by Jelmer Vernooij
Change kind when turning symlink into dir.
105
            base_sha = shagitmap.lookup_blob(file_id, base_ie.revision)
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
106
        except KeyError:
107
            base_sha = None
108
        else:
109
            if (base_sha == hexsha and base_ie.executable == ie.executable
110
                and base_ie.kind == ie.kind):
111
                # If nothing has changed since the base revision, we're done
112
                return [], []
0.200.484 by Jelmer Vernooij
Cope with kind changes.
113
    if base_sha == hexsha and base_ie.kind == ie.kind:
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
114
        ie.text_size = base_ie.text_size
115
        ie.text_sha1 = base_ie.text_sha1
116
        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.
117
        if ie.executable == base_ie.executable:
118
            ie.revision = base_ie.revision
119
        else:
120
            blob = lookup_object(hexsha)
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
121
    else:
122
        blob = lookup_object(hexsha)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
123
        if ie.kind == "symlink":
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
124
            ie.revision = None
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
125
            ie.symlink_target = blob.data
126
            ie.text_size = None
127
            ie.text_sha1 = None
128
        else:
129
            ie.text_size = len(blob.data)
130
            ie.text_sha1 = osutils.sha_string(blob.data)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
131
    # Check what revision we should store
0.200.283 by Jelmer Vernooij
Avoid storing repeated texts for blobs.
132
    parent_keys = []
133
    for pinv in parent_invs:
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
134
        if pinv.revision_id == base_inv.revision_id:
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
135
            pie = base_ie
136
            if pie is None:
137
                continue
138
        else:
139
            try:
140
                pie = pinv[file_id]
141
            except NoSuchId:
142
                continue
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
143
        if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and 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.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
147
        parent_keys.append((file_id, pie.revision))
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
148
    if ie.revision is None:
149
        # Need to store a new revision
150
        ie.revision = revision_id
151
        assert file_id is not None
152
        assert ie.revision is not None
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
153
        texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, blob.data)])
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
154
        shamap = [(hexsha, "blob", (ie.file_id, ie.revision))]
155
    else:
156
        shamap = []
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
157
    invdelta = []
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
158
    if base_ie is not None:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
159
        old_path = base_inv.id2path(file_id)
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
160
        if base_ie.kind == "directory":
161
            invdelta.extend(remove_disappeared_children(old_path, base_ie.children, []))
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
162
    else:
163
        old_path = None
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
164
    invdelta.append((old_path, path, file_id, ie))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
165
    return (invdelta, shamap)
0.200.261 by Jelmer Vernooij
More formatting fixes.
166
167
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
168
class SubmodulesRequireSubtrees(BzrError):
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
169
    _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.
170
    internal = False
171
172
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
173
def import_git_submodule(texts, mapping, path, hexsha, base_inv, base_ie,
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
174
    parent_id, revision_id, parent_invs, shagitmap, lookup_object):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
175
    file_id = mapping.generate_file_id(path)
176
    ie = TreeReference(file_id, urlutils.basename(path.decode("utf-8")),
177
        parent_id)
178
    ie.revision = revision_id
179
    if base_ie is None:
180
        oldpath = None
181
    else:
182
        oldpath = path
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
183
        if (base_ie.kind == ie.kind and
184
            base_ie.reference_revision == ie.reference_revision):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
185
            ie.revision = base_ie.revision
186
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
187
    texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), (), None, "")])
188
    invdelta = [(oldpath, path, file_id, ie)]
189
    return invdelta, {}, {}
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
190
191
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
192
def remove_disappeared_children(path, base_children, existing_children):
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
193
    ret = []
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
194
    deletable = [(osutils.pathjoin(path, k), v) for k,v in base_children.iteritems() if k not in existing_children]
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
195
    while deletable:
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
196
        (path, ie) = deletable.pop()
197
        ret.append((path, None, ie.file_id, None))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
198
        if ie.kind == "directory":
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
199
            for name, child_ie in ie.children.iteritems():
200
                deletable.append((osutils.pathjoin(path, name), child_ie))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
201
    return ret
202
203
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
204
def import_git_tree(texts, mapping, path, hexsha, base_inv, base_ie, parent_id,
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
205
    revision_id, parent_invs, shagitmap, lookup_object, allow_submodules=False):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
206
    """Import a git tree object into a bzr repository.
207
0.200.261 by Jelmer Vernooij
More formatting fixes.
208
    :param texts: VersionedFiles object to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
209
    :param path: Path in the tree
210
    :param tree: A git tree object
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
211
    :param base_inv: Base inventory against which to return inventory delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
212
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
213
    """
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
214
    invdelta = []
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
215
    file_id = mapping.generate_file_id(path)
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
216
    # We just have to hope this is indeed utf-8:
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
217
    ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")),
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
218
        parent_id)
0.200.571 by Jelmer Vernooij
Keep inventory entry children around once we've fetched them.
219
    if base_ie is None:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
220
        # Newly appeared here
221
        ie.revision = revision_id
0.200.577 by Jelmer Vernooij
Fix new directory handling.
222
        texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), (), None, "")])
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
223
        invdelta.append((None, path, file_id, ie))
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
224
    else:
225
        # See if this has changed at all
0.200.287 by Jelmer Vernooij
Skip tree sha's already in the git sha map.
226
        try:
0.200.555 by Jelmer Vernooij
Change kind when turning symlink into dir.
227
            base_sha = shagitmap.lookup_tree(file_id, base_inv.revision_id)
0.200.287 by Jelmer Vernooij
Skip tree sha's already in the git sha map.
228
        except KeyError:
229
            pass
0.200.346 by Jelmer Vernooij
Track unusual file modes.
230
        else:
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
231
            if base_sha == hexsha:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
232
                # If nothing has changed since the base revision, we're done
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
233
                return [], {}, []
0.200.553 by Jelmer Vernooij
Support symlinks being turned into directories.
234
        if base_ie.kind != "directory":
235
            ie.revision = revision_id
0.200.577 by Jelmer Vernooij
Fix new directory handling.
236
            texts.insert_record_stream([FulltextContentFactory((ie.file_id, ie.revision), (), None, "")])
0.200.555 by Jelmer Vernooij
Change kind when turning symlink into dir.
237
            invdelta.append((base_inv.id2path(ie.file_id), path, ie.file_id, ie))
0.200.571 by Jelmer Vernooij
Keep inventory entry children around once we've fetched them.
238
    if base_ie is not None and base_ie.kind == "directory":
239
        base_children = base_ie.children
240
    else:
241
        base_children = {}
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
242
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
243
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
244
    child_modes = {}
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
245
    shamap = []
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
246
    tree = lookup_object(hexsha)
0.200.363 by Jelmer Vernooij
Fix updates of sha map during fetch.
247
    for mode, name, child_hexsha in tree.entries():
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
248
        basename = name.decode("utf-8")
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
249
        existing_children.add(basename)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
250
        child_path = osutils.pathjoin(path, name)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
251
        if stat.S_ISDIR(mode):
0.200.555 by Jelmer Vernooij
Change kind when turning symlink into dir.
252
            subinvdelta, grandchildmodes, subshamap = import_git_tree(
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
253
                    texts, mapping, child_path, child_hexsha, base_inv,
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
254
                    base_children.get(basename), file_id, revision_id,
255
                    parent_invs, shagitmap, lookup_object,
256
                    allow_submodules=allow_submodules)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
257
            invdelta.extend(subinvdelta)
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
258
            child_modes.update(grandchildmodes)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
259
            shamap.extend(subshamap)
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
260
        elif S_ISGITLINK(mode): # submodule
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
261
            if not allow_submodules:
262
                raise SubmodulesRequireSubtrees()
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
263
            subinvdelta, grandchildmodes, subshamap = import_git_submodule(
0.200.592 by Jelmer Vernooij
Avoid 'No such revision' error when encountering submodules.
264
                    texts, mapping, child_path, child_hexsha, base_inv, base_children.get(basename),
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
265
                    file_id, revision_id, parent_invs, shagitmap, lookup_object)
266
            invdelta.extend(subinvdelta)
267
            child_modes.update(grandchildmodes)
268
            shamap.extend(subshamap)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
269
        else:
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
270
            subinvdelta, subshamap = import_git_blob(texts, mapping,
0.200.573 by Jelmer Vernooij
Use unicode names.
271
                    child_path, child_hexsha, base_inv, base_children.get(basename), file_id,
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
272
                    revision_id, parent_invs, shagitmap, lookup_object,
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
273
                    mode_is_executable(mode), stat.S_ISLNK(mode))
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
274
            invdelta.extend(subinvdelta)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
275
            shamap.extend(subshamap)
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.
276
        if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
277
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
0.200.352 by Jelmer Vernooij
Simplify mode handling.
278
            child_modes[child_path] = mode
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
279
    # Remove any children that have disappeared
0.200.570 by Jelmer Vernooij
Simplify remove disappeared children function.
280
    if base_ie is not None and base_ie.kind == "directory":
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
281
        invdelta.extend(remove_disappeared_children(base_inv.id2path(file_id),
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
282
            base_children, existing_children))
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
283
    shamap.append((hexsha, "tree", (file_id, revision_id)))
284
    return invdelta, child_modes, shamap
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
285
286
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.
287
def approx_inv_size(inv):
288
    # Very rough estimate, 1k per inventory entry
289
    return len(inv) * 1024
290
291
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
292
def import_git_commit(repo, mapping, head, lookup_object,
293
                      target_git_object_retriever, parent_invs_cache):
294
    o = lookup_object(head)
295
    rev = mapping.import_commit(o)
296
    # We have to do this here, since we have to walk the tree and
297
    # we need to make sure to import the blobs / trees with the right
298
    # path; this may involve adding them more than once.
299
    parent_invs = []
300
    for parent_id in rev.parent_ids:
301
        try:
302
            parent_invs.append(parent_invs_cache[parent_id])
303
        except KeyError:
304
            parent_inv = repo.get_inventory(parent_id)
305
            parent_invs.append(parent_inv)
306
            parent_invs_cache[parent_id] = parent_inv
307
    if parent_invs == []:
308
        base_inv = Inventory(root_id=None)
309
        base_ie = None
310
    else:
311
        base_inv = parent_invs[0]
312
        base_ie = base_inv.root
313
    inv_delta, unusual_modes, shamap = import_git_tree(repo.texts,
314
            mapping, "", o.tree, base_inv, base_ie, None, rev.revision_id,
315
            parent_invs, target_git_object_retriever._idmap, lookup_object,
316
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))
317
    target_git_object_retriever._idmap.add_entries(shamap)
318
    if unusual_modes != {}:
319
        for path, mode in unusual_modes.iteritems():
320
            warn_unusual_mode(rev.foreign_revid, path, mode)
321
        mapping.import_unusual_file_modes(rev, unusual_modes)
322
    try:
323
        basis_id = rev.parent_ids[0]
324
    except IndexError:
325
        basis_id = NULL_REVISION
326
        base_inv = None
327
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
328
              inv_delta, rev.revision_id, rev.parent_ids,
329
              base_inv)
330
    parent_invs_cache[rev.revision_id] = inv
331
    repo.add_revision(rev.revision_id, rev)
332
    if "verify" in debug.debug_flags:
333
        new_unusual_modes = mapping.export_unusual_file_modes(rev)
334
        if new_unusual_modes != unusual_modes:
335
            raise AssertionError("unusual modes don't match: %r != %r" % (unusual_modes, new_unusual_modes))
336
        objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping, unusual_modes)
337
        for sha1, newobj, path in objs:
338
            assert path is not None
339
            oldobj = tree_lookup_path(lookup_object, o.tree, path)
340
            if oldobj != newobj:
341
                raise AssertionError("%r != %r in %s" % (oldobj, newobj, path))
342
343
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
344
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever,
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
345
        heads, pb=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
346
    """Import a set of git objects into a bzr repository.
347
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
348
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
349
    :param mapping: Mapping to use
350
    :param object_iter: Iterator over Git objects.
351
    """
0.200.687 by Jelmer Vernooij
Use start_write_group() / commit_write_group() mechanism when creating git SHA maps.
352
    target_git_object_retriever._idmap.start_write_group() # FIXME: try/finally
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
353
    def lookup_object(sha):
354
        try:
355
            return object_iter[sha]
356
        except KeyError:
357
            return target_git_object_retriever[sha]
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
358
    # TODO: a more (memory-)efficient implementation of this
0.200.158 by Jelmer Vernooij
fetch works \o/
359
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
360
    checked = set()
361
    heads = list(heads)
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.
362
    parent_invs_cache = lru_cache.LRUSizeCache(compute_size=approx_inv_size,
363
                                               max_size=MAX_INV_CACHE_SIZE)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
364
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
365
    while heads:
366
        if pb is not None:
367
            pb.update("finding revisions to fetch", len(graph), None)
368
        head = heads.pop()
369
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
370
        try:
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
371
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
372
        except KeyError:
0.200.591 by Jelmer Vernooij
Don't mask exceptions during fetch.
373
            trace.mutter('missing head %s', head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
374
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
375
        if isinstance(o, Commit):
376
            rev = mapping.import_commit(o)
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
377
            if repo.has_revision(rev.revision_id):
378
                continue
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
379
            squash_revision(repo, rev)
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.
380
            graph.append((o.id, o.parents))
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
381
            target_git_object_retriever._idmap.add_entry(o.id, "commit",
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
382
                    (rev.revision_id, o.tree))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
383
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
384
        elif isinstance(o, Tag):
385
            heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
386
        else:
387
            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.
388
        checked.add(o.id)
389
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
390
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
391
    # Create the inventory objects
0.200.680 by Jelmer Vernooij
fetch revisions in batches
392
    batch_size = 100
393
    revision_ids = topo_sort(graph)
394
    pack_hints = []
395
    for offset in range(0, len(revision_ids), batch_size):
396
        repo.start_write_group()
397
        try:
398
            for i, head in enumerate(revision_ids[offset:offset+batch_size]):
399
                if pb is not None:
400
                    pb.update("fetching revisions", offset+i, len(revision_ids))
401
                import_git_commit(repo, mapping, head, lookup_object,
402
                                  target_git_object_retriever,
403
                                  parent_invs_cache)
404
        except:
405
            repo.abort_write_group()
406
            raise
407
        else:
0.200.681 by Jelmer Vernooij
Cope with None.
408
            hint = repo.commit_write_group()
409
            if hint is not None:
410
                pack_hints.extend(hint)
0.200.687 by Jelmer Vernooij
Use start_write_group() / commit_write_group() mechanism when creating git SHA maps.
411
    target_git_object_retriever._idmap.commit_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
412
    return pack_hints
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
413
414
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
415
class InterGitRepository(InterRepository):
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
416
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
417
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
418
419
    @staticmethod
420
    def _get_repo_format_to_test():
421
        return None
422
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
423
    def copy_content(self, revision_id=None, pb=None):
424
        """See InterRepository.copy_content."""
425
        self.fetch(revision_id, pb, find_ghosts=False)
426
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
427
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, mapping=None,
428
            fetch_spec=None):
0.200.247 by Jelmer Vernooij
Fix git-import.
429
        self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
430
                mapping=mapping, fetch_spec=fetch_spec)
431
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
432
433
class InterGitNonGitRepository(InterGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
434
    """Base InterRepository that copies revisions from a Git into a non-Git
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
435
    repository."""
436
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
437
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
0.200.247 by Jelmer Vernooij
Fix git-import.
438
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
439
        if mapping is None:
440
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
441
        if revision_id is not None:
442
            interesting_heads = [revision_id]
443
        elif fetch_spec is not None:
444
            interesting_heads = fetch_spec.heads
445
        else:
446
            interesting_heads = None
0.200.247 by Jelmer Vernooij
Fix git-import.
447
        self._refs = {}
448
        def determine_wants(refs):
449
            self._refs = refs
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
450
            if interesting_heads is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
451
                ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
452
            else:
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
453
                ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
454
            return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
0.200.576 by Jelmer Vernooij
Auto-pack after fetch.
455
        pack_hint = self.fetch_objects(determine_wants, mapping, pb)
0.200.579 by Jelmer Vernooij
Only pack if it makes the target repo smaller.
456
        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.
457
            self.target.pack(hint=pack_hint)
0.200.590 by Jelmer Vernooij
Add check to make sure that the requested heads were actually fetched.
458
        if interesting_heads is not None:
459
            present_interesting_heads = self.target.has_revisions(interesting_heads)
460
            missing_interesting_heads = set(interesting_heads) - present_interesting_heads
461
            if missing_interesting_heads:
462
                raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads)
0.200.247 by Jelmer Vernooij
Fix git-import.
463
        return self._refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
464
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
465
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
466
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
467
def report_git_progress(pb, text):
468
    text = text.rstrip("\r\n")
469
    g = _GIT_PROGRESS_RE.match(text)
470
    if g is not None:
471
        (text, pct, current, total) = g.groups()
472
        pb.update(text, int(current), int(total))
473
    else:
474
        pb.update(text, 0, 0)
475
476
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
477
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
478
    """InterRepository that copies revisions from a remote Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
479
    repository."""
480
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
481
    def get_target_heads(self):
482
        # FIXME: This should be more efficient
483
        all_revs = self.target.all_revision_ids()
484
        parent_map = self.target.get_parent_map(all_revs)
485
        all_parents = set()
486
        map(all_parents.update, parent_map.itervalues())
487
        return set(all_revs) - all_parents
488
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
489
    def fetch_objects(self, determine_wants, mapping, pb=None):
490
        def progress(text):
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
491
            report_git_progress(pb, text)
0.200.466 by Jelmer Vernooij
Fix finding of heads for fetch_objects.
492
        store = BazaarObjectStore(self.target, mapping)
0.200.484 by Jelmer Vernooij
Cope with kind changes.
493
        self.target.lock_write()
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
494
        try:
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
495
            heads = self.get_target_heads()
0.200.484 by Jelmer Vernooij
Cope with kind changes.
496
            graph_walker = store.get_graph_walker(
497
                    [store._lookup_revision_sha1(head) for head in heads])
498
            recorded_wants = []
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
499
0.200.484 by Jelmer Vernooij
Cope with kind changes.
500
            def record_determine_wants(heads):
501
                wants = determine_wants(heads)
502
                recorded_wants.extend(wants)
503
                return wants
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
504
0.200.484 by Jelmer Vernooij
Cope with kind changes.
505
            create_pb = None
506
            if pb is None:
507
                create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
508
            try:
0.200.680 by Jelmer Vernooij
fetch revisions in batches
509
                objects_iter = self.source.fetch_objects(
510
                            record_determine_wants, graph_walker,
511
                            store.get_raw, progress)
512
                return import_git_objects(self.target, mapping,
513
                    objects_iter, store, recorded_wants, pb)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
514
            finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
515
                if create_pb:
516
                    create_pb.finished()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
517
        finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
518
            self.target.unlock()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
519
520
    @staticmethod
521
    def is_compatible(source, target):
522
        """Be compatible with GitRepository."""
523
        # FIXME: Also check target uses VersionedFile
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
524
        return (isinstance(source, RemoteGitRepository) and
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
525
                target.supports_rich_root() and
526
                not isinstance(target, GitRepository))
527
528
529
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
530
    """InterRepository that copies revisions from a local Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
531
    repository."""
532
533
    def fetch_objects(self, determine_wants, mapping, pb=None):
534
        wants = determine_wants(self.source._git.get_refs())
535
        create_pb = None
536
        if pb is None:
537
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
538
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
539
        try:
540
            self.target.lock_write()
541
            try:
0.200.680 by Jelmer Vernooij
fetch revisions in batches
542
                return import_git_objects(self.target, mapping,
543
                    self.source._git.object_store, target_git_object_retriever,
544
                    wants, pb)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
545
            finally:
546
                self.target.unlock()
547
        finally:
548
            if create_pb:
549
                create_pb.finished()
550
551
    @staticmethod
552
    def is_compatible(source, target):
553
        """Be compatible with GitRepository."""
554
        # FIXME: Also check target uses VersionedFile
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
555
        return (isinstance(source, LocalGitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
556
                target.supports_rich_root() and
557
                not isinstance(target, GitRepository))
558
559
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
560
class InterGitGitRepository(InterGitRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
561
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
562
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
563
    def fetch_objects(self, determine_wants, mapping, pb=None):
564
        def progress(text):
565
            trace.note("git: %s", text)
566
        graphwalker = self.target._git.get_graph_walker()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
567
        if (isinstance(self.source, LocalGitRepository) and
568
            isinstance(self.target, LocalGitRepository)):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
569
            return self.source._git.fetch(self.target._git, determine_wants,
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
570
                progress)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
571
        elif (isinstance(self.source, LocalGitRepository) and
572
              isinstance(self.target, RemoteGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
573
            raise NotImplementedError
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
574
        elif (isinstance(self.source, RemoteGitRepository) and
575
              isinstance(self.target, LocalGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
576
            f, commit = self.target._git.object_store.add_thin_pack()
577
            try:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
578
                refs = self.source._git.fetch_pack(determine_wants,
579
                    graphwalker, f.write, progress)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
580
                commit()
581
                return refs
582
            except:
583
                f.close()
584
                raise
585
        else:
586
            raise AssertionError
587
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
588
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
589
              mapping=None, fetch_spec=None, branches=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
590
        if mapping is None:
591
            mapping = self.source.get_mapping()
592
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
593
        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.
594
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
595
        elif fetch_spec is not None:
596
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
597
        if branches is not None:
598
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
599
        elif fetch_spec is None and revision_id is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
600
            determine_wants = r.object_store.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
601
        else:
0.200.247 by Jelmer Vernooij
Fix git-import.
602
            determine_wants = lambda x: [y for y in args if not y in r.object_store]
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
603
        return self.fetch_objects(determine_wants, mapping)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
604
605
606
    @staticmethod
607
    def is_compatible(source, target):
608
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
609
        return (isinstance(source, GitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
610
                isinstance(target, GitRepository))