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