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