/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.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
22
    ZERO_SHA,
0.200.261 by Jelmer Vernooij
More formatting fixes.
23
    )
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
24
from dulwich.object_store import (
25
    tree_lookup_path,
26
    )
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
27
from itertools import (
28
    imap,
29
    )
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
30
import posixpath
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
31
import re
0.200.352 by Jelmer Vernooij
Simplify mode handling.
32
import stat
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
33
34
from bzrlib import (
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
35
    debug,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
36
    osutils,
0.200.261 by Jelmer Vernooij
More formatting fixes.
37
    trace,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
38
    ui,
39
    )
40
from bzrlib.errors import (
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
41
    BzrError,
0.200.372 by Jelmer Vernooij
Fix key when looking up old sha's in cache.
42
    NoSuchId,
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
43
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
44
from bzrlib.inventory import (
45
    Inventory,
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
46
    InventoryDirectory,
47
    InventoryFile,
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
48
    InventoryLink,
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
49
    TreeReference,
0.200.261 by Jelmer Vernooij
More formatting fixes.
50
    )
51
from bzrlib.repository import (
52
    InterRepository,
53
    )
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
54
from bzrlib.revision import (
55
    NULL_REVISION,
56
    )
0.200.1187 by Jelmer Vernooij
Use InventoryRevisionTree.
57
try:
58
    from bzrlib.revisiontree import InventoryRevisionTree
59
except ImportError: # bzr < 2.4
60
    from bzrlib.revisiontree import RevisionTree as InventoryRevisionTree
0.200.1023 by Jelmer Vernooij
Set and verify testament.
61
from bzrlib.testament import (
62
    StrictTestament3,
63
    )
0.200.292 by Jelmer Vernooij
Fix formatting.
64
from bzrlib.tsort import (
65
    topo_sort,
66
    )
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
67
from bzrlib.versionedfile import (
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
68
    ChunkedContentFactory,
0.200.417 by Jelmer Vernooij
use insert_record_stream rather than add_lines.
69
    )
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
70
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
71
from bzrlib.plugins.git.mapping import (
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
72
    DEFAULT_FILE_MODE,
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
73
    mode_is_executable,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
74
    mode_kind,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
75
    warn_unusual_mode,
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
76
    )
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
77
from bzrlib.plugins.git.object_store import (
78
    BazaarObjectStore,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
79
    LRUTreeCache,
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
80
    _tree_to_objects,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
81
    )
0.259.4 by Jelmer Vernooij
Put determine_wants methods on InterRepo.
82
from bzrlib.plugins.git.refs import extract_tags
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
83
from bzrlib.plugins.git.remote import (
84
    RemoteGitRepository,
85
    )
0.200.169 by Jelmer Vernooij
Fix branch cloning.
86
from bzrlib.plugins.git.repository import (
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
87
    GitRepository,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
88
    GitRepositoryFormat,
0.200.426 by Jelmer Vernooij
Fix import of RemoteGitRepository.
89
    LocalGitRepository,
0.200.261 by Jelmer Vernooij
More formatting fixes.
90
    )
0.216.4 by Jelmer Vernooij
Add basic pack fetch infrastructure.
91
92
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
93
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha), 
0.200.848 by Jelmer Vernooij
remove unnecessary parent_inv_shamap.
94
        base_inv, parent_id, revision_id,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
95
        parent_invs, lookup_object, (base_mode, mode), store_updater,
96
        lookup_file_id):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
97
    """Import a git blob object into a bzr repository.
98
0.200.261 by Jelmer Vernooij
More formatting fixes.
99
    :param texts: VersionedFiles to add to
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
100
    :param path: Path in the tree
101
    :param blob: A git blob
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
102
    :return: Inventory delta for this file
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
103
    """
0.252.28 by Jelmer Vernooij
Don't import control files.
104
    if mapping.is_control_file(path):
105
        return []
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
106
    if base_hexsha == hexsha and base_mode == mode:
107
        # 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.
108
        return []
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
109
    file_id = lookup_file_id(path)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
110
    if stat.S_ISLNK(mode):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
111
        cls = InventoryLink
112
    else:
113
        cls = InventoryFile
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
114
    ie = cls(file_id, name.decode("utf-8"), parent_id)
0.200.995 by Jelmer Vernooij
Support newer versions of bzr where only some InventoryFile/InventoryLink attributes are writable.
115
    if ie.kind == "file":
116
        ie.executable = mode_is_executable(mode)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
117
    if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
118
        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.
119
        ie.text_size = base_ie.text_size
120
        ie.text_sha1 = base_ie.text_sha1
0.200.995 by Jelmer Vernooij
Support newer versions of bzr where only some InventoryFile/InventoryLink attributes are writable.
121
        if ie.kind == "symlink":
122
            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.
123
        if ie.executable == base_ie.executable:
124
            ie.revision = base_ie.revision
125
        else:
126
            blob = lookup_object(hexsha)
0.200.304 by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need.
127
    else:
128
        blob = lookup_object(hexsha)
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
129
        if ie.kind == "symlink":
0.200.551 by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets.
130
            ie.revision = None
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
131
            ie.symlink_target = blob.data
132
        else:
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
133
            ie.text_size = sum(imap(len, blob.chunked))
134
            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).
135
    # Check what revision we should store
0.200.283 by Jelmer Vernooij
Avoid storing repeated texts for blobs.
136
    parent_keys = []
0.200.904 by Jelmer Vernooij
Fix inconsistent parents.
137
    for pinv in parent_invs:
0.200.829 by Jelmer Vernooij
Cope with the fact that _type is gone in upstream dulwich.
138
        try:
139
            pie = pinv[file_id]
140
        except NoSuchId:
141
            continue
0.252.25 by Jelmer Vernooij
Reformatting.
142
        if (pie.text_sha1 == ie.text_sha1 and
143
            pie.executable == ie.executable and
144
            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).
145
            # 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.
146
            ie.revision = pie.revision
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
147
            break
0.200.904 by Jelmer Vernooij
Fix inconsistent parents.
148
        parent_key = (file_id, pie.revision)
149
        if not parent_key in parent_keys:
150
            parent_keys.append(parent_key)
0.229.3 by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree).
151
    if ie.revision is None:
152
        # Need to store a new revision
153
        ie.revision = revision_id
154
        assert ie.revision is not None
0.200.698 by Jelmer Vernooij
Merge fixes for SHA1s of symlinks.
155
        if ie.kind == 'symlink':
0.200.811 by Jelmer Vernooij
Use ChunkedContentFactory when possible.
156
            chunks = []
0.200.1292 by Jelmer Vernooij
Fix repeeling objects when determining what to send.
157
        else:
0.200.830 by Jelmer Vernooij
Bump minimum dulwich version.
158
            chunks = blob.chunked
0.252.25 by Jelmer Vernooij
Reformatting.
159
        texts.insert_record_stream([
160
            ChunkedContentFactory((file_id, ie.revision),
161
                tuple(parent_keys), ie.text_sha1, chunks)])
0.200.572 by Jelmer Vernooij
Avoid some extra path lookups.
162
    invdelta = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
163
    if base_hexsha is not None:
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
164
        old_path = path.decode("utf-8") # Renames are not supported yet
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
165
        if stat.S_ISDIR(base_mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
166
            invdelta.extend(remove_disappeared_children(base_inv, old_path,
167
                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).
168
    else:
169
        old_path = None
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
170
    new_path = path.decode("utf-8")
171
    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.
172
    if base_hexsha != hexsha:
0.200.952 by Jelmer Vernooij
Write git pack files rather than loose objects.
173
        store_updater.add_object(blob, ie, path)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
174
    return invdelta
0.200.261 by Jelmer Vernooij
More formatting fixes.
175
176
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
177
class SubmodulesRequireSubtrees(BzrError):
0.200.1309 by Jelmer Vernooij
Break some more long lines.
178
    _fmt = ("The repository you are fetching from contains submodules. "
179
            "To continue, upgrade your Bazaar repository to a format that "
180
            "supports nested trees, such as 'development-subtree'.")
0.239.5 by Jelmer Vernooij
Print user-understandable error message when encountering submodules.
181
    internal = False
182
183
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
184
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
185
    base_inv, parent_id, revision_id, parent_invs, lookup_object,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
186
    (base_mode, mode), store_updater, lookup_file_id):
0.200.1309 by Jelmer Vernooij
Break some more long lines.
187
    """Import a git submodule."""
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
188
    if base_hexsha == hexsha and base_mode == mode:
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
189
        return [], {}
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
190
    file_id = lookup_file_id(path)
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
191
    ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
192
    ie.revision = revision_id
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
193
    if base_hexsha is None:
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
194
        oldpath = None
195
    else:
196
        oldpath = path
197
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
0.252.25 by Jelmer Vernooij
Reformatting.
198
    texts.insert_record_stream([
199
        ChunkedContentFactory((file_id, ie.revision), (), None, [])])
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
200
    invdelta = [(oldpath, path, file_id, ie)]
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
201
    return invdelta, {}
0.200.540 by Jelmer Vernooij
Handle submodules explicitly.
202
203
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
204
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
205
        lookup_object):
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
206
    """Generate an inventory delta for removed children.
207
208
    :param base_inv: Base inventory against which to generate the 
209
        inventory delta.
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
210
    :param path: Path to process (unicode)
0.200.930 by Jelmer Vernooij
Add assert demonstrating 571055 and triggering it for all target formats.
211
    :param base_tree: Git Tree base object
212
    :param existing_children: Children that still exist
213
    :param lookup_object: Lookup a git object by its SHA1
214
    :return: Inventory delta, as list
215
    """
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
216
    assert type(path) is unicode
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
217
    ret = []
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
218
    for name, mode, hexsha in base_tree.iteritems():
219
        if name in existing_children:
220
            continue
221
        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.
222
        file_id = base_inv.path2id(c_path)
223
        assert file_id is not None
224
        ret.append((c_path, None, file_id, None))
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
225
        if stat.S_ISDIR(mode):
226
            ret.extend(remove_disappeared_children(
227
                base_inv, c_path, lookup_object(hexsha), [], lookup_object))
0.200.552 by Jelmer Vernooij
Cope with directories becoming symlinks.
228
    return ret
229
230
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
231
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
0.200.848 by Jelmer Vernooij
remove unnecessary parent_inv_shamap.
232
        base_inv, parent_id, revision_id, parent_invs,
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
233
        lookup_object, (base_mode, mode), store_updater,
234
        lookup_file_id, allow_submodules=False):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
235
    """Import a git tree object into a bzr repository.
236
0.200.261 by Jelmer Vernooij
More formatting fixes.
237
    :param texts: VersionedFiles object to add to
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
238
    :param path: Path in the tree (str)
239
    :param name: Name of the tree (str)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
240
    :param tree: A git tree object
0.229.2 by Jelmer Vernooij
Initial work relying on inventory deltas.
241
    :param base_inv: Base inventory against which to return inventory delta
0.229.1 by Jelmer Vernooij
Start working with inventory deltas.
242
    :return: Inventory delta for this subtree
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
243
    """
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
244
    assert type(path) is str
245
    assert type(name) is str
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
246
    if base_hexsha == hexsha and base_mode == mode:
247
        # 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.
248
        return [], {}
0.200.344 by Jelmer Vernooij
Clarify names, use convenience function
249
    invdelta = []
0.200.896 by Jelmer Vernooij
Add separate function for looking up file ids.
250
    file_id = lookup_file_id(path)
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
251
    # We just have to hope this is indeed utf-8:
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
252
    ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
253
    tree = lookup_object(hexsha)
254
    if base_hexsha is None:
255
        base_tree = None
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
256
        old_path = None # Newly appeared here
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
257
    else:
258
        base_tree = lookup_object(base_hexsha)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
259
        old_path = path.decode("utf-8") # Renames aren't supported yet
260
    new_path = path.decode("utf-8")
0.200.823 by Jelmer Vernooij
Simplify logic in import_git_tree a bit.
261
    if base_tree is None or type(base_tree) is not Tree:
262
        ie.revision = revision_id
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
263
        invdelta.append((old_path, new_path, ie.file_id, ie))
0.252.24 by Jelmer Vernooij
Support reading fileid map.
264
        texts.insert_record_stream([
265
            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).
266
    # Remember for next time
0.200.300 by Jelmer Vernooij
Fix recursive deletion of dirs.
267
    existing_children = set()
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
268
    child_modes = {}
0.200.1147 by Jelmer Vernooij
Use Tree.items() rather than Tree.entries().
269
    for name, child_mode, child_hexsha in tree.iteritems():
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
270
        existing_children.add(name)
0.200.819 by Jelmer Vernooij
Avoid decoding basename twice.
271
        child_path = posixpath.join(path, name)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
272
        if type(base_tree) is Tree:
273
            try:
274
                child_base_mode, child_base_hexsha = base_tree[name]
275
            except KeyError:
276
                child_base_hexsha = None
277
                child_base_mode = 0
278
        else:
279
            child_base_hexsha = None
280
            child_base_mode = 0
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
281
        if stat.S_ISDIR(child_mode):
0.252.25 by Jelmer Vernooij
Reformatting.
282
            subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
283
                child_path, name, (child_base_hexsha, child_hexsha), base_inv,
0.200.1059 by Jelmer Vernooij
Fix graph tests.
284
                file_id, revision_id, parent_invs, lookup_object,
0.252.25 by Jelmer Vernooij
Reformatting.
285
                (child_base_mode, child_mode), store_updater, lookup_file_id,
286
                allow_submodules=allow_submodules)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
287
        elif S_ISGITLINK(child_mode): # submodule
0.200.666 by Jelmer Vernooij
Refuse to add tree references to non-subtree formats.
288
            if not allow_submodules:
289
                raise SubmodulesRequireSubtrees()
0.252.25 by Jelmer Vernooij
Reformatting.
290
            subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
291
                child_path, name, (child_base_hexsha, child_hexsha), base_inv,
292
                file_id, revision_id, parent_invs, lookup_object,
293
                (child_base_mode, child_mode), store_updater, lookup_file_id)
0.200.352 by Jelmer Vernooij
Simplify mode handling.
294
        else:
0.252.25 by Jelmer Vernooij
Reformatting.
295
            subinvdelta = import_git_blob(texts, mapping, child_path, name,
296
                (child_base_hexsha, child_hexsha), base_inv, file_id,
297
                revision_id, parent_invs, lookup_object,
298
                (child_base_mode, child_mode), store_updater, lookup_file_id)
0.200.757 by Jelmer Vernooij
Use inventory deltas.
299
            grandchildmodes = {}
300
        child_modes.update(grandchildmodes)
301
        invdelta.extend(subinvdelta)
0.200.816 by Jelmer Vernooij
Leave mode handling for blobs to import_git_blob.
302
        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.
303
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
0.200.879 by Jelmer Vernooij
Fix unusual modes.
304
            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).
305
    # Remove any children that have disappeared
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
306
    if base_tree is not None and type(base_tree) is Tree:
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
307
        invdelta.extend(remove_disappeared_children(base_inv, old_path,
0.200.820 by Jelmer Vernooij
Avoid relying on InventoryDirectory.children.
308
            base_tree, existing_children, lookup_object))
0.200.952 by Jelmer Vernooij
Write git pack files rather than loose objects.
309
    store_updater.add_object(tree, ie, path)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
310
    return invdelta, child_modes
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
311
312
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
313
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
0.200.1047 by Jelmer Vernooij
Fix -Dverify.
314
    o, rev, ret_tree, parent_trees, mapping, unusual_modes, verifiers):
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
315
    new_unusual_modes = mapping.export_unusual_file_modes(rev)
316
    if new_unusual_modes != unusual_modes:
317
        raise AssertionError("unusual modes don't match: %r != %r" % (
318
            unusual_modes, new_unusual_modes))
319
    # Verify that we can reconstruct the commit properly
0.200.1047 by Jelmer Vernooij
Fix -Dverify.
320
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
321
        verifiers)
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
322
    if rec_o != o:
323
        raise AssertionError("Reconstructed commit differs: %r != %r" % (
324
            rec_o, o))
325
    diff = []
326
    new_objs = {}
327
    for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
0.200.1309 by Jelmer Vernooij
Break some more long lines.
328
        target_git_object_retriever._cache.idmap, unusual_modes,
329
        mapping.BZR_DUMMY_FILE):
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
330
        old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
331
        new_objs[path] = obj
332
        if obj.id != old_obj_id:
333
            diff.append((path, lookup_object(old_obj_id), obj))
334
    for (path, old_obj, new_obj) in diff:
335
        while (old_obj.type_name == "tree" and
336
               new_obj.type_name == "tree" and
337
               sorted(old_obj) == sorted(new_obj)):
338
            for name in old_obj:
339
                if old_obj[name][0] != new_obj[name][0]:
0.252.25 by Jelmer Vernooij
Reformatting.
340
                    raise AssertionError("Modes for %s differ: %o != %o" %
341
                        (path, old_obj[name][0], new_obj[name][0]))
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
342
                if old_obj[name][1] != new_obj[name][1]:
343
                    # Found a differing child, delve deeper
344
                    path = posixpath.join(path, name)
345
                    old_obj = lookup_object(old_obj[name][1])
346
                    new_obj = new_objs[path]
347
                    break
348
        raise AssertionError("objects differ for %s: %r != %r" % (path,
349
            old_obj, new_obj))
350
351
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
352
def import_git_commit(repo, mapping, head, lookup_object,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
353
                      target_git_object_retriever, trees_cache):
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
354
    o = lookup_object(head)
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
355
    # Note that this uses mapping.revision_id_foreign_to_bzr. If the parents
356
    # were bzr roundtripped revisions they would be specified in the
357
    # roundtrip data.
0.261.4 by Jelmer Vernooij
Fix tests.
358
    rev, roundtrip_revid, verifiers = mapping.import_commit(
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
359
        o, mapping.revision_id_foreign_to_bzr)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
360
    # We have to do this here, since we have to walk the tree and
361
    # we need to make sure to import the blobs / trees with the right
362
    # path; this may involve adding them more than once.
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
363
    parent_trees = trees_cache.revision_trees(rev.parent_ids)
364
    if parent_trees == []:
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
365
        base_inv = Inventory(root_id=None)
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
366
        base_tree = None
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
367
        base_mode = None
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
368
    else:
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
369
        base_inv = parent_trees[0].inventory
0.200.814 by Jelmer Vernooij
Avoid the use of InventoryDirectory.children. This speeds up
370
        base_tree = lookup_object(o.parents[0]).tree
0.200.817 by Jelmer Vernooij
Deal with all modes locally.
371
        base_mode = stat.S_IFDIR
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
372
    store_updater = target_git_object_retriever._get_updater(rev)
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
373
    tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
0.200.839 by Jelmer Vernooij
Add convenience object for updating the object store caching layer.
374
    inv_delta, unusual_modes = import_git_tree(repo.texts,
0.200.988 by Jelmer Vernooij
Some formatting cleanups.
375
            mapping, "", "", (base_tree, o.tree), base_inv,
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
376
            None, rev.revision_id, [p.inventory for p in parent_trees],
377
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
378
            tree_supplement.lookup_file_id,
0.200.1309 by Jelmer Vernooij
Break some more long lines.
379
            allow_submodules=getattr(repo._format, "supports_tree_reference",
380
                False))
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
381
    if unusual_modes != {}:
382
        for path, mode in unusual_modes.iteritems():
383
            warn_unusual_mode(rev.foreign_revid, path, mode)
384
        mapping.import_unusual_file_modes(rev, unusual_modes)
385
    try:
386
        basis_id = rev.parent_ids[0]
387
    except IndexError:
388
        basis_id = NULL_REVISION
389
        base_inv = None
390
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
0.200.988 by Jelmer Vernooij
Some formatting cleanups.
391
              inv_delta, rev.revision_id, rev.parent_ids, base_inv)
0.200.1195 by Jelmer Vernooij
Cope with new StrictTestament3 arguments.
392
    ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
393
    if roundtrip_revid is not None:
0.200.1023 by Jelmer Vernooij
Set and verify testament.
394
        original_revid = rev.revision_id
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
395
        rev.revision_id = roundtrip_revid
0.200.1195 by Jelmer Vernooij
Cope with new StrictTestament3 arguments.
396
        # Check verifiers
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
397
        if verifiers:
398
            if getattr(StrictTestament3, "from_revision_tree", None):
399
                testament = StrictTestament3(rev, ret_tree)
400
            else: # bzr < 2.4
401
                testament = StrictTestament3(rev, inv)
402
            calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
403
            if calculated_verifiers != verifiers:
404
                trace.mutter("Testament SHA1 %r for %r did not match %r.",
405
                             calculated_verifiers["testament3-sha1"],
406
                             rev.revision_id, verifiers["testament3-sha1"])
407
                rev.revision_id = original_revid
408
        else:
409
            calculated_verifiers = {}
0.200.1179 by Jelmer Vernooij
Avoid using verifiers for natively imported revisions, save a lot of time.
410
    else:
411
        calculated_verifiers = {}
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
412
    store_updater.add_object(o, calculated_verifiers, None)
413
    store_updater.finish()
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
414
    trees_cache.add(ret_tree)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
415
    repo.add_revision(rev.revision_id, rev)
416
    if "verify" in debug.debug_flags:
0.200.883 by Jelmer Vernooij
Add function for verifying reconstruction of objects still works.
417
        verify_commit_reconstruction(target_git_object_retriever, 
418
            lookup_object, o, rev, ret_tree, parent_trees, mapping,
0.200.1047 by Jelmer Vernooij
Fix -Dverify.
419
            unusual_modes, verifiers)
0.200.679 by Jelmer Vernooij
Moving commit import functionality to a separate function.
420
421
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
422
def import_git_objects(repo, mapping, object_iter,
423
    target_git_object_retriever, heads, pb=None, limit=None):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
424
    """Import a set of git objects into a bzr repository.
425
0.200.483 by Jelmer Vernooij
Add NEWS entry about sha map.
426
    :param repo: Target Bazaar repository
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
427
    :param mapping: Mapping to use
428
    :param object_iter: Iterator over Git objects.
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
429
    :return: Tuple with pack hints and last imported revision id
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
430
    """
0.200.469 by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped.
431
    def lookup_object(sha):
432
        try:
433
            return object_iter[sha]
434
        except KeyError:
435
            return target_git_object_retriever[sha]
0.200.158 by Jelmer Vernooij
fetch works \o/
436
    graph = []
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
437
    checked = set()
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
438
    heads = list(set(heads))
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
439
    trees_cache = LRUTreeCache(repo)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
440
    # Find and convert commit objects
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
441
    while heads:
442
        if pb is not None:
443
            pb.update("finding revisions to fetch", len(graph), None)
444
        head = heads.pop()
445
        assert isinstance(head, str)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
446
        try:
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
447
            o = lookup_object(head)
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
448
        except KeyError:
449
            continue
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
450
        if isinstance(o, Commit):
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
451
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
0.261.6 by Jelmer Vernooij
Use mapping.revision_id_foreign_to_bzr to find parents everywhere.
452
                mapping.revision_id_foreign_to_bzr)
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
453
            if (repo.has_revision(rev.revision_id) or
454
                (roundtrip_revid and repo.has_revision(roundtrip_revid))):
0.200.295 by Jelmer Vernooij
Don't re-import revisions already fetched.
455
                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.
456
            graph.append((o.id, o.parents))
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
457
            heads.extend([p for p in o.parents if p not in checked])
0.200.303 by Jelmer Vernooij
Cope with tags during fetch.
458
        elif isinstance(o, Tag):
0.200.734 by Jelmer Vernooij
Don't import head revision twice when pulling from Git.
459
            if o.object[1] not in checked:
460
                heads.append(o.object[1])
0.200.296 by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve.
461
        else:
462
            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.
463
        checked.add(o.id)
464
    del checked
0.200.158 by Jelmer Vernooij
fetch works \o/
465
    # Order the revisions
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
466
    # Create the inventory objects
0.200.821 by Jelmer Vernooij
Remove last references to ID.children.
467
    batch_size = 1000
0.200.680 by Jelmer Vernooij
fetch revisions in batches
468
    revision_ids = topo_sort(graph)
469
    pack_hints = []
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
470
    if limit is not None:
471
        revision_ids = revision_ids[:limit]
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
472
    last_imported = None
0.200.680 by Jelmer Vernooij
fetch revisions in batches
473
    for offset in range(0, len(revision_ids), batch_size):
0.254.33 by Jelmer Vernooij
Merge trunk.
474
        target_git_object_retriever.start_write_group() 
0.200.680 by Jelmer Vernooij
fetch revisions in batches
475
        try:
0.254.33 by Jelmer Vernooij
Merge trunk.
476
            repo.start_write_group()
477
            try:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
478
                for i, head in enumerate(
479
                    revision_ids[offset:offset+batch_size]):
0.254.33 by Jelmer Vernooij
Merge trunk.
480
                    if pb is not None:
0.200.824 by Jelmer Vernooij
Commit cache data in batches as well.
481
                        pb.update("fetching revisions", offset+i,
482
                                  len(revision_ids))
0.254.33 by Jelmer Vernooij
Merge trunk.
483
                    import_git_commit(repo, mapping, head, lookup_object,
0.252.25 by Jelmer Vernooij
Reformatting.
484
                        target_git_object_retriever, trees_cache)
0.254.33 by Jelmer Vernooij
Merge trunk.
485
                    last_imported = head
486
            except:
487
                repo.abort_write_group()
488
                raise
489
            else:
490
                hint = repo.commit_write_group()
491
                if hint is not None:
492
                    pack_hints.extend(hint)
0.200.680 by Jelmer Vernooij
fetch revisions in batches
493
        except:
0.254.33 by Jelmer Vernooij
Merge trunk.
494
            target_git_object_retriever.abort_write_group()
0.200.680 by Jelmer Vernooij
fetch revisions in batches
495
            raise
496
        else:
0.254.33 by Jelmer Vernooij
Merge trunk.
497
            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
498
    return pack_hints, last_imported
0.200.141 by Jelmer Vernooij
Separate out local and remote fetching.
499
500
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
501
class InterGitRepository(InterRepository):
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
502
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
503
    _matching_repo_format = GitRepositoryFormat()
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
504
0.200.1154 by Jelmer Vernooij
Share more code in InterGitRepository.
505
    def _target_has_shas(self, shas):
506
        raise NotImplementedError(self._target_has_shas)
507
508
    def get_determine_wants_heads(self, wants, include_tags=False):
509
        wants = set(wants)
510
        def determine_wants(refs):
511
            potential = set(wants)
512
            if include_tags:
0.200.1300 by Jelmer Vernooij
Fix formatting.
513
                potential.update(
514
                    [v[1] or v[0] for v in extract_tags(refs).itervalues()])
0.200.1154 by Jelmer Vernooij
Share more code in InterGitRepository.
515
            return list(potential - self._target_has_shas(potential))
516
        return determine_wants
517
518
    def determine_wants_all(self, refs):
0.200.1300 by Jelmer Vernooij
Fix formatting.
519
        potential = set([sha for (ref, sha) in refs.iteritems() if not
520
            ref.endswith("^{}")])
0.200.1154 by Jelmer Vernooij
Share more code in InterGitRepository.
521
        return list(potential - self._target_has_shas(potential))
522
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
523
    @staticmethod
524
    def _get_repo_format_to_test():
525
        return None
526
0.200.135 by Jelmer Vernooij
Add stub for fetching data.
527
    def copy_content(self, revision_id=None, pb=None):
528
        """See InterRepository.copy_content."""
529
        self.fetch(revision_id, pb, find_ghosts=False)
530
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
531
532
class InterGitNonGitRepository(InterGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
533
    """Base InterRepository that copies revisions from a Git into a non-Git
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
534
    repository."""
535
0.259.4 by Jelmer Vernooij
Put determine_wants methods on InterRepo.
536
    def _target_has_shas(self, shas):
537
        revids = [self.source.lookup_foreign_revision_id(sha) for sha in shas]
538
        return self.target.has_revisions(revids)
539
0.259.6 by Jelmer Vernooij
Fetch tags during pull.
540
    def get_determine_wants_revids(self, revids, include_tags=False):
541
        wants = set()
542
        for revid in set(revids):
543
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
544
            wants.add(git_sha)
0.200.1309 by Jelmer Vernooij
Break some more long lines.
545
        return self.get_determine_wants_heads(wants,
546
            include_tags=include_tags)
0.259.6 by Jelmer Vernooij
Fetch tags during pull.
547
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
548
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
549
        """Fetch objects from a remote server.
550
551
        :param determine_wants: determine_wants callback
552
        :param mapping: BzrGitMapping to use
553
        :param pb: Optional progress bar
554
        :param limit: Maximum number of commits to import.
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
555
        :return: Tuple with pack hint, last imported revision id and remote refs
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
556
        """
557
        raise NotImplementedError(self.fetch_objects)
558
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
559
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
0.200.247 by Jelmer Vernooij
Fix git-import.
560
              mapping=None, fetch_spec=None):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
561
        if mapping is None:
562
            mapping = self.source.get_mapping()
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
563
        if revision_id is not None:
564
            interesting_heads = [revision_id]
565
        elif fetch_spec is not None:
0.200.1089 by Jelmer Vernooij
Cope with fancy fetch_spec behaviour.
566
            recipe = fetch_spec.get_recipe()
567
            if recipe[0] in ("search", "proxy-search"):
568
                interesting_heads = recipe[1]
569
            else:
0.200.1300 by Jelmer Vernooij
Fix formatting.
570
                raise AssertionError("Unsupported search result type %s" %
571
                        recipe[0])
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
572
        else:
573
            interesting_heads = None
0.259.4 by Jelmer Vernooij
Put determine_wants methods on InterRepo.
574
575
        if interesting_heads is not None:
0.200.1309 by Jelmer Vernooij
Break some more long lines.
576
            determine_wants = self.get_determine_wants_revids(
577
                interesting_heads, include_tags=False)
0.259.4 by Jelmer Vernooij
Put determine_wants methods on InterRepo.
578
        else:
579
            determine_wants = self.determine_wants_all
0.200.1079 by Jelmer Vernooij
Avoid looking up revid if not necessary.
580
581
        (pack_hint, _, remote_refs) = self.fetch_objects(determine_wants,
582
            mapping, pb)
0.200.579 by Jelmer Vernooij
Only pack if it makes the target repo smaller.
583
        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.
584
            self.target.pack(hint=pack_hint)
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
585
        assert isinstance(remote_refs, dict)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
586
        return remote_refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
587
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
588
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
589
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
590
def report_git_progress(pb, text):
591
    text = text.rstrip("\r\n")
592
    g = _GIT_PROGRESS_RE.match(text)
593
    if g is not None:
594
        (text, pct, current, total) = g.groups()
595
        pb.update(text, int(current), int(total))
596
    else:
597
        pb.update(text, 0, 0)
598
599
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
600
class DetermineWantsRecorder(object):
601
602
    def __init__(self, actual):
603
        self.actual = actual
604
        self.wants = []
605
        self.remote_refs = {}
606
607
    def __call__(self, refs):
608
        self.remote_refs = refs
609
        self.wants = self.actual(refs)
610
        return self.wants
611
612
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
613
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
614
    """InterRepository that copies revisions from a remote Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
615
    repository."""
616
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
617
    def get_target_heads(self):
618
        # FIXME: This should be more efficient
619
        all_revs = self.target.all_revision_ids()
620
        parent_map = self.target.get_parent_map(all_revs)
621
        all_parents = set()
622
        map(all_parents.update, parent_map.itervalues())
623
        return set(all_revs) - all_parents
624
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
625
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
626
        """See `InterGitNonGitRepository`."""
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
627
        def progress(text):
0.200.563 by Jelmer Vernooij
Attempt to parse progress indication from git status reports.
628
            report_git_progress(pb, text)
0.200.466 by Jelmer Vernooij
Fix finding of heads for fetch_objects.
629
        store = BazaarObjectStore(self.target, mapping)
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
630
        store.lock_write()
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
631
        try:
0.200.582 by Jelmer Vernooij
Use more efficient algorithm for finding out heads.
632
            heads = self.get_target_heads()
0.200.484 by Jelmer Vernooij
Cope with kind changes.
633
            graph_walker = store.get_graph_walker(
634
                    [store._lookup_revision_sha1(head) for head in heads])
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
635
            wants_recorder = DetermineWantsRecorder(determine_wants)
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
636
0.200.484 by Jelmer Vernooij
Cope with kind changes.
637
            create_pb = None
638
            if pb is None:
639
                create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
640
            try:
0.200.1000 by Jelmer Vernooij
Fix fetch between local and remote git branches.
641
                objects_iter = self.source.fetch_objects(
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
642
                    wants_recorder, graph_walker, store.get_raw,
0.200.1000 by Jelmer Vernooij
Fix fetch between local and remote git branches.
643
                    progress)
0.200.1300 by Jelmer Vernooij
Fix formatting.
644
                trace.mutter("Importing %d new revisions",
645
                             len(wants_recorder.wants))
646
                (pack_hint, last_rev) = import_git_objects(self.target,
647
                    mapping, objects_iter, store, wants_recorder.wants, pb,
648
                    limit)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
649
                return (pack_hint, last_rev, wants_recorder.remote_refs)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
650
            finally:
0.200.484 by Jelmer Vernooij
Cope with kind changes.
651
                if create_pb:
652
                    create_pb.finished()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
653
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
654
            store.unlock()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
655
656
    @staticmethod
657
    def is_compatible(source, target):
658
        """Be compatible with GitRepository."""
0.200.1222 by Jelmer Vernooij
Better checks in is_compatible methods.
659
        if not isinstance(source, RemoteGitRepository):
660
            return False
661
        if not target.supports_rich_root():
662
            return False
663
        if isinstance(target, GitRepository):
664
            return False
0.200.1270 by Jelmer Vernooij
Cope with older versions of bzr.
665
        if not getattr(target._format, "supports_full_versioned_files", True):
0.200.1222 by Jelmer Vernooij
Better checks in is_compatible methods.
666
            return False
667
        return True
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
668
669
670
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
671
    """InterRepository that copies revisions from a local Git into a non-Git
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
672
    repository."""
673
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
674
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
0.200.1001 by Jelmer Vernooij
Simplify handling of determine wants, add stub for fetch_objects().
675
        """See `InterGitNonGitRepository`."""
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
676
        remote_refs = self.source._git.get_refs()
677
        wants = determine_wants(remote_refs)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
678
        create_pb = None
679
        if pb is None:
680
            create_pb = pb = ui.ui_factory.nested_progress_bar()
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
681
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
682
        try:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
683
            target_git_object_retriever.lock_write()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
684
            try:
0.200.1300 by Jelmer Vernooij
Fix formatting.
685
                (pack_hint, last_rev) = import_git_objects(self.target,
686
                    mapping, self.source._git.object_store,
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
687
                    target_git_object_retriever, wants, pb, limit)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
688
                return (pack_hint, last_rev, remote_refs)
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
689
            finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
690
                target_git_object_retriever.unlock()
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
691
        finally:
692
            if create_pb:
693
                create_pb.finished()
694
695
    @staticmethod
696
    def is_compatible(source, target):
697
        """Be compatible with GitRepository."""
0.200.1222 by Jelmer Vernooij
Better checks in is_compatible methods.
698
        if not isinstance(source, LocalGitRepository):
699
            return False
700
        if not target.supports_rich_root():
701
            return False
702
        if isinstance(target, GitRepository):
703
            return False
0.200.1266 by Jelmer Vernooij
Fix 2.3 support.
704
        if not getattr(target._format, "supports_full_versioned_files", True):
0.200.1222 by Jelmer Vernooij
Better checks in is_compatible methods.
705
            return False
706
        return True
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
707
708
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
709
class InterGitGitRepository(InterGitRepository):
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
710
    """InterRepository that copies between Git repositories."""
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
711
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
712
    def fetch_objects(self, determine_wants, mapping, pb=None):
713
        def progress(text):
714
            trace.note("git: %s", text)
715
        graphwalker = self.target._git.get_graph_walker()
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
716
        if (isinstance(self.source, LocalGitRepository) and
717
            isinstance(self.target, LocalGitRepository)):
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
718
            refs = self.source._git.fetch(self.target._git, determine_wants,
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
719
                progress)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
720
            return (None, None, refs)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
721
        elif (isinstance(self.source, LocalGitRepository) and
722
              isinstance(self.target, RemoteGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
723
            raise NotImplementedError
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
724
        elif (isinstance(self.source, RemoteGitRepository) and
725
              isinstance(self.target, LocalGitRepository)):
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
726
            f, commit = self.target._git.object_store.add_thin_pack()
727
            try:
0.200.1003 by Jelmer Vernooij
Initial work on supporting move_in_thin_pack.
728
                refs = self.source.bzrdir.root_transport.fetch_pack(
729
                    determine_wants, graphwalker, f.write, progress)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
730
                commit()
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
731
                return (None, None, refs)
0.200.635 by Jelmer Vernooij
Fix fetching between git repositories.
732
            except:
733
                f.close()
734
                raise
735
        else:
736
            raise AssertionError
737
0.200.1154 by Jelmer Vernooij
Share more code in InterGitRepository.
738
    def _target_has_shas(self, shas):
739
        return set([sha for sha in shas if self.target._git.object_store])
740
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
741
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
742
              mapping=None, fetch_spec=None, branches=None):
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
743
        if mapping is None:
744
            mapping = self.source.get_mapping()
745
        r = self.target._git
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
746
        if revision_id is not None:
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
747
            args = [self.source.lookup_bzr_revision_id(revision_id)[0]]
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
748
        elif fetch_spec is not None:
0.200.1089 by Jelmer Vernooij
Cope with fancy fetch_spec behaviour.
749
            recipe = fetch_spec.get_recipe()
750
            if recipe[0] in ("search", "proxy-search"):
751
                heads = recipe[1]
752
            else:
0.200.1309 by Jelmer Vernooij
Break some more long lines.
753
                raise AssertionError(
754
                    "Unsupported search result type %s" % recipe[0])
755
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in
756
                    heads]
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
757
        if branches is not None:
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
758
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store and x[y] != ZERO_SHA]
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
759
        elif fetch_spec is None and revision_id is None:
0.200.1154 by Jelmer Vernooij
Share more code in InterGitRepository.
760
            determine_wants = self.determine_wants_all
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
761
        else:
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
762
            determine_wants = lambda x: [y for y in args if not y in r.object_store and y != ZERO_SHA]
763
        wants_recorder = DetermineWantsRecorder(determine_wants)
764
        self.fetch_objects(wants_recorder, mapping)
765
        return wants_recorder.remote_refs
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
766
767
    @staticmethod
768
    def is_compatible(source, target):
769
        """Be compatible with GitRepository."""
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
770
        return (isinstance(source, GitRepository) and
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
771
                isinstance(target, GitRepository))
0.200.1174 by Jelmer Vernooij
Fix specific revision fetching between git repositories.
772
773
    def get_determine_wants_revids(self, revids, include_tags=False):
774
        wants = set()
775
        for revid in set(revids):
776
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
777
            wants.add(git_sha)
0.200.1309 by Jelmer Vernooij
Break some more long lines.
778
        return self.get_determine_wants_heads(wants,
779
            include_tags=include_tags)