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