/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.910 by Jelmer Vernooij
update copyright years
1
# Copyright (C) 2008-2010 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.261 by Jelmer Vernooij
More formatting fixes.
17
from dulwich.objects import (
18
    Commit,
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
19
    Tag,
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
20
    Tree,
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
21
    S_ISGITLINK,
0.200.261 by Jelmer Vernooij
More formatting fixes.
22
    )
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
23
from dulwich.object_store import (
24
    tree_lookup_path,
25
    )
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
26
from itertools import (
27
    imap,
28
    )
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
29
import posixpath
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
30
import re
0.200.352 by Jelmer Vernooij
Simplify mode handling.
31
import stat
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
32
33
from bzrlib import (
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
34
    debug,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
35
    osutils,
0.200.261 by Jelmer Vernooij
More formatting fixes.
36
    trace,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
37
    ui,
38
    )
39
from bzrlib.errors import (
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
40
    BzrError,
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
    )
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.664 by Jelmer Vernooij
Support submodules during fetch.
48
    TreeReference,
0.200.261 by Jelmer Vernooij
More formatting fixes.
49
    )
50
from bzrlib.repository import (
51
    InterRepository,
52
    )
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
53
from bzrlib.revision import (
54
    NULL_REVISION,
55
    )
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
56
from bzrlib.revisiontree import (
57
    RevisionTree,
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 (
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
63
    ChunkedContentFactory,
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
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.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
68
    mode_is_executable,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
69
    mode_kind,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
70
    warn_unusual_mode,
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
71
    )
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
72
from bzrlib.plugins.git.object_store import (
73
    BazaarObjectStore,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
74
    LRUTreeCache,
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
75
    _tree_to_objects,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
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.664 by Jelmer Vernooij
Support submodules during fetch.
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.821 by Jelmer Vernooij
Remove last references to ID.children.
87
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha), 
0.200.848 by Jelmer Vernooij
remove unnecessary parent_inv_shamap.
88
        base_inv, parent_id, revision_id,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
89
        parent_invs, lookup_object, (base_mode, mode), store_updater,
90
        lookup_file_id):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
91
    """Import a git blob object into a bzr repository.
92
0.200.261 by Jelmer Vernooij
More formatting fixes.
93
    :param texts: VersionedFiles to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
94
    :param path: Path in the tree
95
    :param blob: A git blob
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
96
    :return: Inventory delta for this file
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
97
    """
0.252.28 by Jelmer Vernooij
Don't import control files.
98
    if mapping.is_control_file(path):
99
        return []
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
100
    if base_hexsha == hexsha and base_mode == mode:
101
        # If nothing has changed since the base revision, we're done
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
102
        return []
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
103
    file_id = lookup_file_id(path)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
104
    if stat.S_ISLNK(mode):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
105
        cls = InventoryLink
106
    else:
107
        cls = InventoryFile
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
108
    ie = cls(file_id, name.decode("utf-8"), parent_id)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
109
    ie.executable = mode_is_executable(mode)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
110
    if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
111
        base_ie = base_inv[base_inv.path2id(path)]
0.200.373 by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again.
112
        ie.text_size = base_ie.text_size
113
        ie.text_sha1 = base_ie.text_sha1
114
        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.
115
        if ie.executable == base_ie.executable:
116
            ie.revision = base_ie.revision
117
        else:
118
            blob = lookup_object(hexsha)
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
119
    else:
120
        blob = lookup_object(hexsha)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
121
        if ie.kind == "symlink":
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
122
            ie.revision = None
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
123
            ie.symlink_target = blob.data
124
            ie.text_size = None
125
            ie.text_sha1 = None
126
        else:
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
127
            ie.text_size = sum(imap(len, blob.chunked))
128
            ie.text_sha1 = osutils.sha_strings(blob.chunked)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
129
    # Check what revision we should store
0.200.283 by Jelmer Vernooij
Avoid storing repeated texts for blobs.
130
    parent_keys = []
0.200.904 by Jelmer Vernooij
Fix inconsistent parents.
131
    for pinv in parent_invs:
0.200.829 by Jelmer Vernooij
Cope with the fact that _type is gone in upstream dulwich.
132
        try:
133
            pie = pinv[file_id]
134
        except NoSuchId:
135
            continue
0.252.25 by Jelmer Vernooij
Reformatting.
136
        if (pie.text_sha1 == ie.text_sha1 and
137
            pie.executable == ie.executable and
138
            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).
139
            # 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.
140
            ie.revision = pie.revision
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
141
            break
0.200.904 by Jelmer Vernooij
Fix inconsistent parents.
142
        parent_key = (file_id, pie.revision)
143
        if not parent_key in parent_keys:
144
            parent_keys.append(parent_key)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
145
    if ie.revision is None:
146
        # Need to store a new revision
147
        ie.revision = revision_id
148
        assert ie.revision is not None
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
149
        if ie.kind == 'symlink':
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
150
            chunks = []
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
151
        else: 
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
152
            chunks = blob.chunked
0.252.25 by Jelmer Vernooij
Reformatting.
153
        texts.insert_record_stream([
154
            ChunkedContentFactory((file_id, ie.revision),
155
                tuple(parent_keys), ie.text_sha1, chunks)])
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
156
    invdelta = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
157
    if base_hexsha is not None:
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
158
        old_path = path.decode("utf-8") # Renames are not supported yet
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
159
        if stat.S_ISDIR(base_mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
160
            invdelta.extend(remove_disappeared_children(base_inv, old_path,
161
                lookup_object(base_hexsha), [], lookup_object))
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
162
    else:
163
        old_path = None
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
164
    new_path = path.decode("utf-8")
165
    invdelta.append((old_path, new_path, file_id, ie))
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
166
    if base_hexsha != hexsha:
0.200.952 by Jelmer Vernooij
Write git pack files rather than loose objects.
167
        store_updater.add_object(blob, ie, path)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
168
    return invdelta
0.200.261 by Jelmer Vernooij
More formatting fixes.
169
170
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
171
class SubmodulesRequireSubtrees(BzrError):
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
172
    _fmt = """The repository you are fetching from contains submodules. To continue, upgrade your Bazaar repository to a format that supports nested trees, such as 'development-subtree'."""
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
173
    internal = False
174
175
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
176
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
177
    base_inv, parent_id, revision_id, parent_invs, lookup_object,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
178
    (base_mode, mode), store_updater, lookup_file_id):
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
179
    if base_hexsha == hexsha and base_mode == mode:
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
180
        return [], {}
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
181
    file_id = lookup_file_id(path)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
182
    ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
183
    ie.revision = revision_id
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
184
    if base_hexsha is None:
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
185
        oldpath = None
186
    else:
187
        oldpath = path
188
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
0.252.25 by Jelmer Vernooij
Reformatting.
189
    texts.insert_record_stream([
190
        ChunkedContentFactory((file_id, ie.revision), (), None, [])])
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
191
    invdelta = [(oldpath, path, file_id, ie)]
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
192
    return invdelta, {}
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
193
194
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
195
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
196
        lookup_object):
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
197
    """Generate an inventory delta for removed children.
198
199
    :param base_inv: Base inventory against which to generate the 
200
        inventory delta.
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
201
    :param path: Path to process (unicode)
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
202
    :param base_tree: Git Tree base object
203
    :param existing_children: Children that still exist
204
    :param lookup_object: Lookup a git object by its SHA1
205
    :return: Inventory delta, as list
206
    """
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
207
    assert type(path) is unicode
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
208
    ret = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
209
    for name, mode, hexsha in base_tree.iteritems():
210
        if name in existing_children:
211
            continue
212
        c_path = posixpath.join(path, name.decode("utf-8"))
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
213
        file_id = base_inv.path2id(c_path)
214
        assert file_id is not None
215
        ret.append((c_path, None, file_id, None))
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
216
        if stat.S_ISDIR(mode):
217
            ret.extend(remove_disappeared_children(
218
                base_inv, c_path, lookup_object(hexsha), [], lookup_object))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
219
    return ret
220
221
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
222
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
0.200.848 by Jelmer Vernooij
remove unnecessary parent_inv_shamap.
223
        base_inv, parent_id, revision_id, parent_invs,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
224
        lookup_object, (base_mode, mode), store_updater,
225
        lookup_file_id, allow_submodules=False):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
226
    """Import a git tree object into a bzr repository.
227
0.200.261 by Jelmer Vernooij
More formatting fixes.
228
    :param texts: VersionedFiles object to add to
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
229
    :param path: Path in the tree (str)
230
    :param name: Name of the tree (str)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
231
    :param tree: A git tree object
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
232
    :param base_inv: Base inventory against which to return inventory delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
233
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
234
    """
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
235
    assert type(path) is str
236
    assert type(name) is str
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
237
    if base_hexsha == hexsha and base_mode == mode:
238
        # If nothing has changed since the base revision, we're done
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
239
        return [], {}
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
240
    invdelta = []
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
241
    file_id = lookup_file_id(path)
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
242
    # We just have to hope this is indeed utf-8:
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
243
    ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
244
    tree = lookup_object(hexsha)
245
    if base_hexsha is None:
246
        base_tree = None
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
247
        old_path = None # Newly appeared here
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
248
    else:
249
        base_tree = lookup_object(base_hexsha)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
250
        old_path = path.decode("utf-8") # Renames aren't supported yet
251
    new_path = path.decode("utf-8")
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
252
    if base_tree is None or type(base_tree) is not Tree:
253
        ie.revision = revision_id
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
254
        invdelta.append((old_path, new_path, ie.file_id, ie))
0.252.24 by Jelmer Vernooij
Support reading fileid map.
255
        texts.insert_record_stream([
256
            ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
257
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
258
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
259
    child_modes = {}
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
260
    for child_mode, name, child_hexsha in tree.entries():
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
261
        existing_children.add(name)
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
262
        child_path = posixpath.join(path, name)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
263
        if type(base_tree) is Tree:
264
            try:
265
                child_base_mode, child_base_hexsha = base_tree[name]
266
            except KeyError:
267
                child_base_hexsha = None
268
                child_base_mode = 0
269
        else:
270
            child_base_hexsha = None
271
            child_base_mode = 0
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
272
        if stat.S_ISDIR(child_mode):
0.252.25 by Jelmer Vernooij
Reformatting.
273
            subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
274
                child_path, name, (child_base_hexsha, child_hexsha), base_inv,
275
                file_id, revision_id, parent_invs, lookup_object, 
276
                (child_base_mode, child_mode), store_updater, lookup_file_id,
277
                allow_submodules=allow_submodules)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
278
        elif S_ISGITLINK(child_mode): # submodule
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
279
            if not allow_submodules:
280
                raise SubmodulesRequireSubtrees()
0.252.25 by Jelmer Vernooij
Reformatting.
281
            subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
282
                child_path, name, (child_base_hexsha, child_hexsha), base_inv,
283
                file_id, revision_id, parent_invs, lookup_object,
284
                (child_base_mode, child_mode), store_updater, lookup_file_id)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
285
        else:
0.252.25 by Jelmer Vernooij
Reformatting.
286
            subinvdelta = import_git_blob(texts, mapping, child_path, name,
287
                (child_base_hexsha, child_hexsha), base_inv, file_id,
288
                revision_id, parent_invs, lookup_object,
289
                (child_base_mode, child_mode), store_updater, lookup_file_id)
0.200.757 by Jelmer Vernooij
Use inventory deltas.
290
            grandchildmodes = {}
291
        child_modes.update(grandchildmodes)
292
        invdelta.extend(subinvdelta)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
293
        if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
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.
294
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
0.200.879 by Jelmer Vernooij
Fix unusual modes.
295
            child_modes[child_path] = child_mode
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
296
    # Remove any children that have disappeared
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
297
    if base_tree is not None and type(base_tree) is Tree:
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
298
        invdelta.extend(remove_disappeared_children(base_inv, old_path,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
299
            base_tree, existing_children, lookup_object))
0.200.952 by Jelmer Vernooij
Write git pack files rather than loose objects.
300
    store_updater.add_object(tree, ie, path)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
301
    return invdelta, child_modes
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
302
303
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
304
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
305
    o, rev, ret_tree, parent_trees, mapping, unusual_modes):
306
    new_unusual_modes = mapping.export_unusual_file_modes(rev)
307
    if new_unusual_modes != unusual_modes:
308
        raise AssertionError("unusual modes don't match: %r != %r" % (
309
            unusual_modes, new_unusual_modes))
310
    # Verify that we can reconstruct the commit properly
0.200.929 by Jelmer Vernooij
Fix number of arguments in debug code.
311
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
312
    if rec_o != o:
313
        raise AssertionError("Reconstructed commit differs: %r != %r" % (
314
            rec_o, o))
315
    diff = []
316
    new_objs = {}
317
    for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
318
        target_git_object_retriever._cache.idmap, unusual_modes, mapping.BZR_DUMMY_FILE):
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
319
        old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
320
        new_objs[path] = obj
321
        if obj.id != old_obj_id:
322
            diff.append((path, lookup_object(old_obj_id), obj))
323
    for (path, old_obj, new_obj) in diff:
324
        while (old_obj.type_name == "tree" and
325
               new_obj.type_name == "tree" and
326
               sorted(old_obj) == sorted(new_obj)):
327
            for name in old_obj:
328
                if old_obj[name][0] != new_obj[name][0]:
0.252.25 by Jelmer Vernooij
Reformatting.
329
                    raise AssertionError("Modes for %s differ: %o != %o" %
330
                        (path, old_obj[name][0], new_obj[name][0]))
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
331
                if old_obj[name][1] != new_obj[name][1]:
332
                    # Found a differing child, delve deeper
333
                    path = posixpath.join(path, name)
334
                    old_obj = lookup_object(old_obj[name][1])
335
                    new_obj = new_objs[path]
336
                    break
337
        raise AssertionError("objects differ for %s: %r != %r" % (path,
338
            old_obj, new_obj))
339
340
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
341
def import_git_commit(repo, mapping, head, lookup_object,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
342
                      target_git_object_retriever, trees_cache):
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
343
    o = lookup_object(head)
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
344
    rev = mapping.import_commit(o,
345
            lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
346
    # We have to do this here, since we have to walk the tree and
347
    # we need to make sure to import the blobs / trees with the right
348
    # path; this may involve adding them more than once.
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
349
    parent_trees = trees_cache.revision_trees(rev.parent_ids)
350
    if parent_trees == []:
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
351
        base_inv = Inventory(root_id=None)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
352
        base_tree = None
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
353
        base_mode = None
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
354
    else:
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
355
        base_inv = parent_trees[0].inventory
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
356
        base_tree = lookup_object(o.parents[0]).tree
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
357
        base_mode = stat.S_IFDIR
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
358
    store_updater = target_git_object_retriever._get_updater(rev)
0.200.952 by Jelmer Vernooij
Write git pack files rather than loose objects.
359
    store_updater.add_object(o, None, None)
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
360
    lookup_file_id = mapping.get_fileid_map(lookup_object, o.tree).lookup_file_id
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
361
    inv_delta, unusual_modes = import_git_tree(repo.texts,
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
362
            mapping, "", "", (base_tree, o.tree), base_inv, 
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
363
            None, rev.revision_id, [p.inventory for p in parent_trees],
364
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
0.252.1 by Jelmer Vernooij
Support storing revision id data.
365
            lookup_file_id,
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
366
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
367
    store_updater.finish()
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
368
    if unusual_modes != {}:
369
        for path, mode in unusual_modes.iteritems():
370
            warn_unusual_mode(rev.foreign_revid, path, mode)
371
        mapping.import_unusual_file_modes(rev, unusual_modes)
372
    try:
373
        basis_id = rev.parent_ids[0]
374
    except IndexError:
375
        basis_id = NULL_REVISION
376
        base_inv = None
377
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
378
              inv_delta, rev.revision_id, rev.parent_ids,
379
              base_inv)
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
380
    ret_tree = RevisionTree(repo, inv, rev.revision_id)
381
    trees_cache.add(ret_tree)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
382
    repo.add_revision(rev.revision_id, rev)
383
    if "verify" in debug.debug_flags:
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
384
        verify_commit_reconstruction(target_git_object_retriever, 
385
            lookup_object, o, rev, ret_tree, parent_trees, mapping,
386
            unusual_modes)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
387
388
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
389
def import_git_objects(repo, mapping, object_iter,
390
    target_git_object_retriever, heads, pb=None, limit=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
391
    """Import a set of git objects into a bzr repository.
392
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
393
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
394
    :param mapping: Mapping to use
395
    :param object_iter: Iterator over Git objects.
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
396
    :return: Tuple with pack hints and last imported revision id
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
397
    """
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
398
    def lookup_object(sha):
399
        try:
400
            return object_iter[sha]
401
        except KeyError:
402
            return target_git_object_retriever[sha]
0.200.158 by Jelmer Vernooij
fetch works \o/
403
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
404
    checked = set()
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
405
    heads = list(set(heads))
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
406
    trees_cache = LRUTreeCache(repo)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
407
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
408
    while heads:
409
        if pb is not None:
410
            pb.update("finding revisions to fetch", len(graph), None)
411
        head = heads.pop()
412
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
413
        try:
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
414
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
415
        except KeyError:
416
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
417
        if isinstance(o, Commit):
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
418
            rev = mapping.import_commit(o, lambda x: None)
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
419
            if repo.has_revision(rev.revision_id):
420
                continue
0.200.668 by Jelmer Vernooij
Fix some places where we were way too much memory for repositories with a large number of entries in the inventory and a large number of revisions.
421
            graph.append((o.id, o.parents))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
422
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
423
        elif isinstance(o, Tag):
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
424
            if o.object[1] not in checked:
425
                heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
426
        else:
427
            trace.warning("Unable to import head object %r" % o)
0.200.668 by Jelmer Vernooij
Fix some places where we were way too much memory for repositories with a large number of entries in the inventory and a large number of revisions.
428
        checked.add(o.id)
429
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
430
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
431
    # Create the inventory objects
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
432
    batch_size = 1000
0.200.680 by Jelmer Vernooij
fetch revisions in batches
433
    revision_ids = topo_sort(graph)
434
    pack_hints = []
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
435
    if limit is not None:
436
        revision_ids = revision_ids[:limit]
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
437
    last_imported = None
0.200.680 by Jelmer Vernooij
fetch revisions in batches
438
    for offset in range(0, len(revision_ids), batch_size):
0.254.33 by Jelmer Vernooij
Merge trunk.
439
        target_git_object_retriever.start_write_group() 
0.200.680 by Jelmer Vernooij
fetch revisions in batches
440
        try:
0.254.33 by Jelmer Vernooij
Merge trunk.
441
            repo.start_write_group()
442
            try:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
443
                for i, head in enumerate(
444
                    revision_ids[offset:offset+batch_size]):
0.254.33 by Jelmer Vernooij
Merge trunk.
445
                    if pb is not None:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
446
                        pb.update("fetching revisions", offset+i,
447
                                  len(revision_ids))
0.254.33 by Jelmer Vernooij
Merge trunk.
448
                    import_git_commit(repo, mapping, head, lookup_object,
0.252.25 by Jelmer Vernooij
Reformatting.
449
                        target_git_object_retriever, trees_cache)
0.254.33 by Jelmer Vernooij
Merge trunk.
450
                    last_imported = head
451
            except:
452
                repo.abort_write_group()
453
                raise
454
            else:
455
                hint = repo.commit_write_group()
456
                if hint is not None:
457
                    pack_hints.extend(hint)
0.200.680 by Jelmer Vernooij
fetch revisions in batches
458
        except:
0.254.33 by Jelmer Vernooij
Merge trunk.
459
            target_git_object_retriever.abort_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
460
            raise
461
        else:
0.254.33 by Jelmer Vernooij
Merge trunk.
462
            target_git_object_retriever.commit_write_group()
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
463
    return pack_hints, last_imported
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
464
465
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
466
class InterGitRepository(InterRepository):
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
467
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
468
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
469
470
    @staticmethod
471
    def _get_repo_format_to_test():
472
        return None
473
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
474
    def copy_content(self, revision_id=None, pb=None):
475
        """See InterRepository.copy_content."""
476
        self.fetch(revision_id, pb, find_ghosts=False)
477
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
478
479
class InterGitNonGitRepository(InterGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
480
    """Base InterRepository that copies revisions from a Git into a non-Git
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
481
    repository."""
482
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
483
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
0.200.247 by Jelmer Vernooij
Fix git-import.
484
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
485
        if mapping is None:
486
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
487
        if revision_id is not None:
488
            interesting_heads = [revision_id]
489
        elif fetch_spec is not None:
490
            interesting_heads = fetch_spec.heads
491
        else:
492
            interesting_heads = None
0.200.247 by Jelmer Vernooij
Fix git-import.
493
        self._refs = {}
494
        def determine_wants(refs):
495
            self._refs = refs
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
496
            if interesting_heads is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
497
                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.
498
            else:
0.252.45 by Jelmer Vernooij
Finish fetching roundtripped revisions back into bzr.
499
                ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
500
            return [rev for rev in ret if not self.target.has_revision(self.source.lookup_foreign_revision_id(rev))]
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
501
        (pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
0.200.579 by Jelmer Vernooij
Only pack if it makes the target repo smaller.
502
        if pack_hint is not None and self.target._format.pack_compresses:
0.200.578 by Jelmer Vernooij
Only do optimal packing on bzr >= 1.17.
503
            self.target.pack(hint=pack_hint)
0.200.247 by Jelmer Vernooij
Fix git-import.
504
        return self._refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
505
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
506
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
507
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
508
def report_git_progress(pb, text):
509
    text = text.rstrip("\r\n")
510
    g = _GIT_PROGRESS_RE.match(text)
511
    if g is not None:
512
        (text, pct, current, total) = g.groups()
513
        pb.update(text, int(current), int(total))
514
    else:
515
        pb.update(text, 0, 0)
516
517
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
518
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
519
    """InterRepository that copies revisions from a remote Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
520
    repository."""
521
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
522
    def get_target_heads(self):
523
        # FIXME: This should be more efficient
524
        all_revs = self.target.all_revision_ids()
525
        parent_map = self.target.get_parent_map(all_revs)
526
        all_parents = set()
527
        map(all_parents.update, parent_map.itervalues())
528
        return set(all_revs) - all_parents
529
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
530
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
531
        def progress(text):
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
532
            report_git_progress(pb, text)
0.200.466 by Jelmer Vernooij
Fix finding of heads for fetch_objects.
533
        store = BazaarObjectStore(self.target, mapping)
0.200.484 by Jelmer Vernooij
Cope with kind changes.
534
        self.target.lock_write()
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
535
        try:
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
536
            heads = self.get_target_heads()
0.200.484 by Jelmer Vernooij
Cope with kind changes.
537
            graph_walker = store.get_graph_walker(
538
                    [store._lookup_revision_sha1(head) for head in heads])
539
            recorded_wants = []
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
540
0.200.484 by Jelmer Vernooij
Cope with kind changes.
541
            def record_determine_wants(heads):
542
                wants = determine_wants(heads)
543
                recorded_wants.extend(wants)
544
                return wants
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
545
0.200.484 by Jelmer Vernooij
Cope with kind changes.
546
            create_pb = None
547
            if pb is None:
548
                create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
549
            try:
0.252.25 by Jelmer Vernooij
Reformatting.
550
                objects_iter = self.source.fetch_objects(record_determine_wants,
551
                    graph_walker, store.get_raw, progress)
0.200.680 by Jelmer Vernooij
fetch revisions in batches
552
                return import_git_objects(self.target, mapping,
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
553
                    objects_iter, store, recorded_wants, pb, limit)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
554
            finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
555
                if create_pb:
556
                    create_pb.finished()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
557
        finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
558
            self.target.unlock()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
559
560
    @staticmethod
561
    def is_compatible(source, target):
562
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
563
        return (isinstance(source, RemoteGitRepository) and
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
564
                target.supports_rich_root() and
0.200.906 by Jelmer Vernooij
Check that target supports versionedfile.
565
                not isinstance(target, GitRepository) and
566
                target.texts is not None)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
567
568
569
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
570
    """InterRepository that copies revisions from a local Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
571
    repository."""
572
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
573
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
574
        """Fetch objects.
575
        """
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
576
        wants = determine_wants(self.source._git.get_refs())
577
        create_pb = None
578
        if pb is None:
579
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
580
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
581
        try:
582
            self.target.lock_write()
583
            try:
0.200.680 by Jelmer Vernooij
fetch revisions in batches
584
                return import_git_objects(self.target, mapping,
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
585
                    self.source._git.object_store,
586
                    target_git_object_retriever, wants, pb, limit)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
587
            finally:
588
                self.target.unlock()
589
        finally:
590
            if create_pb:
591
                create_pb.finished()
592
593
    @staticmethod
594
    def is_compatible(source, target):
595
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
596
        return (isinstance(source, LocalGitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
597
                target.supports_rich_root() and
0.200.906 by Jelmer Vernooij
Check that target supports versionedfile.
598
                not isinstance(target, GitRepository) and
599
                target.texts is not None)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
600
601
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
602
class InterGitGitRepository(InterGitRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
603
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
604
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
605
    def fetch_objects(self, determine_wants, mapping, pb=None):
606
        def progress(text):
607
            trace.note("git: %s", text)
608
        graphwalker = self.target._git.get_graph_walker()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
609
        if (isinstance(self.source, LocalGitRepository) and
610
            isinstance(self.target, LocalGitRepository)):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
611
            return self.source._git.fetch(self.target._git, determine_wants,
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
612
                progress)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
613
        elif (isinstance(self.source, LocalGitRepository) and
614
              isinstance(self.target, RemoteGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
615
            raise NotImplementedError
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
616
        elif (isinstance(self.source, RemoteGitRepository) and
617
              isinstance(self.target, LocalGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
618
            f, commit = self.target._git.object_store.add_thin_pack()
619
            try:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
620
                refs = self.source._git.fetch_pack(determine_wants,
621
                    graphwalker, f.write, progress)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
622
                commit()
623
                return refs
624
            except:
625
                f.close()
626
                raise
627
        else:
628
            raise AssertionError
629
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
630
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
631
              mapping=None, fetch_spec=None, branches=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
632
        if mapping is None:
633
            mapping = self.source.get_mapping()
634
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
635
        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.
636
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
637
        elif fetch_spec is not None:
638
            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.
639
        if branches is not None:
640
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
641
        elif fetch_spec is None and revision_id is None:
0.200.247 by Jelmer Vernooij
Fix git-import.
642
            determine_wants = r.object_store.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
643
        else:
0.200.247 by Jelmer Vernooij
Fix git-import.
644
            determine_wants = lambda x: [y for y in args if not y in r.object_store]
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
645
        return self.fetch_objects(determine_wants, mapping)[0]
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
646
647
    @staticmethod
648
    def is_compatible(source, target):
649
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
650
        return (isinstance(source, GitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
651
                isinstance(target, GitRepository))