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