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