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