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