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