bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
1 |
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
|
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
0.200.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.540
by Jelmer Vernooij
Handle submodules explicitly. |
20 |
S_ISGITLINK, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
21 |
)
|
0.200.355
by Jelmer Vernooij
Allow paranoia checking with -Dverify. |
22 |
from dulwich.object_store import ( |
23 |
tree_lookup_path, |
|
24 |
)
|
|
0.200.563
by Jelmer Vernooij
Attempt to parse progress indication from git status reports. |
25 |
import re |
0.200.352
by Jelmer Vernooij
Simplify mode handling. |
26 |
import stat |
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
27 |
|
28 |
from bzrlib import ( |
|
0.231.2
by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet). |
29 |
debug, |
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. |
30 |
lru_cache, |
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
31 |
osutils, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
32 |
trace, |
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
33 |
ui, |
34 |
urlutils, |
|
35 |
)
|
|
36 |
from bzrlib.errors import ( |
|
0.239.5
by Jelmer Vernooij
Print user-understandable error message when encountering submodules. |
37 |
BzrError, |
0.200.372
by Jelmer Vernooij
Fix key when looking up old sha's in cache. |
38 |
NoSuchId, |
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
39 |
)
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
40 |
from bzrlib.inventory import ( |
41 |
Inventory, |
|
0.229.2
by Jelmer Vernooij
Initial work relying on inventory deltas. |
42 |
InventoryDirectory, |
43 |
InventoryFile, |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
44 |
InventoryLink, |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
45 |
TreeReference, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
46 |
)
|
47 |
from bzrlib.repository import ( |
|
48 |
InterRepository, |
|
49 |
)
|
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
50 |
from bzrlib.revision import ( |
51 |
NULL_REVISION, |
|
52 |
)
|
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
53 |
from bzrlib.tsort import ( |
54 |
topo_sort, |
|
55 |
)
|
|
0.200.417
by Jelmer Vernooij
use insert_record_stream rather than add_lines. |
56 |
from bzrlib.versionedfile import ( |
57 |
FulltextContentFactory, |
|
58 |
)
|
|
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
59 |
|
0.231.2
by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet). |
60 |
from bzrlib.plugins.git.mapping import ( |
0.200.345
by Jelmer Vernooij
Keep track of file modes to use. |
61 |
DEFAULT_FILE_MODE, |
0.200.355
by Jelmer Vernooij
Allow paranoia checking with -Dverify. |
62 |
inventory_to_tree_and_blobs, |
0.200.521
by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references. |
63 |
mode_is_executable, |
0.200.545
by Jelmer Vernooij
Squash revision data only if necessary. |
64 |
squash_revision, |
0.200.490
by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters. |
65 |
warn_unusual_mode, |
0.231.2
by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet). |
66 |
)
|
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
67 |
from bzrlib.plugins.git.object_store import ( |
68 |
BazaarObjectStore, |
|
69 |
)
|
|
0.200.426
by Jelmer Vernooij
Fix import of RemoteGitRepository. |
70 |
from bzrlib.plugins.git.remote import ( |
71 |
RemoteGitRepository, |
|
72 |
)
|
|
0.200.169
by Jelmer Vernooij
Fix branch cloning. |
73 |
from bzrlib.plugins.git.repository import ( |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
74 |
GitRepository, |
0.200.289
by Jelmer Vernooij
Cope with new member variables in RepositoryFormat. |
75 |
GitRepositoryFormat, |
0.200.426
by Jelmer Vernooij
Fix import of RemoteGitRepository. |
76 |
LocalGitRepository, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
77 |
)
|
0.216.4
by Jelmer Vernooij
Add basic pack fetch infrastructure. |
78 |
|
79 |
||
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. |
80 |
MAX_INV_CACHE_SIZE = 50 * 1024 * 1024 |
81 |
||
82 |
||
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
83 |
def import_git_blob(texts, mapping, path, hexsha, base_inv, base_inv_shamap, |
84 |
base_ie, parent_id, revision_id, parent_invs, lookup_object, |
|
85 |
executable, symlink): |
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
86 |
"""Import a git blob object into a bzr repository. |
87 |
||
0.200.261
by Jelmer Vernooij
More formatting fixes. |
88 |
:param texts: VersionedFiles to add to
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
89 |
:param path: Path in the tree
|
90 |
:param blob: A git blob
|
|
0.229.1
by Jelmer Vernooij
Start working with inventory deltas. |
91 |
:return: Inventory delta for this file
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
92 |
"""
|
93 |
file_id = mapping.generate_file_id(path) |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
94 |
if symlink: |
95 |
cls = InventoryLink |
|
96 |
else: |
|
97 |
cls = InventoryFile |
|
98 |
# We just have to hope this is indeed utf-8:
|
|
0.200.354
by Jelmer Vernooij
Support symlinks in conversion to git. |
99 |
ie = cls(file_id, urlutils.basename(path).decode("utf-8"), parent_id) |
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
100 |
ie.executable = executable |
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
101 |
# See if this has changed at all
|
0.200.571
by Jelmer Vernooij
Keep inventory entry children around once we've fetched them. |
102 |
if base_ie is None: |
0.200.372
by Jelmer Vernooij
Fix key when looking up old sha's in cache. |
103 |
base_sha = None |
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
104 |
else: |
0.200.373
by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again. |
105 |
try: |
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
106 |
base_sha = base_inv_shamap.lookup_blob(file_id, |
107 |
revision_hint=base_ie.revision) |
|
0.200.373
by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again. |
108 |
except KeyError: |
109 |
base_sha = None |
|
110 |
else: |
|
111 |
if (base_sha == hexsha and base_ie.executable == ie.executable |
|
112 |
and base_ie.kind == ie.kind): |
|
113 |
# If nothing has changed since the base revision, we're done
|
|
114 |
return [], [] |
|
0.200.484
by Jelmer Vernooij
Cope with kind changes. |
115 |
if base_sha == hexsha and base_ie.kind == ie.kind: |
0.200.373
by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again. |
116 |
ie.text_size = base_ie.text_size |
117 |
ie.text_sha1 = base_ie.text_sha1 |
|
118 |
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. |
119 |
if ie.executable == base_ie.executable: |
120 |
ie.revision = base_ie.revision |
|
121 |
else: |
|
122 |
blob = lookup_object(hexsha) |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
123 |
else: |
124 |
blob = lookup_object(hexsha) |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
125 |
if ie.kind == "symlink": |
0.200.551
by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets. |
126 |
ie.revision = None |
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
127 |
ie.symlink_target = blob.data |
128 |
ie.text_size = None |
|
129 |
ie.text_sha1 = None |
|
130 |
else: |
|
131 |
ie.text_size = len(blob.data) |
|
132 |
ie.text_sha1 = osutils.sha_string(blob.data) |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
133 |
# Check what revision we should store
|
0.200.283
by Jelmer Vernooij
Avoid storing repeated texts for blobs. |
134 |
parent_keys = [] |
135 |
for pinv in parent_invs: |
|
0.200.373
by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again. |
136 |
if pinv.revision_id == base_inv.revision_id: |
0.200.374
by Jelmer Vernooij
Also avoid lookups in the inventory in the tree fetch functions. |
137 |
pie = base_ie |
138 |
if pie is None: |
|
139 |
continue
|
|
140 |
else: |
|
141 |
try: |
|
142 |
pie = pinv[file_id] |
|
143 |
except NoSuchId: |
|
144 |
continue
|
|
0.200.551
by Jelmer Vernooij
Properly set InventoryEntry revision when changing symlink targets. |
145 |
if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target: |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
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.373
by Jelmer Vernooij
Re-use inventory entries rather than looking them up again and again. |
149 |
parent_keys.append((file_id, pie.revision)) |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
150 |
if ie.revision is None: |
151 |
# Need to store a new revision
|
|
152 |
ie.revision = revision_id |
|
153 |
assert file_id is not None |
|
154 |
assert ie.revision is not None |
|
0.200.698
by Jelmer Vernooij
Merge fixes for SHA1s of symlinks. |
155 |
if ie.kind == 'symlink': |
156 |
data = '' |
|
157 |
else: |
|
158 |
data = blob.data |
|
0.244.1
by INADA Naoki
Fix sha1s for symlinks. |
159 |
texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, data)]) |
0.200.771
by Jelmer Vernooij
Always set shamap. |
160 |
shamap = { ie.file_id: hexsha } |
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
161 |
invdelta = [] |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
162 |
if base_ie is not None: |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
163 |
old_path = base_inv.id2path(file_id) |
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
164 |
if base_ie.kind == "directory": |
165 |
invdelta.extend(remove_disappeared_children(old_path, base_ie.children, [])) |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
166 |
else: |
167 |
old_path = None |
|
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
168 |
invdelta.append((old_path, path, file_id, ie)) |
0.200.552
by Jelmer Vernooij
Cope with directories becoming symlinks. |
169 |
return (invdelta, shamap) |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
170 |
|
171 |
||
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
172 |
class SubmodulesRequireSubtrees(BzrError): |
0.200.666
by Jelmer Vernooij
Refuse to add tree references to non-subtree formats. |
173 |
_fmt = """The repository you are fetching from contains submodules. To continue, upgrade your Bazaar repository to a format that supports nested trees, such as 'development-subtree'.""" |
0.239.5
by Jelmer Vernooij
Print user-understandable error message when encountering submodules. |
174 |
internal = False |
175 |
||
176 |
||
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
177 |
def import_git_submodule(texts, mapping, path, hexsha, base_inv, base_ie, |
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
178 |
parent_id, revision_id, parent_invs, lookup_object): |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
179 |
file_id = mapping.generate_file_id(path) |
180 |
ie = TreeReference(file_id, urlutils.basename(path.decode("utf-8")), |
|
181 |
parent_id) |
|
182 |
ie.revision = revision_id |
|
183 |
if base_ie is None: |
|
184 |
oldpath = None |
|
185 |
else: |
|
186 |
oldpath = path |
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
187 |
if (base_ie.kind == ie.kind and |
188 |
base_ie.reference_revision == ie.reference_revision): |
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
189 |
ie.revision = base_ie.revision |
190 |
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha) |
|
191 |
texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), (), None, "")]) |
|
192 |
invdelta = [(oldpath, path, file_id, ie)] |
|
193 |
return invdelta, {}, {} |
|
0.200.540
by Jelmer Vernooij
Handle submodules explicitly. |
194 |
|
195 |
||
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
196 |
def remove_disappeared_children(path, base_children, existing_children): |
0.200.552
by Jelmer Vernooij
Cope with directories becoming symlinks. |
197 |
ret = [] |
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
198 |
deletable = [(osutils.pathjoin(path, k), v) for k,v in base_children.iteritems() if k not in existing_children] |
0.200.552
by Jelmer Vernooij
Cope with directories becoming symlinks. |
199 |
while deletable: |
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
200 |
(path, ie) = deletable.pop() |
201 |
ret.append((path, None, ie.file_id, None)) |
|
0.200.552
by Jelmer Vernooij
Cope with directories becoming symlinks. |
202 |
if ie.kind == "directory": |
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
203 |
for name, child_ie in ie.children.iteritems(): |
204 |
deletable.append((osutils.pathjoin(path, name), child_ie)) |
|
0.200.552
by Jelmer Vernooij
Cope with directories becoming symlinks. |
205 |
return ret |
206 |
||
207 |
||
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
208 |
def import_git_tree(texts, mapping, path, hexsha, base_inv, base_inv_shamap, |
209 |
base_ie, parent_id, revision_id, parent_invs, lookup_object, |
|
0.200.749
by Jelmer Vernooij
Avoid storing entries for trees in the cache, use blobs instead |
210 |
allow_submodules=False): |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
211 |
"""Import a git tree object into a bzr repository. |
212 |
||
0.200.261
by Jelmer Vernooij
More formatting fixes. |
213 |
:param texts: VersionedFiles object to add to
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
214 |
:param path: Path in the tree
|
215 |
:param tree: A git tree object
|
|
0.229.2
by Jelmer Vernooij
Initial work relying on inventory deltas. |
216 |
:param base_inv: Base inventory against which to return inventory delta
|
0.229.1
by Jelmer Vernooij
Start working with inventory deltas. |
217 |
:return: Inventory delta for this subtree
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
218 |
"""
|
0.200.344
by Jelmer Vernooij
Clarify names, use convenience function |
219 |
invdelta = [] |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
220 |
file_id = mapping.generate_file_id(path) |
0.200.297
by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..). |
221 |
# We just have to hope this is indeed utf-8:
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
222 |
ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")), |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
223 |
parent_id) |
0.200.571
by Jelmer Vernooij
Keep inventory entry children around once we've fetched them. |
224 |
if base_ie is None: |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
225 |
# Newly appeared here
|
226 |
ie.revision = revision_id |
|
0.200.577
by Jelmer Vernooij
Fix new directory handling. |
227 |
texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), (), None, "")]) |
0.200.344
by Jelmer Vernooij
Clarify names, use convenience function |
228 |
invdelta.append((None, path, file_id, ie)) |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
229 |
else: |
230 |
# See if this has changed at all
|
|
0.200.287
by Jelmer Vernooij
Skip tree sha's already in the git sha map. |
231 |
try: |
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
232 |
base_sha = base_inv_shamap.lookup_tree(file_id) |
0.200.752
by Jelmer Vernooij
Actually use shagitmap again to look up trees. |
233 |
except (KeyError, NotImplementedError): |
0.200.287
by Jelmer Vernooij
Skip tree sha's already in the git sha map. |
234 |
pass
|
0.200.346
by Jelmer Vernooij
Track unusual file modes. |
235 |
else: |
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
236 |
if base_sha == hexsha: |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
237 |
# If nothing has changed since the base revision, we're done
|
0.200.361
by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches. |
238 |
return [], {}, [] |
0.200.553
by Jelmer Vernooij
Support symlinks being turned into directories. |
239 |
if base_ie.kind != "directory": |
240 |
ie.revision = revision_id |
|
0.200.577
by Jelmer Vernooij
Fix new directory handling. |
241 |
texts.insert_record_stream([FulltextContentFactory((ie.file_id, ie.revision), (), None, "")]) |
0.200.555
by Jelmer Vernooij
Change kind when turning symlink into dir. |
242 |
invdelta.append((base_inv.id2path(ie.file_id), path, ie.file_id, ie)) |
0.200.571
by Jelmer Vernooij
Keep inventory entry children around once we've fetched them. |
243 |
if base_ie is not None and base_ie.kind == "directory": |
244 |
base_children = base_ie.children |
|
245 |
else: |
|
246 |
base_children = {} |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
247 |
# Remember for next time
|
0.200.300
by Jelmer Vernooij
Fix recursive deletion of dirs. |
248 |
existing_children = set() |
0.200.345
by Jelmer Vernooij
Keep track of file modes to use. |
249 |
child_modes = {} |
0.200.757
by Jelmer Vernooij
Use inventory deltas. |
250 |
shamap = {} |
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
251 |
tree = lookup_object(hexsha) |
0.200.363
by Jelmer Vernooij
Fix updates of sha map during fetch. |
252 |
for mode, name, child_hexsha in tree.entries(): |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
253 |
basename = name.decode("utf-8") |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
254 |
existing_children.add(basename) |
0.200.344
by Jelmer Vernooij
Clarify names, use convenience function |
255 |
child_path = osutils.pathjoin(path, name) |
0.200.352
by Jelmer Vernooij
Simplify mode handling. |
256 |
if stat.S_ISDIR(mode): |
0.200.555
by Jelmer Vernooij
Change kind when turning symlink into dir. |
257 |
subinvdelta, grandchildmodes, subshamap = import_git_tree( |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
258 |
texts, mapping, child_path, child_hexsha, base_inv, |
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
259 |
base_inv_shamap, base_children.get(basename), file_id, |
260 |
revision_id, parent_invs, lookup_object, |
|
0.200.666
by Jelmer Vernooij
Refuse to add tree references to non-subtree formats. |
261 |
allow_submodules=allow_submodules) |
0.200.540
by Jelmer Vernooij
Handle submodules explicitly. |
262 |
elif S_ISGITLINK(mode): # submodule |
0.200.666
by Jelmer Vernooij
Refuse to add tree references to non-subtree formats. |
263 |
if not allow_submodules: |
264 |
raise SubmodulesRequireSubtrees() |
|
0.200.540
by Jelmer Vernooij
Handle submodules explicitly. |
265 |
subinvdelta, grandchildmodes, subshamap = import_git_submodule( |
0.200.592
by Jelmer Vernooij
Avoid 'No such revision' error when encountering submodules. |
266 |
texts, mapping, child_path, child_hexsha, base_inv, base_children.get(basename), |
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
267 |
file_id, revision_id, parent_invs, lookup_object) |
0.200.352
by Jelmer Vernooij
Simplify mode handling. |
268 |
else: |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
269 |
subinvdelta, subshamap = import_git_blob(texts, mapping, |
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
270 |
child_path, child_hexsha, base_inv, base_inv_shamap, |
271 |
base_children.get(basename), file_id, |
|
272 |
revision_id, parent_invs, lookup_object, |
|
0.200.521
by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references. |
273 |
mode_is_executable(mode), stat.S_ISLNK(mode)) |
0.200.757
by Jelmer Vernooij
Use inventory deltas. |
274 |
grandchildmodes = {} |
275 |
child_modes.update(grandchildmodes) |
|
276 |
invdelta.extend(subinvdelta) |
|
277 |
shamap.update(subshamap) |
|
0.200.359
by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted. |
278 |
if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE, |
279 |
stat.S_IFLNK, DEFAULT_FILE_MODE|0111): |
|
0.200.352
by Jelmer Vernooij
Simplify mode handling. |
280 |
child_modes[child_path] = mode |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
281 |
# Remove any children that have disappeared
|
0.200.570
by Jelmer Vernooij
Simplify remove disappeared children function. |
282 |
if base_ie is not None and base_ie.kind == "directory": |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
283 |
invdelta.extend(remove_disappeared_children(base_inv.id2path(file_id), |
0.200.572
by Jelmer Vernooij
Avoid some extra path lookups. |
284 |
base_children, existing_children)) |
0.200.757
by Jelmer Vernooij
Use inventory deltas. |
285 |
shamap[file_id] = hexsha |
0.200.361
by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches. |
286 |
return invdelta, child_modes, shamap |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
287 |
|
288 |
||
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. |
289 |
def approx_inv_size(inv): |
290 |
# Very rough estimate, 1k per inventory entry
|
|
291 |
return len(inv) * 1024 |
|
292 |
||
293 |
||
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
294 |
def import_git_commit(repo, mapping, head, lookup_object, |
0.200.752
by Jelmer Vernooij
Actually use shagitmap again to look up trees. |
295 |
target_git_object_retriever, parent_invs_cache): |
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
296 |
o = lookup_object(head) |
297 |
rev = mapping.import_commit(o) |
|
298 |
# We have to do this here, since we have to walk the tree and
|
|
299 |
# we need to make sure to import the blobs / trees with the right
|
|
300 |
# path; this may involve adding them more than once.
|
|
301 |
parent_invs = [] |
|
302 |
for parent_id in rev.parent_ids: |
|
303 |
try: |
|
304 |
parent_invs.append(parent_invs_cache[parent_id]) |
|
305 |
except KeyError: |
|
306 |
parent_inv = repo.get_inventory(parent_id) |
|
307 |
parent_invs.append(parent_inv) |
|
308 |
parent_invs_cache[parent_id] = parent_inv |
|
309 |
if parent_invs == []: |
|
310 |
base_inv = Inventory(root_id=None) |
|
311 |
base_ie = None |
|
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
312 |
base_inv_shamap = None # Should never be accessed |
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
313 |
else: |
314 |
base_inv = parent_invs[0] |
|
315 |
base_ie = base_inv.root |
|
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
316 |
base_inv_shamap = target_git_object_retriever._idmap.get_inventory_sha_map(base_inv.revision_id) |
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
317 |
inv_delta, unusual_modes, shamap = import_git_tree(repo.texts, |
0.200.753
by Jelmer Vernooij
Move lookup_tree/lookup_blob to a separate object. |
318 |
mapping, "", o.tree, base_inv, base_inv_shamap, base_ie, None, |
319 |
rev.revision_id, parent_invs, lookup_object, |
|
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
320 |
allow_submodules=getattr(repo._format, "supports_tree_reference", False)) |
0.200.759
by Jelmer Vernooij
Prepare for using add_entries everywhere. |
321 |
entries = [] |
322 |
for (oldpath, newpath, fileid, new_ie) in inv_delta: |
|
323 |
if newpath is None: |
|
324 |
entries.append((fileid, None, None, None)) |
|
325 |
else: |
|
326 |
if new_ie.kind in ("file", "symlink"): |
|
327 |
entries.append((fileid, "blob", shamap[fileid], new_ie.revision)) |
|
328 |
elif new_ie.kind == "directory": |
|
329 |
entries.append((fileid, "tree", shamap[fileid], rev.revision_id)) |
|
330 |
else: |
|
331 |
raise AssertionError |
|
0.200.755
by Jelmer Vernooij
Add parent revids argument to add_entries. |
332 |
target_git_object_retriever._idmap.add_entries(rev.revision_id, |
0.200.759
by Jelmer Vernooij
Prepare for using add_entries everywhere. |
333 |
rev.parent_ids, head, o.tree, entries) |
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
334 |
if unusual_modes != {}: |
335 |
for path, mode in unusual_modes.iteritems(): |
|
336 |
warn_unusual_mode(rev.foreign_revid, path, mode) |
|
337 |
mapping.import_unusual_file_modes(rev, unusual_modes) |
|
338 |
try: |
|
339 |
basis_id = rev.parent_ids[0] |
|
340 |
except IndexError: |
|
341 |
basis_id = NULL_REVISION |
|
342 |
base_inv = None |
|
343 |
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id, |
|
344 |
inv_delta, rev.revision_id, rev.parent_ids, |
|
345 |
base_inv) |
|
346 |
parent_invs_cache[rev.revision_id] = inv |
|
347 |
repo.add_revision(rev.revision_id, rev) |
|
348 |
if "verify" in debug.debug_flags: |
|
349 |
new_unusual_modes = mapping.export_unusual_file_modes(rev) |
|
350 |
if new_unusual_modes != unusual_modes: |
|
351 |
raise AssertionError("unusual modes don't match: %r != %r" % (unusual_modes, new_unusual_modes)) |
|
352 |
objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping, unusual_modes) |
|
0.200.739
by Jelmer Vernooij
Fix -Dverify |
353 |
for newsha1, newobj, path in objs: |
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
354 |
assert path is not None |
0.200.739
by Jelmer Vernooij
Fix -Dverify |
355 |
if path == "": |
356 |
oldsha1 = o.tree |
|
357 |
else: |
|
358 |
(oldmode, oldsha1) = tree_lookup_path(lookup_object, o.tree, path) |
|
359 |
if oldsha1 != newsha1: |
|
360 |
raise AssertionError("%r != %r in %s" % (oldsha1, newsha1, path)) |
|
0.200.679
by Jelmer Vernooij
Moving commit import functionality to a separate function. |
361 |
|
362 |
||
0.248.5
by Jelmer Vernooij
Reformatting, fix dpush. |
363 |
def import_git_objects(repo, mapping, object_iter, |
364 |
target_git_object_retriever, heads, pb=None, limit=None): |
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
365 |
"""Import a set of git objects into a bzr repository. |
366 |
||
0.200.483
by Jelmer Vernooij
Add NEWS entry about sha map. |
367 |
:param repo: Target Bazaar repository
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
368 |
:param mapping: Mapping to use
|
369 |
:param object_iter: Iterator over Git objects.
|
|
0.248.5
by Jelmer Vernooij
Reformatting, fix dpush. |
370 |
:return: Tuple with pack hints and last imported revision id
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
371 |
"""
|
0.200.469
by Jelmer Vernooij
Fix fetch when revisions are already present locally, just only mapped. |
372 |
def lookup_object(sha): |
373 |
try: |
|
374 |
return object_iter[sha] |
|
375 |
except KeyError: |
|
376 |
return target_git_object_retriever[sha] |
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
377 |
# TODO: a more (memory-)efficient implementation of this
|
0.200.158
by Jelmer Vernooij
fetch works \o/ |
378 |
graph = [] |
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
379 |
checked = set() |
0.200.734
by Jelmer Vernooij
Don't import head revision twice when pulling from Git. |
380 |
heads = list(set(heads)) |
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. |
381 |
parent_invs_cache = lru_cache.LRUSizeCache(compute_size=approx_inv_size, |
382 |
max_size=MAX_INV_CACHE_SIZE) |
|
0.200.735
by Jelmer Vernooij
Use convenience functions for start/stop write groups. |
383 |
target_git_object_retriever.start_write_group() # FIXME: try/finally |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
384 |
# Find and convert commit objects
|
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
385 |
while heads: |
386 |
if pb is not None: |
|
387 |
pb.update("finding revisions to fetch", len(graph), None) |
|
388 |
head = heads.pop() |
|
389 |
assert isinstance(head, str) |
|
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
390 |
try: |
0.248.5
by Jelmer Vernooij
Reformatting, fix dpush. |
391 |
o = lookup_object(head) |
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
392 |
except KeyError: |
393 |
continue
|
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
394 |
if isinstance(o, Commit): |
395 |
rev = mapping.import_commit(o) |
|
0.200.295
by Jelmer Vernooij
Don't re-import revisions already fetched. |
396 |
if repo.has_revision(rev.revision_id): |
397 |
continue
|
|
0.200.545
by Jelmer Vernooij
Squash revision data only if necessary. |
398 |
squash_revision(repo, rev) |
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. |
399 |
graph.append((o.id, o.parents)) |
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
400 |
heads.extend([p for p in o.parents if p not in checked]) |
0.200.303
by Jelmer Vernooij
Cope with tags during fetch. |
401 |
elif isinstance(o, Tag): |
0.200.734
by Jelmer Vernooij
Don't import head revision twice when pulling from Git. |
402 |
if o.object[1] not in checked: |
403 |
heads.append(o.object[1]) |
|
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
404 |
else: |
405 |
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. |
406 |
checked.add(o.id) |
407 |
del checked |
|
0.200.158
by Jelmer Vernooij
fetch works \o/ |
408 |
# Order the revisions
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
409 |
# Create the inventory objects
|
0.200.680
by Jelmer Vernooij
fetch revisions in batches |
410 |
batch_size = 100 |
411 |
revision_ids = topo_sort(graph) |
|
412 |
pack_hints = [] |
|
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
413 |
if limit is not None: |
414 |
revision_ids = revision_ids[:limit] |
|
0.247.3
by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure |
415 |
last_imported = None |
0.200.680
by Jelmer Vernooij
fetch revisions in batches |
416 |
for offset in range(0, len(revision_ids), batch_size): |
417 |
repo.start_write_group() |
|
418 |
try: |
|
419 |
for i, head in enumerate(revision_ids[offset:offset+batch_size]): |
|
420 |
if pb is not None: |
|
421 |
pb.update("fetching revisions", offset+i, len(revision_ids)) |
|
422 |
import_git_commit(repo, mapping, head, lookup_object, |
|
423 |
target_git_object_retriever, |
|
0.200.752
by Jelmer Vernooij
Actually use shagitmap again to look up trees. |
424 |
parent_invs_cache) |
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
425 |
last_imported = head |
0.200.680
by Jelmer Vernooij
fetch revisions in batches |
426 |
except: |
427 |
repo.abort_write_group() |
|
428 |
raise
|
|
429 |
else: |
|
0.200.681
by Jelmer Vernooij
Cope with None. |
430 |
hint = repo.commit_write_group() |
431 |
if hint is not None: |
|
432 |
pack_hints.extend(hint) |
|
0.200.735
by Jelmer Vernooij
Use convenience functions for start/stop write groups. |
433 |
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 |
434 |
return pack_hints, last_imported |
0.200.141
by Jelmer Vernooij
Separate out local and remote fetching. |
435 |
|
436 |
||
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
437 |
class InterGitRepository(InterRepository): |
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
438 |
|
0.200.289
by Jelmer Vernooij
Cope with new member variables in RepositoryFormat. |
439 |
_matching_repo_format = GitRepositoryFormat() |
0.200.143
by Jelmer Vernooij
Reoncile InterGitRepository objects. |
440 |
|
441 |
@staticmethod
|
|
442 |
def _get_repo_format_to_test(): |
|
443 |
return None |
|
444 |
||
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
445 |
def copy_content(self, revision_id=None, pb=None): |
446 |
"""See InterRepository.copy_content.""" |
|
447 |
self.fetch(revision_id, pb, find_ghosts=False) |
|
448 |
||
0.248.5
by Jelmer Vernooij
Reformatting, fix dpush. |
449 |
def fetch(self, revision_id=None, pb=None, find_ghosts=False, |
450 |
mapping=None, fetch_spec=None): |
|
451 |
self.fetch_refs(revision_id=revision_id, pb=pb, |
|
452 |
find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec) |
|
0.200.247
by Jelmer Vernooij
Fix git-import. |
453 |
|
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
454 |
|
455 |
class InterGitNonGitRepository(InterGitRepository): |
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
456 |
"""Base InterRepository that copies revisions from a Git into a non-Git |
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
457 |
repository."""
|
458 |
||
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
459 |
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False, |
0.200.247
by Jelmer Vernooij
Fix git-import. |
460 |
mapping=None, fetch_spec=None): |
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
461 |
if mapping is None: |
462 |
mapping = self.source.get_mapping() |
|
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
463 |
if revision_id is not None: |
464 |
interesting_heads = [revision_id] |
|
465 |
elif fetch_spec is not None: |
|
466 |
interesting_heads = fetch_spec.heads |
|
467 |
else: |
|
468 |
interesting_heads = None |
|
0.200.247
by Jelmer Vernooij
Fix git-import. |
469 |
self._refs = {} |
470 |
def determine_wants(refs): |
|
471 |
self._refs = refs |
|
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
472 |
if interesting_heads is None: |
0.200.247
by Jelmer Vernooij
Fix git-import. |
473 |
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")] |
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
474 |
else: |
0.200.465
by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions. |
475 |
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)] |
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
476 |
return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))] |
0.248.5
by Jelmer Vernooij
Reformatting, fix dpush. |
477 |
(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb) |
0.200.579
by Jelmer Vernooij
Only pack if it makes the target repo smaller. |
478 |
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. |
479 |
self.target.pack(hint=pack_hint) |
0.200.590
by Jelmer Vernooij
Add check to make sure that the requested heads were actually fetched. |
480 |
if interesting_heads is not None: |
481 |
present_interesting_heads = self.target.has_revisions(interesting_heads) |
|
482 |
missing_interesting_heads = set(interesting_heads) - present_interesting_heads |
|
483 |
if missing_interesting_heads: |
|
484 |
raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads) |
|
0.200.247
by Jelmer Vernooij
Fix git-import. |
485 |
return self._refs |
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
486 |
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
487 |
|
0.200.563
by Jelmer Vernooij
Attempt to parse progress indication from git status reports. |
488 |
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)") |
489 |
def report_git_progress(pb, text): |
|
490 |
text = text.rstrip("\r\n") |
|
491 |
g = _GIT_PROGRESS_RE.match(text) |
|
492 |
if g is not None: |
|
493 |
(text, pct, current, total) = g.groups() |
|
494 |
pb.update(text, int(current), int(total)) |
|
495 |
else: |
|
496 |
pb.update(text, 0, 0) |
|
497 |
||
498 |
||
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
499 |
class InterRemoteGitNonGitRepository(InterGitNonGitRepository): |
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
500 |
"""InterRepository that copies revisions from a remote Git into a non-Git |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
501 |
repository."""
|
502 |
||
0.200.582
by Jelmer Vernooij
Use more efficient algorithm for finding out heads. |
503 |
def get_target_heads(self): |
504 |
# FIXME: This should be more efficient
|
|
505 |
all_revs = self.target.all_revision_ids() |
|
506 |
parent_map = self.target.get_parent_map(all_revs) |
|
507 |
all_parents = set() |
|
508 |
map(all_parents.update, parent_map.itervalues()) |
|
509 |
return set(all_revs) - all_parents |
|
510 |
||
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
511 |
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None): |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
512 |
def progress(text): |
0.200.563
by Jelmer Vernooij
Attempt to parse progress indication from git status reports. |
513 |
report_git_progress(pb, text) |
0.200.466
by Jelmer Vernooij
Fix finding of heads for fetch_objects. |
514 |
store = BazaarObjectStore(self.target, mapping) |
0.200.484
by Jelmer Vernooij
Cope with kind changes. |
515 |
self.target.lock_write() |
0.200.465
by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions. |
516 |
try: |
0.200.582
by Jelmer Vernooij
Use more efficient algorithm for finding out heads. |
517 |
heads = self.get_target_heads() |
0.200.484
by Jelmer Vernooij
Cope with kind changes. |
518 |
graph_walker = store.get_graph_walker( |
519 |
[store._lookup_revision_sha1(head) for head in heads]) |
|
520 |
recorded_wants = [] |
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
521 |
|
0.200.484
by Jelmer Vernooij
Cope with kind changes. |
522 |
def record_determine_wants(heads): |
523 |
wants = determine_wants(heads) |
|
524 |
recorded_wants.extend(wants) |
|
525 |
return wants |
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
526 |
|
0.200.484
by Jelmer Vernooij
Cope with kind changes. |
527 |
create_pb = None |
528 |
if pb is None: |
|
529 |
create_pb = pb = ui.ui_factory.nested_progress_bar() |
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
530 |
try: |
0.200.680
by Jelmer Vernooij
fetch revisions in batches |
531 |
objects_iter = self.source.fetch_objects( |
532 |
record_determine_wants, graph_walker, |
|
533 |
store.get_raw, progress) |
|
534 |
return import_git_objects(self.target, mapping, |
|
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
535 |
objects_iter, store, recorded_wants, pb, limit) |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
536 |
finally: |
0.200.484
by Jelmer Vernooij
Cope with kind changes. |
537 |
if create_pb: |
538 |
create_pb.finished() |
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
539 |
finally: |
0.200.484
by Jelmer Vernooij
Cope with kind changes. |
540 |
self.target.unlock() |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
541 |
|
542 |
@staticmethod
|
|
543 |
def is_compatible(source, target): |
|
544 |
"""Be compatible with GitRepository.""" |
|
545 |
# FIXME: Also check target uses VersionedFile
|
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
546 |
return (isinstance(source, RemoteGitRepository) and |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
547 |
target.supports_rich_root() and |
548 |
not isinstance(target, GitRepository)) |
|
549 |
||
550 |
||
551 |
class InterLocalGitNonGitRepository(InterGitNonGitRepository): |
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
552 |
"""InterRepository that copies revisions from a local Git into a non-Git |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
553 |
repository."""
|
554 |
||
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
555 |
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None): |
0.248.5
by Jelmer Vernooij
Reformatting, fix dpush. |
556 |
"""Fetch objects. |
557 |
"""
|
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
558 |
wants = determine_wants(self.source._git.get_refs()) |
559 |
create_pb = None |
|
560 |
if pb is None: |
|
561 |
create_pb = pb = ui.ui_factory.nested_progress_bar() |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
562 |
target_git_object_retriever = BazaarObjectStore(self.target, mapping) |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
563 |
try: |
564 |
self.target.lock_write() |
|
565 |
try: |
|
0.200.680
by Jelmer Vernooij
fetch revisions in batches |
566 |
return import_git_objects(self.target, mapping, |
0.248.5
by Jelmer Vernooij
Reformatting, fix dpush. |
567 |
self.source._git.object_store, |
568 |
target_git_object_retriever, wants, pb, limit) |
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
569 |
finally: |
570 |
self.target.unlock() |
|
571 |
finally: |
|
572 |
if create_pb: |
|
573 |
create_pb.finished() |
|
574 |
||
575 |
@staticmethod
|
|
576 |
def is_compatible(source, target): |
|
577 |
"""Be compatible with GitRepository.""" |
|
578 |
# FIXME: Also check target uses VersionedFile
|
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
579 |
return (isinstance(source, LocalGitRepository) and |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
580 |
target.supports_rich_root() and |
581 |
not isinstance(target, GitRepository)) |
|
582 |
||
583 |
||
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
584 |
class InterGitGitRepository(InterGitRepository): |
0.200.291
by Jelmer Vernooij
Print proper error about not supporting push. |
585 |
"""InterRepository that copies between Git repositories.""" |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
586 |
|
0.200.635
by Jelmer Vernooij
Fix fetching between git repositories. |
587 |
def fetch_objects(self, determine_wants, mapping, pb=None): |
588 |
def progress(text): |
|
589 |
trace.note("git: %s", text) |
|
590 |
graphwalker = self.target._git.get_graph_walker() |
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
591 |
if (isinstance(self.source, LocalGitRepository) and |
592 |
isinstance(self.target, LocalGitRepository)): |
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
593 |
return self.source._git.fetch(self.target._git, determine_wants, |
0.200.635
by Jelmer Vernooij
Fix fetching between git repositories. |
594 |
progress) |
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
595 |
elif (isinstance(self.source, LocalGitRepository) and |
596 |
isinstance(self.target, RemoteGitRepository)): |
|
0.200.635
by Jelmer Vernooij
Fix fetching between git repositories. |
597 |
raise NotImplementedError |
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
598 |
elif (isinstance(self.source, RemoteGitRepository) and |
599 |
isinstance(self.target, LocalGitRepository)): |
|
0.200.635
by Jelmer Vernooij
Fix fetching between git repositories. |
600 |
f, commit = self.target._git.object_store.add_thin_pack() |
601 |
try: |
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
602 |
refs = self.source._git.fetch_pack(determine_wants, |
603 |
graphwalker, f.write, progress) |
|
0.200.635
by Jelmer Vernooij
Fix fetching between git repositories. |
604 |
commit() |
605 |
return refs |
|
606 |
except: |
|
607 |
f.close() |
|
608 |
raise
|
|
609 |
else: |
|
610 |
raise AssertionError |
|
611 |
||
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
612 |
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False, |
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
613 |
mapping=None, fetch_spec=None, branches=None): |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
614 |
if mapping is None: |
615 |
mapping = self.source.get_mapping() |
|
616 |
r = self.target._git |
|
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
617 |
if revision_id is not None: |
0.200.195
by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface. |
618 |
args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]] |
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
619 |
elif fetch_spec is not None: |
620 |
args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads] |
|
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
621 |
if branches is not None: |
622 |
determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store] |
|
623 |
elif fetch_spec is None and revision_id is None: |
|
0.200.247
by Jelmer Vernooij
Fix git-import. |
624 |
determine_wants = r.object_store.determine_wants_all |
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
625 |
else: |
0.200.247
by Jelmer Vernooij
Fix git-import. |
626 |
determine_wants = lambda x: [y for y in args if not y in r.object_store] |
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
627 |
return self.fetch_objects(determine_wants, mapping)[0] |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
628 |
|
629 |
||
630 |
@staticmethod
|
|
631 |
def is_compatible(source, target): |
|
632 |
"""Be compatible with GitRepository.""" |
|
0.200.664
by Jelmer Vernooij
Support submodules during fetch. |
633 |
return (isinstance(source, GitRepository) and |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
634 |
isinstance(target, GitRepository)) |