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