/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
0.200.292 by Jelmer Vernooij
Fix formatting.
17
from cStringIO import (
18
    StringIO,
19
    )
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
20
import dulwich as git
0.200.261 by Jelmer Vernooij
More formatting fixes.
21
from dulwich.objects import (
22
    Commit,
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
23
    Tag,
0.200.261 by Jelmer Vernooij
More formatting fixes.
24
    )
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
25
from dulwich.object_store import (
26
    tree_lookup_path,
27
    )
0.200.352 by Jelmer Vernooij
Simplify mode handling.
28
import stat
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
29
30
from bzrlib import (
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
31
    debug,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
32
    osutils,
0.200.261 by Jelmer Vernooij
More formatting fixes.
33
    trace,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
34
    ui,
35
    urlutils,
36
    )
37
from bzrlib.errors import (
38
    InvalidRevisionId,
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
39
    NoSuchId,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
40
    NoSuchRevision,
41
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
42
from bzrlib.inventory import (
43
    Inventory,
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
44
    InventoryDirectory,
45
    InventoryFile,
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
46
    InventoryLink,
0.200.261 by Jelmer Vernooij
More formatting fixes.
47
    )
0.200.301 by Jelmer Vernooij
Cache inventories created.
48
from bzrlib.lru_cache import (
49
    LRUCache,
50
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
51
from bzrlib.repository import (
52
    InterRepository,
53
    )
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
54
from bzrlib.revision import (
55
    NULL_REVISION,
56
    )
0.200.292 by Jelmer Vernooij
Fix formatting.
57
from bzrlib.tsort import (
58
    topo_sort,
59
    )
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
60
from bzrlib.versionedfile import (
61
    FulltextContentFactory,
62
    )
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
63
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
64
from bzrlib.plugins.git.mapping import (
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
65
    DEFAULT_FILE_MODE,
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
66
    inventory_to_tree_and_blobs,
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
67
    text_to_blob,
68
    )
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
69
from bzrlib.plugins.git.object_store import (
70
    BazaarObjectStore,
71
    )
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
72
from bzrlib.plugins.git.remote import (
73
    RemoteGitRepository,
74
    )
0.200.169 by Jelmer Vernooij
Fix branch cloning.
75
from bzrlib.plugins.git.repository import (
0.200.261 by Jelmer Vernooij
More formatting fixes.
76
    GitRepository, 
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
77
    GitRepositoryFormat,
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
78
    LocalGitRepository,
0.200.261 by Jelmer Vernooij
More formatting fixes.
79
    )
0.216.4 by Jelmer Vernooij
Add basic pack fetch infrastructure.
80
81
0.200.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.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
193
        texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, blob.data)])
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
194
        shamap = [(hexsha, "blob", (ie.file_id, ie.revision))]
195
    else:
196
        shamap = []
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
197
    if file_id in base_inv:
198
        old_path = base_inv.id2path(file_id)
199
    else:
200
        old_path = None
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
201
    return ([(old_path, path, file_id, ie)], shamap)
0.200.261 by Jelmer Vernooij
More formatting fixes.
202
203
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
204
def import_git_tree(texts, mapping, path, hexsha, base_inv, parent_id, 
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
205
    revision_id, parent_invs, shagitmap, lookup_object):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
206
    """Import a git tree object into a bzr repository.
207
0.200.261 by Jelmer Vernooij
More formatting fixes.
208
    :param texts: VersionedFiles object to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
209
    :param path: Path in the tree
210
    :param tree: A git tree object
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
211
    :param base_inv: Base inventory against which to return inventory delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
212
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
213
    """
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
214
    invdelta = []
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
215
    file_id = mapping.generate_file_id(path)
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
216
    # 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).
217
    ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")), 
218
        parent_id)
0.200.375 by Jelmer Vernooij
Store object hex sha's in InventoryEntry.text_id during fetch.
219
    ie.text_id = hexsha
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
220
    try:
221
        base_ie = base_inv[file_id]
222
    except NoSuchId:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
223
        # Newly appeared here
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
224
        base_ie = None
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
225
        ie.revision = revision_id
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
226
        texts.add_lines((file_id, ie.revision), (), [])
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
227
        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).
228
    else:
0.200.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
229
        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).
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.378 by Jelmer Vernooij
Simplify checks against base hex sha a bit.
232
            if base_sha is None:
233
                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.
234
        except KeyError:
235
            pass
0.200.346 by Jelmer Vernooij
Track unusual file modes.
236
        else:
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
237
            if base_sha == hexsha:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
238
                # 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.
239
                return [], {}, []
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
240
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
241
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
242
    child_modes = {}
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
243
    shamap = []
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
244
    tree = lookup_object(hexsha)
0.200.363 by Jelmer Vernooij
Fix updates of sha map during fetch.
245
    for mode, name, child_hexsha in tree.entries():
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
246
        basename = name.decode("utf-8")
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
247
        existing_children.add(basename)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
248
        child_path = osutils.pathjoin(path, name)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
249
        if stat.S_ISDIR(mode):
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
250
            subinvdelta, grandchildmodes, subshamap = import_git_tree(texts, 
0.200.363 by Jelmer Vernooij
Fix updates of sha map during fetch.
251
                    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.
252
                    revision_id, parent_invs, shagitmap, lookup_object)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
253
            invdelta.extend(subinvdelta)
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
254
            child_modes.update(grandchildmodes)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
255
            shamap.extend(subshamap)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
256
        else:
257
            fs_mode = stat.S_IMODE(mode)
258
            symlink = stat.S_ISLNK(mode)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
259
            subinvdelta, subshamap = import_git_blob(texts, mapping, 
0.200.363 by Jelmer Vernooij
Fix updates of sha map during fetch.
260
                    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.
261
                    parent_invs, shagitmap, lookup_object, 
262
                    bool(fs_mode & 0111), symlink)
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
263
            invdelta.extend(subinvdelta)
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
264
            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.
265
        if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
266
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
0.200.352 by Jelmer Vernooij
Simplify mode handling.
267
            child_modes[child_path] = mode
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
268
    # Remove any children that have disappeared
0.200.374 by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions.
269
    if base_ie is not None:
270
        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.
271
        while deletable:
272
            ie = deletable.pop()
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
273
            invdelta.append((base_inv.id2path(ie.file_id), None, ie.file_id, None))
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
274
            if ie.kind == "directory":
275
                deletable.extend(ie.children.values())
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
276
    shamap.append((hexsha, "tree", (file_id, revision_id)))
277
    return invdelta, child_modes, shamap
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
278
279
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
280
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.
281
        heads, pb=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
282
    """Import a set of git objects into a bzr repository.
283
284
    :param repo: Bazaar repository
285
    :param mapping: Mapping to use
286
    :param object_iter: Iterator over Git objects.
287
    """
288
    # TODO: a more (memory-)efficient implementation of this
0.200.158 by Jelmer Vernooij
fetch works \o/
289
    graph = []
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
290
    root_trees = {}
0.200.158 by Jelmer Vernooij
fetch works \o/
291
    revisions = {}
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
292
    checked = set()
293
    heads = list(heads)
0.200.301 by Jelmer Vernooij
Cache inventories created.
294
    parent_invs_cache = LRUCache(50)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
295
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
296
    while heads:
297
        if pb is not None:
298
            pb.update("finding revisions to fetch", len(graph), None)
299
        head = heads.pop()
300
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
301
        try:
302
            o = object_iter[head]
303
        except KeyError:
304
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
305
        if isinstance(o, Commit):
306
            rev = mapping.import_commit(o)
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
307
            if repo.has_revision(rev.revision_id):
308
                continue
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
309
            root_trees[rev.revision_id] = o.tree
0.200.158 by Jelmer Vernooij
fetch works \o/
310
            revisions[rev.revision_id] = rev
311
            graph.append((rev.revision_id, rev.parent_ids))
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
312
            target_git_object_retriever._idmap.add_entry(o.id, "commit", 
313
                    (rev.revision_id, o.tree))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
314
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
315
        elif isinstance(o, Tag):
316
            heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
317
        else:
318
            trace.warning("Unable to import head object %r" % o)
319
        checked.add(head)
0.200.158 by Jelmer Vernooij
fetch works \o/
320
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
321
    # Create the inventory objects
0.200.158 by Jelmer Vernooij
fetch works \o/
322
    for i, revid in enumerate(topo_sort(graph)):
323
        if pb is not None:
324
            pb.update("fetching revisions", i, len(graph))
325
        rev = revisions[revid]
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
326
        # 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.
327
        # 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.
328
        # path; this may involve adding them more than once.
329
        def lookup_object(sha):
0.200.301 by Jelmer Vernooij
Cache inventories created.
330
            try:
0.200.217 by Jelmer Vernooij
Avoid reading everything into memory when accessing objects.
331
                return object_iter[sha]
0.200.301 by Jelmer Vernooij
Cache inventories created.
332
            except KeyError:
333
                return target_git_object_retriever[sha]
334
        parent_invs = []
335
        for parent_id in rev.parent_ids:
336
            try:
337
                parent_invs.append(parent_invs_cache[parent_id])
338
            except KeyError:
339
                parent_inv = repo.get_inventory(parent_id)
340
                parent_invs.append(parent_inv)
341
                parent_invs_cache[parent_id] = parent_inv
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
342
        if parent_invs == []:
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
343
            base_inv = Inventory(root_id=None)
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
344
        else:
345
            base_inv = parent_invs[0]
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
346
        inv_delta, unusual_modes, shamap = import_git_tree(repo.texts, 
347
                mapping, "", root_trees[revid], base_inv, None, revid, 
348
                parent_invs, target_git_object_retriever._idmap, lookup_object)
349
        target_git_object_retriever._idmap.add_entries(shamap)
0.200.346 by Jelmer Vernooij
Track unusual file modes.
350
        if unusual_modes != {}:
351
            ret = "unusual modes: \n"
352
            for item in unusual_modes.iteritems():
353
                ret += "\t%s: %o\n" % item
354
            raise AssertionError(ret)
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
355
        try:
356
            basis_id = rev.parent_ids[0]
357
        except IndexError:
358
            basis_id = NULL_REVISION
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
359
        rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
360
                  inv_delta, rev.revision_id, rev.parent_ids)
0.200.301 by Jelmer Vernooij
Cache inventories created.
361
        parent_invs_cache[rev.revision_id] = inv
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
362
        repo.add_revision(rev.revision_id, rev)
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
363
        if "verify" in debug.debug_flags:
364
            objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping)
365
            for sha1, newobj, path in objs:
366
                assert path is not None
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
367
                oldobj = tree_lookup_path(lookup_object, root_trees[revid], path)
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
368
                assert oldobj == newobj, "%r != %r in %s" % (oldobj, newobj, path)
369
0.200.272 by Jelmer Vernooij
Actually store idmap.
370
    target_git_object_retriever._idmap.commit()
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
371
372
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
373
class InterGitRepository(InterRepository):
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
374
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
375
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
376
377
    @staticmethod
378
    def _get_repo_format_to_test():
379
        return None
380
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
381
    def copy_content(self, revision_id=None, pb=None):
382
        """See InterRepository.copy_content."""
383
        self.fetch(revision_id, pb, find_ghosts=False)
384
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
385
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, mapping=None,
386
            fetch_spec=None):
0.200.247 by Jelmer Vernooij
Fix git-import.
387
        self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
388
                mapping=mapping, fetch_spec=fetch_spec)
389
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
390
391
class InterGitNonGitRepository(InterGitRepository):
392
    """Base InterRepository that copies revisions from a Git into a non-Git 
393
    repository."""
394
0.200.247 by Jelmer Vernooij
Fix git-import.
395
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False, 
396
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
397
        if mapping is None:
398
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
399
        if revision_id is not None:
400
            interesting_heads = [revision_id]
401
        elif fetch_spec is not None:
402
            interesting_heads = fetch_spec.heads
403
        else:
404
            interesting_heads = None
0.200.247 by Jelmer Vernooij
Fix git-import.
405
        self._refs = {}
406
        def determine_wants(refs):
407
            self._refs = refs
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
408
            if interesting_heads is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
409
                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.
410
            else:
0.233.1 by Jelmer Vernooij
Don't attempt to fetch NULL_REVISION.
411
                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.
412
            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.
413
        self.fetch_objects(determine_wants, mapping, pb)
414
        return self._refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
415
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
416
417
418
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
419
    """InterRepository that copies revisions from a remote Git into a non-Git 
420
    repository."""
421
422
    def fetch_objects(self, determine_wants, mapping, pb=None):
423
        def progress(text):
424
            pb.update("git: %s" % text.rstrip("\r\n"), 0, 0)
425
        graph_walker = BzrFetchGraphWalker(self.target, mapping)
426
        create_pb = None
427
        if pb is None:
428
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
429
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
430
        recorded_wants = []
431
432
        def record_determine_wants(heads):
433
            wants = determine_wants(heads)
434
            recorded_wants.extend(wants)
435
            return wants
436
        
437
        try:
438
            self.target.lock_write()
439
            try:
440
                self.target.start_write_group()
441
                try:
442
                    objects_iter = self.source.fetch_objects(
443
                                record_determine_wants, 
444
                                graph_walker, 
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
445
                                target_git_object_retriever.get_raw, 
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
446
                                progress)
447
                    import_git_objects(self.target, mapping, objects_iter, 
448
                            target_git_object_retriever, recorded_wants, pb)
449
                finally:
450
                    self.target.commit_write_group()
451
            finally:
452
                self.target.unlock()
453
        finally:
454
            if create_pb:
455
                create_pb.finished()
456
457
    @staticmethod
458
    def is_compatible(source, target):
459
        """Be compatible with GitRepository."""
460
        # FIXME: Also check target uses VersionedFile
461
        return (isinstance(source, RemoteGitRepository) and 
462
                target.supports_rich_root() and
463
                not isinstance(target, GitRepository))
464
465
466
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
467
    """InterRepository that copies revisions from a remote Git into a non-Git 
468
    repository."""
469
470
    def fetch_objects(self, determine_wants, mapping, pb=None):
471
        wants = determine_wants(self.source._git.get_refs())
472
        create_pb = None
473
        if pb is None:
474
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
475
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
476
        try:
477
            self.target.lock_write()
478
            try:
479
                self.target.start_write_group()
480
                try:
481
                    import_git_objects(self.target, mapping, 
482
                            self.source._git.object_store, 
483
                            target_git_object_retriever, wants, pb)
484
                finally:
485
                    self.target.commit_write_group()
486
            finally:
487
                self.target.unlock()
488
        finally:
489
            if create_pb:
490
                create_pb.finished()
491
492
    @staticmethod
493
    def is_compatible(source, target):
494
        """Be compatible with GitRepository."""
495
        # FIXME: Also check target uses VersionedFile
496
        return (isinstance(source, LocalGitRepository) and 
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
497
                target.supports_rich_root() and
498
                not isinstance(target, GitRepository))
499
500
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
501
class InterGitGitRepository(InterGitRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
502
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
503
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
504
    def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False, 
505
              mapping=None, fetch_spec=None, branches=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
506
        if mapping is None:
507
            mapping = self.source.get_mapping()
508
        def progress(text):
0.200.261 by Jelmer Vernooij
More formatting fixes.
509
            trace.info("git: %s", text)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
510
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
511
        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.
512
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
513
        elif fetch_spec is not None:
514
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
515
        if branches is not None:
516
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
517
        elif fetch_spec is None and revision_id is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
518
            determine_wants = r.object_store.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
519
        else:
0.200.247 by Jelmer Vernooij
Fix git-import.
520
            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.
521
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
522
        graphwalker = r.get_graph_walker()
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
523
        f, commit = r.object_store.add_thin_pack()
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
524
        try:
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
525
            refs = self.source.fetch_pack(determine_wants, graphwalker,
526
                                          f.write, progress)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
527
            commit()
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
528
            return refs
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
529
        except:
530
            f.close()
531
            raise
532
533
    @staticmethod
534
    def is_compatible(source, target):
535
        """Be compatible with GitRepository."""
536
        return (isinstance(source, GitRepository) and 
537
                isinstance(target, GitRepository))