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