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