/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.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
146
        base_sha = base_ie.text_id
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
147
        try:
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
148
            if base_sha is None:
149
                base_sha = shagitmap.lookup_blob(file_id, base_ie.revision)
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
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))
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
195
        shamap = [(hexsha, "blob", (ie.file_id, ie.revision))]
196
    else:
197
        shamap = []
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
198
    if file_id in base_inv:
199
        old_path = base_inv.id2path(file_id)
200
    else:
201
        old_path = None
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
202
    return ([(old_path, path, file_id, ie)], shamap)
0.200.261 by Jelmer Vernooij
More formatting fixes.
203
204
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
205
def import_git_tree(texts, mapping, path, hexsha, base_inv, parent_id, 
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
206
    revision_id, parent_invs, shagitmap, lookup_object):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
207
    """Import a git tree object into a bzr repository.
208
0.200.261 by Jelmer Vernooij
More formatting fixes.
209
    :param texts: VersionedFiles object to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
210
    :param path: Path in the tree
211
    :param tree: A git tree object
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
212
    :param base_inv: Base inventory against which to return inventory delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
213
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
214
    """
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
215
    invdelta = []
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
216
    file_id = mapping.generate_file_id(path)
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
217
    # 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).
218
    ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")), 
219
        parent_id)
0.200.375 by Jelmer Vernooij
Store object hex sha's in InventoryEntry.text_id during fetch.
220
    ie.text_id = hexsha
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
221
    try:
222
        base_ie = base_inv[file_id]
223
    except NoSuchId:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
224
        # Newly appeared here
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
225
        base_ie = None
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
226
        ie.revision = revision_id
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
227
        texts.add_lines((file_id, ie.revision), (), [])
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
228
        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).
229
    else:
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
230
        base_sha = base_ie.text_id
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
231
        # See if this has changed at all
0.200.287 by Jelmer Vernooij
Skip tree sha's already in the git sha map.
232
        try:
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
233
            if base_sha is None:
234
                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.
235
        except KeyError:
236
            pass
0.200.346 by Jelmer Vernooij
Track unusual file modes.
237
        else:
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
238
            if base_sha == hexsha:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
239
                # 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.
240
                return [], {}, []
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
241
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
242
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
243
    child_modes = {}
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
244
    shamap = []
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
245
    tree = lookup_object(hexsha)
0.200.363 by Jelmer Vernooij
Fix updates of sha map during fetch.
246
    for mode, name, child_hexsha in tree.entries():
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
247
        basename = name.decode("utf-8")
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
248
        existing_children.add(basename)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
249
        child_path = osutils.pathjoin(path, name)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
250
        if stat.S_ISDIR(mode):
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
251
            subinvdelta, grandchildmodes, subshamap = import_git_tree(texts, 
0.200.363 by Jelmer Vernooij
Fix updates of sha map during fetch.
252
                    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.
253
                    revision_id, parent_invs, shagitmap, lookup_object)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
254
            invdelta.extend(subinvdelta)
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
255
            child_modes.update(grandchildmodes)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
256
            shamap.extend(subshamap)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
257
        else:
258
            fs_mode = stat.S_IMODE(mode)
259
            symlink = stat.S_ISLNK(mode)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
260
            subinvdelta, subshamap = import_git_blob(texts, mapping, 
0.200.363 by Jelmer Vernooij
Fix updates of sha map during fetch.
261
                    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.
262
                    parent_invs, shagitmap, lookup_object, 
263
                    bool(fs_mode & 0111), symlink)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
264
            invdelta.extend(subinvdelta)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
265
            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.
266
        if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
267
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
0.200.352 by Jelmer Vernooij
Simplify mode handling.
268
            child_modes[child_path] = mode
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
269
    # Remove any children that have disappeared
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
270
    if base_ie is not None:
271
        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.
272
        while deletable:
273
            ie = deletable.pop()
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
274
            invdelta.append((base_inv.id2path(ie.file_id), None, ie.file_id, None))
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
275
            if ie.kind == "directory":
276
                deletable.extend(ie.children.values())
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
277
    shamap.append((hexsha, "tree", (file_id, revision_id)))
278
    return invdelta, child_modes, shamap
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
279
280
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
281
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.
282
        heads, pb=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
283
    """Import a set of git objects into a bzr repository.
284
285
    :param repo: Bazaar repository
286
    :param mapping: Mapping to use
287
    :param object_iter: Iterator over Git objects.
288
    """
289
    # TODO: a more (memory-)efficient implementation of this
0.200.158 by Jelmer Vernooij
fetch works \o/
290
    graph = []
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
291
    root_trees = {}
0.200.158 by Jelmer Vernooij
fetch works \o/
292
    revisions = {}
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
293
    checked = set()
294
    heads = list(heads)
0.200.301 by Jelmer Vernooij
Cache inventories created.
295
    parent_invs_cache = LRUCache(50)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
296
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
297
    while heads:
298
        if pb is not None:
299
            pb.update("finding revisions to fetch", len(graph), None)
300
        head = heads.pop()
301
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
302
        try:
303
            o = object_iter[head]
304
        except KeyError:
305
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
306
        if isinstance(o, Commit):
307
            rev = mapping.import_commit(o)
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
308
            if repo.has_revision(rev.revision_id):
309
                continue
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
310
            root_trees[rev.revision_id] = o.tree
0.200.158 by Jelmer Vernooij
fetch works \o/
311
            revisions[rev.revision_id] = rev
312
            graph.append((rev.revision_id, rev.parent_ids))
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
313
            target_git_object_retriever._idmap.add_entry(o.id, "commit", 
314
                    (rev.revision_id, o.tree))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
315
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
316
        elif isinstance(o, Tag):
317
            heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
318
        else:
319
            trace.warning("Unable to import head object %r" % o)
320
        checked.add(head)
0.200.158 by Jelmer Vernooij
fetch works \o/
321
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
322
    # Create the inventory objects
0.200.158 by Jelmer Vernooij
fetch works \o/
323
    for i, revid in enumerate(topo_sort(graph)):
324
        if pb is not None:
325
            pb.update("fetching revisions", i, len(graph))
326
        rev = revisions[revid]
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
327
        # 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.
328
        # 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.
329
        # path; this may involve adding them more than once.
330
        def lookup_object(sha):
0.200.301 by Jelmer Vernooij
Cache inventories created.
331
            try:
0.200.217 by Jelmer Vernooij
Avoid reading everything into memory when accessing objects.
332
                return object_iter[sha]
0.200.301 by Jelmer Vernooij
Cache inventories created.
333
            except KeyError:
334
                return target_git_object_retriever[sha]
335
        parent_invs = []
336
        for parent_id in rev.parent_ids:
337
            try:
338
                parent_invs.append(parent_invs_cache[parent_id])
339
            except KeyError:
340
                parent_inv = repo.get_inventory(parent_id)
341
                parent_invs.append(parent_inv)
342
                parent_invs_cache[parent_id] = parent_inv
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
343
        if parent_invs == []:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
344
            base_inv = Inventory(root_id=None)
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
345
        else:
346
            base_inv = parent_invs[0]
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
347
        inv_delta, unusual_modes, shamap = import_git_tree(repo.texts, 
348
                mapping, "", root_trees[revid], base_inv, None, revid, 
349
                parent_invs, target_git_object_retriever._idmap, lookup_object)
350
        target_git_object_retriever._idmap.add_entries(shamap)
0.200.346 by Jelmer Vernooij
Track unusual file modes.
351
        if unusual_modes != {}:
352
            ret = "unusual modes: \n"
353
            for item in unusual_modes.iteritems():
354
                ret += "\t%s: %o\n" % item
355
            raise AssertionError(ret)
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
356
        try:
357
            basis_id = rev.parent_ids[0]
358
        except IndexError:
359
            basis_id = NULL_REVISION
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
360
        rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
361
                  inv_delta, rev.revision_id, rev.parent_ids)
0.200.301 by Jelmer Vernooij
Cache inventories created.
362
        parent_invs_cache[rev.revision_id] = inv
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
363
        repo.add_revision(rev.revision_id, rev)
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
364
        if "verify" in debug.debug_flags:
365
            objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping)
366
            for sha1, newobj, path in objs:
367
                assert path is not None
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
368
                oldobj = tree_lookup_path(lookup_object, root_trees[revid], path)
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
369
                assert oldobj == newobj, "%r != %r in %s" % (oldobj, newobj, path)
370
0.200.272 by Jelmer Vernooij
Actually store idmap.
371
    target_git_object_retriever._idmap.commit()
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
372
373
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
374
class InterGitNonGitRepository(InterRepository):
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
375
    """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.
376
    repository."""
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
377
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
378
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
379
380
    @staticmethod
381
    def _get_repo_format_to_test():
382
        return None
383
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
384
    def copy_content(self, revision_id=None, pb=None):
385
        """See InterRepository.copy_content."""
386
        self.fetch(revision_id, pb, find_ghosts=False)
387
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
388
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, mapping=None,
389
            fetch_spec=None):
0.200.247 by Jelmer Vernooij
Fix git-import.
390
        self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
391
                mapping=mapping, fetch_spec=fetch_spec)
392
393
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False, 
394
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
395
        if mapping is None:
396
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
397
        if revision_id is not None:
398
            interesting_heads = [revision_id]
399
        elif fetch_spec is not None:
400
            interesting_heads = fetch_spec.heads
401
        else:
402
            interesting_heads = None
0.200.247 by Jelmer Vernooij
Fix git-import.
403
        self._refs = {}
404
        def determine_wants(refs):
405
            self._refs = refs
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
406
            if interesting_heads is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
407
                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.
408
            else:
0.233.1 by Jelmer Vernooij
Don't attempt to fetch NULL_REVISION.
409
                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.
410
            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.
411
        self.fetch_objects(determine_wants, mapping, pb)
412
        return self._refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
413
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
414
415
416
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
417
    """InterRepository that copies revisions from a remote Git into a non-Git 
418
    repository."""
419
420
    def fetch_objects(self, determine_wants, mapping, pb=None):
421
        def progress(text):
422
            pb.update("git: %s" % text.rstrip("\r\n"), 0, 0)
423
        graph_walker = BzrFetchGraphWalker(self.target, mapping)
424
        create_pb = None
425
        if pb is None:
426
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
427
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
428
        recorded_wants = []
429
430
        def record_determine_wants(heads):
431
            wants = determine_wants(heads)
432
            recorded_wants.extend(wants)
433
            return wants
434
        
435
        try:
436
            self.target.lock_write()
437
            try:
438
                self.target.start_write_group()
439
                try:
440
                    objects_iter = self.source.fetch_objects(
441
                                record_determine_wants, 
442
                                graph_walker, 
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
443
                                target_git_object_retriever.get_raw, 
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
444
                                progress)
445
                    import_git_objects(self.target, mapping, objects_iter, 
446
                            target_git_object_retriever, recorded_wants, pb)
447
                finally:
448
                    self.target.commit_write_group()
449
            finally:
450
                self.target.unlock()
451
        finally:
452
            if create_pb:
453
                create_pb.finished()
454
455
    @staticmethod
456
    def is_compatible(source, target):
457
        """Be compatible with GitRepository."""
458
        # FIXME: Also check target uses VersionedFile
459
        return (isinstance(source, RemoteGitRepository) and 
460
                target.supports_rich_root() and
461
                not isinstance(target, GitRepository))
462
463
464
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
465
    """InterRepository that copies revisions from a remote Git into a non-Git 
466
    repository."""
467
468
    def fetch_objects(self, determine_wants, mapping, pb=None):
469
        wants = determine_wants(self.source._git.get_refs())
470
        create_pb = None
471
        if pb is None:
472
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
473
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
474
        try:
475
            self.target.lock_write()
476
            try:
477
                self.target.start_write_group()
478
                try:
479
                    import_git_objects(self.target, mapping, 
480
                            self.source._git.object_store, 
481
                            target_git_object_retriever, wants, pb)
482
                finally:
483
                    self.target.commit_write_group()
484
            finally:
485
                self.target.unlock()
486
        finally:
487
            if create_pb:
488
                create_pb.finished()
489
490
    @staticmethod
491
    def is_compatible(source, target):
492
        """Be compatible with GitRepository."""
493
        # FIXME: Also check target uses VersionedFile
494
        return (isinstance(source, LocalGitRepository) and 
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
495
                target.supports_rich_root() and
496
                not isinstance(target, GitRepository))
497
498
499
class InterGitRepository(InterRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
500
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
501
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
502
    _matching_repo_format = GitRepositoryFormat()
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
503
504
    @staticmethod
505
    def _get_repo_format_to_test():
506
        return None
507
508
    def copy_content(self, revision_id=None, pb=None):
509
        """See InterRepository.copy_content."""
510
        self.fetch(revision_id, pb, find_ghosts=False)
511
512
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
513
              mapping=None, fetch_spec=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
514
        if mapping is None:
515
            mapping = self.source.get_mapping()
516
        def progress(text):
0.200.261 by Jelmer Vernooij
More formatting fixes.
517
            trace.info("git: %s", text)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
518
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
519
        if revision_id is not None:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
520
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
521
        elif fetch_spec is not None:
522
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
0.200.247 by Jelmer Vernooij
Fix git-import.
523
        if fetch_spec is None and revision_id is None:
524
            determine_wants = r.object_store.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
525
        else:
0.200.247 by Jelmer Vernooij
Fix git-import.
526
            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.
527
528
        graphwalker = SimpleFetchGraphWalker(r.heads().values(), r.get_parents)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
529
        f, commit = r.object_store.add_thin_pack()
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
530
        try:
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
531
            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.
532
            commit()
533
        except:
534
            f.close()
535
            raise
536
537
    @staticmethod
538
    def is_compatible(source, target):
539
        """Be compatible with GitRepository."""
540
        return (isinstance(source, GitRepository) and 
541
                isinstance(target, GitRepository))