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