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