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