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