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