1
# Copyright (C) 2008-2010 Jelmer Vernooij <jelmer@samba.org>
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.
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.
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
17
from dulwich.objects import (
24
from dulwich.object_store import (
27
from itertools import (
40
from bzrlib.errors import (
44
from bzrlib.inventory import (
51
from bzrlib.repository import (
54
from bzrlib.revision import (
58
from bzrlib.revisiontree import InventoryRevisionTree
59
except ImportError: # bzr < 2.4
60
from bzrlib.revisiontree import RevisionTree as InventoryRevisionTree
61
from bzrlib.testament import (
64
from bzrlib.tsort import (
67
from bzrlib.versionedfile import (
68
ChunkedContentFactory,
71
from bzrlib.plugins.git.mapping import (
77
from bzrlib.plugins.git.object_store import (
82
from bzrlib.plugins.git.refs import extract_tags
83
from bzrlib.plugins.git.remote import (
86
from bzrlib.plugins.git.repository import (
93
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha),
94
base_inv, parent_id, revision_id,
95
parent_invs, lookup_object, (base_mode, mode), store_updater,
97
"""Import a git blob object into a bzr repository.
99
:param texts: VersionedFiles to add to
100
:param path: Path in the tree
101
:param blob: A git blob
102
:return: Inventory delta for this file
104
if mapping.is_control_file(path):
106
if base_hexsha == hexsha and base_mode == mode:
107
# If nothing has changed since the base revision, we're done
109
file_id = lookup_file_id(path)
110
if stat.S_ISLNK(mode):
114
ie = cls(file_id, name.decode("utf-8"), parent_id)
115
if ie.kind == "file":
116
ie.executable = mode_is_executable(mode)
117
if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
118
base_ie = base_inv[base_inv.path2id(path)]
119
ie.text_size = base_ie.text_size
120
ie.text_sha1 = base_ie.text_sha1
121
if ie.kind == "symlink":
122
ie.symlink_target = base_ie.symlink_target
123
if ie.executable == base_ie.executable:
124
ie.revision = base_ie.revision
126
blob = lookup_object(hexsha)
128
blob = lookup_object(hexsha)
129
if ie.kind == "symlink":
131
ie.symlink_target = blob.data
133
ie.text_size = sum(imap(len, blob.chunked))
134
ie.text_sha1 = osutils.sha_strings(blob.chunked)
135
# Check what revision we should store
137
for pinv in parent_invs:
142
if (pie.text_sha1 == ie.text_sha1 and
143
pie.executable == ie.executable and
144
pie.symlink_target == ie.symlink_target):
145
# found a revision in one of the parents to use
146
ie.revision = pie.revision
148
parent_key = (file_id, pie.revision)
149
if not parent_key in parent_keys:
150
parent_keys.append(parent_key)
151
if ie.revision is None:
152
# Need to store a new revision
153
ie.revision = revision_id
154
assert ie.revision is not None
155
if ie.kind == 'symlink':
158
chunks = blob.chunked
159
texts.insert_record_stream([
160
ChunkedContentFactory((file_id, ie.revision),
161
tuple(parent_keys), ie.text_sha1, chunks)])
163
if base_hexsha is not None:
164
old_path = path.decode("utf-8") # Renames are not supported yet
165
if stat.S_ISDIR(base_mode):
166
invdelta.extend(remove_disappeared_children(base_inv, old_path,
167
lookup_object(base_hexsha), [], lookup_object))
170
new_path = path.decode("utf-8")
171
invdelta.append((old_path, new_path, file_id, ie))
172
if base_hexsha != hexsha:
173
store_updater.add_object(blob, ie, path)
177
class SubmodulesRequireSubtrees(BzrError):
178
_fmt = ("The repository you are fetching from contains submodules. "
179
"To continue, upgrade your Bazaar repository to a format that "
180
"supports nested trees, such as 'development-subtree'.")
184
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
185
base_inv, parent_id, revision_id, parent_invs, lookup_object,
186
(base_mode, mode), store_updater, lookup_file_id):
187
"""Import a git submodule."""
188
if base_hexsha == hexsha and base_mode == mode:
190
file_id = lookup_file_id(path)
191
ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
192
ie.revision = revision_id
193
if base_hexsha is None:
197
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
198
texts.insert_record_stream([
199
ChunkedContentFactory((file_id, ie.revision), (), None, [])])
200
invdelta = [(oldpath, path, file_id, ie)]
204
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
206
"""Generate an inventory delta for removed children.
208
:param base_inv: Base inventory against which to generate the
210
:param path: Path to process (unicode)
211
:param base_tree: Git Tree base object
212
:param existing_children: Children that still exist
213
:param lookup_object: Lookup a git object by its SHA1
214
:return: Inventory delta, as list
216
assert type(path) is unicode
218
for name, mode, hexsha in base_tree.iteritems():
219
if name in existing_children:
221
c_path = posixpath.join(path, name.decode("utf-8"))
222
file_id = base_inv.path2id(c_path)
223
assert file_id is not None
224
ret.append((c_path, None, file_id, None))
225
if stat.S_ISDIR(mode):
226
ret.extend(remove_disappeared_children(
227
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
231
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
232
base_inv, parent_id, revision_id, parent_invs,
233
lookup_object, (base_mode, mode), store_updater,
234
lookup_file_id, allow_submodules=False):
235
"""Import a git tree object into a bzr repository.
237
:param texts: VersionedFiles object to add to
238
:param path: Path in the tree (str)
239
:param name: Name of the tree (str)
240
:param tree: A git tree object
241
:param base_inv: Base inventory against which to return inventory delta
242
:return: Inventory delta for this subtree
244
assert type(path) is str
245
assert type(name) is str
246
if base_hexsha == hexsha and base_mode == mode:
247
# If nothing has changed since the base revision, we're done
250
file_id = lookup_file_id(path)
251
# We just have to hope this is indeed utf-8:
252
ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
253
tree = lookup_object(hexsha)
254
if base_hexsha is None:
256
old_path = None # Newly appeared here
258
base_tree = lookup_object(base_hexsha)
259
old_path = path.decode("utf-8") # Renames aren't supported yet
260
new_path = path.decode("utf-8")
261
if base_tree is None or type(base_tree) is not Tree:
262
ie.revision = revision_id
263
invdelta.append((old_path, new_path, ie.file_id, ie))
264
texts.insert_record_stream([
265
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
266
# Remember for next time
267
existing_children = set()
269
for name, child_mode, child_hexsha in tree.iteritems():
270
existing_children.add(name)
271
child_path = posixpath.join(path, name)
272
if type(base_tree) is Tree:
274
child_base_mode, child_base_hexsha = base_tree[name]
276
child_base_hexsha = None
279
child_base_hexsha = None
281
if stat.S_ISDIR(child_mode):
282
subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
283
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
284
file_id, revision_id, parent_invs, lookup_object,
285
(child_base_mode, child_mode), store_updater, lookup_file_id,
286
allow_submodules=allow_submodules)
287
elif S_ISGITLINK(child_mode): # submodule
288
if not allow_submodules:
289
raise SubmodulesRequireSubtrees()
290
subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
291
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
292
file_id, revision_id, parent_invs, lookup_object,
293
(child_base_mode, child_mode), store_updater, lookup_file_id)
295
if not mapping.is_special_file(name):
296
subinvdelta = import_git_blob(texts, mapping, child_path, name,
297
(child_base_hexsha, child_hexsha), base_inv, file_id,
298
revision_id, parent_invs, lookup_object,
299
(child_base_mode, child_mode), store_updater, lookup_file_id)
303
child_modes.update(grandchildmodes)
304
invdelta.extend(subinvdelta)
305
if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
306
stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
307
child_modes[child_path] = child_mode
308
# Remove any children that have disappeared
309
if base_tree is not None and type(base_tree) is Tree:
310
invdelta.extend(remove_disappeared_children(base_inv, old_path,
311
base_tree, existing_children, lookup_object))
312
store_updater.add_object(tree, ie, path)
313
return invdelta, child_modes
316
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
317
o, rev, ret_tree, parent_trees, mapping, unusual_modes, verifiers):
318
new_unusual_modes = mapping.export_unusual_file_modes(rev)
319
if new_unusual_modes != unusual_modes:
320
raise AssertionError("unusual modes don't match: %r != %r" % (
321
unusual_modes, new_unusual_modes))
322
# Verify that we can reconstruct the commit properly
323
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
326
raise AssertionError("Reconstructed commit differs: %r != %r" % (
330
for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
331
target_git_object_retriever._cache.idmap, unusual_modes,
332
mapping.BZR_DUMMY_FILE):
333
old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
335
if obj.id != old_obj_id:
336
diff.append((path, lookup_object(old_obj_id), obj))
337
for (path, old_obj, new_obj) in diff:
338
while (old_obj.type_name == "tree" and
339
new_obj.type_name == "tree" and
340
sorted(old_obj) == sorted(new_obj)):
342
if old_obj[name][0] != new_obj[name][0]:
343
raise AssertionError("Modes for %s differ: %o != %o" %
344
(path, old_obj[name][0], new_obj[name][0]))
345
if old_obj[name][1] != new_obj[name][1]:
346
# Found a differing child, delve deeper
347
path = posixpath.join(path, name)
348
old_obj = lookup_object(old_obj[name][1])
349
new_obj = new_objs[path]
351
raise AssertionError("objects differ for %s: %r != %r" % (path,
355
def import_git_commit(repo, mapping, head, lookup_object,
356
target_git_object_retriever, trees_cache):
357
o = lookup_object(head)
358
# Note that this uses mapping.revision_id_foreign_to_bzr. If the parents
359
# were bzr roundtripped revisions they would be specified in the
361
rev, roundtrip_revid, verifiers = mapping.import_commit(
362
o, mapping.revision_id_foreign_to_bzr)
363
# We have to do this here, since we have to walk the tree and
364
# we need to make sure to import the blobs / trees with the right
365
# path; this may involve adding them more than once.
366
parent_trees = trees_cache.revision_trees(rev.parent_ids)
367
if parent_trees == []:
368
base_inv = Inventory(root_id=None)
372
base_inv = parent_trees[0].inventory
373
base_tree = lookup_object(o.parents[0]).tree
374
base_mode = stat.S_IFDIR
375
store_updater = target_git_object_retriever._get_updater(rev)
376
tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
377
inv_delta, unusual_modes = import_git_tree(repo.texts,
378
mapping, "", "", (base_tree, o.tree), base_inv,
379
None, rev.revision_id, [p.inventory for p in parent_trees],
380
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
381
tree_supplement.lookup_file_id,
382
allow_submodules=getattr(repo._format, "supports_tree_reference",
384
if unusual_modes != {}:
385
for path, mode in unusual_modes.iteritems():
386
warn_unusual_mode(rev.foreign_revid, path, mode)
387
mapping.import_unusual_file_modes(rev, unusual_modes)
389
basis_id = rev.parent_ids[0]
391
basis_id = NULL_REVISION
393
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
394
inv_delta, rev.revision_id, rev.parent_ids, base_inv)
395
ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
396
if roundtrip_revid is not None:
397
original_revid = rev.revision_id
398
rev.revision_id = roundtrip_revid
401
if getattr(StrictTestament3, "from_revision_tree", None):
402
testament = StrictTestament3(rev, ret_tree)
404
testament = StrictTestament3(rev, inv)
405
calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
406
if calculated_verifiers != verifiers:
407
trace.mutter("Testament SHA1 %r for %r did not match %r.",
408
calculated_verifiers["testament3-sha1"],
409
rev.revision_id, verifiers["testament3-sha1"])
410
rev.revision_id = original_revid
412
calculated_verifiers = {}
414
calculated_verifiers = {}
415
store_updater.add_object(o, calculated_verifiers, None)
416
store_updater.finish()
417
trees_cache.add(ret_tree)
418
repo.add_revision(rev.revision_id, rev)
419
if "verify" in debug.debug_flags:
420
verify_commit_reconstruction(target_git_object_retriever,
421
lookup_object, o, rev, ret_tree, parent_trees, mapping,
422
unusual_modes, verifiers)
425
def import_git_objects(repo, mapping, object_iter,
426
target_git_object_retriever, heads, pb=None, limit=None):
427
"""Import a set of git objects into a bzr repository.
429
:param repo: Target Bazaar repository
430
:param mapping: Mapping to use
431
:param object_iter: Iterator over Git objects.
432
:return: Tuple with pack hints and last imported revision id
434
def lookup_object(sha):
436
return object_iter[sha]
438
return target_git_object_retriever[sha]
441
heads = list(set(heads))
442
trees_cache = LRUTreeCache(repo)
443
# Find and convert commit objects
446
pb.update("finding revisions to fetch", len(graph), None)
448
assert isinstance(head, str)
450
o = lookup_object(head)
453
if isinstance(o, Commit):
454
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
455
mapping.revision_id_foreign_to_bzr)
456
if (repo.has_revision(rev.revision_id) or
457
(roundtrip_revid and repo.has_revision(roundtrip_revid))):
459
graph.append((o.id, o.parents))
460
heads.extend([p for p in o.parents if p not in checked])
461
elif isinstance(o, Tag):
462
if o.object[1] not in checked:
463
heads.append(o.object[1])
465
trace.warning("Unable to import head object %r" % o)
468
# Order the revisions
469
# Create the inventory objects
471
revision_ids = topo_sort(graph)
473
if limit is not None:
474
revision_ids = revision_ids[:limit]
476
for offset in range(0, len(revision_ids), batch_size):
477
target_git_object_retriever.start_write_group()
479
repo.start_write_group()
481
for i, head in enumerate(
482
revision_ids[offset:offset+batch_size]):
484
pb.update("fetching revisions", offset+i,
486
import_git_commit(repo, mapping, head, lookup_object,
487
target_git_object_retriever, trees_cache)
490
repo.abort_write_group()
493
hint = repo.commit_write_group()
495
pack_hints.extend(hint)
497
target_git_object_retriever.abort_write_group()
500
target_git_object_retriever.commit_write_group()
501
return pack_hints, last_imported
504
class InterGitRepository(InterRepository):
506
_matching_repo_format = GitRepositoryFormat()
508
def _target_has_shas(self, shas):
509
raise NotImplementedError(self._target_has_shas)
511
def get_determine_wants_heads(self, wants, include_tags=False):
513
def determine_wants(refs):
514
potential = set(wants)
517
[v[1] or v[0] for v in extract_tags(refs).itervalues()])
518
return list(potential - self._target_has_shas(potential))
519
return determine_wants
521
def determine_wants_all(self, refs):
522
potential = set([sha for (ref, sha) in refs.iteritems() if not
523
ref.endswith("^{}")])
524
return list(potential - self._target_has_shas(potential))
527
def _get_repo_format_to_test():
530
def copy_content(self, revision_id=None, pb=None):
531
"""See InterRepository.copy_content."""
532
self.fetch(revision_id, pb, find_ghosts=False)
535
class InterGitNonGitRepository(InterGitRepository):
536
"""Base InterRepository that copies revisions from a Git into a non-Git
539
def _target_has_shas(self, shas):
540
revids = [self.source.lookup_foreign_revision_id(sha) for sha in shas]
541
return self.target.has_revisions(revids)
543
def get_determine_wants_revids(self, revids, include_tags=False):
545
for revid in set(revids):
546
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
548
return self.get_determine_wants_heads(wants,
549
include_tags=include_tags)
551
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
552
"""Fetch objects from a remote server.
554
:param determine_wants: determine_wants callback
555
:param mapping: BzrGitMapping to use
556
:param pb: Optional progress bar
557
:param limit: Maximum number of commits to import.
558
:return: Tuple with pack hint, last imported revision id and remote refs
560
raise NotImplementedError(self.fetch_objects)
562
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
563
mapping=None, fetch_spec=None):
565
mapping = self.source.get_mapping()
566
if revision_id is not None:
567
interesting_heads = [revision_id]
568
elif fetch_spec is not None:
569
recipe = fetch_spec.get_recipe()
570
if recipe[0] in ("search", "proxy-search"):
571
interesting_heads = recipe[1]
573
raise AssertionError("Unsupported search result type %s" %
576
interesting_heads = None
578
if interesting_heads is not None:
579
determine_wants = self.get_determine_wants_revids(
580
interesting_heads, include_tags=False)
582
determine_wants = self.determine_wants_all
584
(pack_hint, _, remote_refs) = self.fetch_objects(determine_wants,
586
if pack_hint is not None and self.target._format.pack_compresses:
587
self.target.pack(hint=pack_hint)
588
assert isinstance(remote_refs, dict)
592
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
593
def report_git_progress(pb, text):
594
text = text.rstrip("\r\n")
595
g = _GIT_PROGRESS_RE.match(text)
597
(text, pct, current, total) = g.groups()
598
pb.update(text, int(current), int(total))
600
pb.update(text, 0, 0)
603
class DetermineWantsRecorder(object):
605
def __init__(self, actual):
608
self.remote_refs = {}
610
def __call__(self, refs):
611
self.remote_refs = refs
612
self.wants = self.actual(refs)
616
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
617
"""InterRepository that copies revisions from a remote Git into a non-Git
620
def get_target_heads(self):
621
# FIXME: This should be more efficient
622
all_revs = self.target.all_revision_ids()
623
parent_map = self.target.get_parent_map(all_revs)
625
map(all_parents.update, parent_map.itervalues())
626
return set(all_revs) - all_parents
628
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
629
"""See `InterGitNonGitRepository`."""
631
report_git_progress(pb, text)
632
store = BazaarObjectStore(self.target, mapping)
635
heads = self.get_target_heads()
636
graph_walker = store.get_graph_walker(
637
[store._lookup_revision_sha1(head) for head in heads])
638
wants_recorder = DetermineWantsRecorder(determine_wants)
642
create_pb = pb = ui.ui_factory.nested_progress_bar()
644
objects_iter = self.source.fetch_objects(
645
wants_recorder, graph_walker, store.get_raw,
647
trace.mutter("Importing %d new revisions",
648
len(wants_recorder.wants))
649
(pack_hint, last_rev) = import_git_objects(self.target,
650
mapping, objects_iter, store, wants_recorder.wants, pb,
652
return (pack_hint, last_rev, wants_recorder.remote_refs)
660
def is_compatible(source, target):
661
"""Be compatible with GitRepository."""
662
if not isinstance(source, RemoteGitRepository):
664
if not target.supports_rich_root():
666
if isinstance(target, GitRepository):
668
if not getattr(target._format, "supports_full_versioned_files", True):
673
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
674
"""InterRepository that copies revisions from a local Git into a non-Git
677
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
678
"""See `InterGitNonGitRepository`."""
679
remote_refs = self.source._git.get_refs()
680
wants = determine_wants(remote_refs)
683
create_pb = pb = ui.ui_factory.nested_progress_bar()
684
target_git_object_retriever = BazaarObjectStore(self.target, mapping)
686
target_git_object_retriever.lock_write()
688
(pack_hint, last_rev) = import_git_objects(self.target,
689
mapping, self.source._git.object_store,
690
target_git_object_retriever, wants, pb, limit)
691
return (pack_hint, last_rev, remote_refs)
693
target_git_object_retriever.unlock()
699
def is_compatible(source, target):
700
"""Be compatible with GitRepository."""
701
if not isinstance(source, LocalGitRepository):
703
if not target.supports_rich_root():
705
if isinstance(target, GitRepository):
707
if not getattr(target._format, "supports_full_versioned_files", True):
712
class InterGitGitRepository(InterGitRepository):
713
"""InterRepository that copies between Git repositories."""
715
def fetch_objects(self, determine_wants, mapping, pb=None):
717
trace.note("git: %s", text)
718
graphwalker = self.target._git.get_graph_walker()
719
if (isinstance(self.source, LocalGitRepository) and
720
isinstance(self.target, LocalGitRepository)):
721
refs = self.source._git.fetch(self.target._git, determine_wants,
723
return (None, None, refs)
724
elif (isinstance(self.source, LocalGitRepository) and
725
isinstance(self.target, RemoteGitRepository)):
726
raise NotImplementedError
727
elif (isinstance(self.source, RemoteGitRepository) and
728
isinstance(self.target, LocalGitRepository)):
729
f, commit = self.target._git.object_store.add_thin_pack()
731
refs = self.source.bzrdir.root_transport.fetch_pack(
732
determine_wants, graphwalker, f.write, progress)
734
return (None, None, refs)
741
def _target_has_shas(self, shas):
742
return set([sha for sha in shas if self.target._git.object_store])
744
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
745
mapping=None, fetch_spec=None, branches=None):
747
mapping = self.source.get_mapping()
749
if revision_id is not None:
750
args = [self.source.lookup_bzr_revision_id(revision_id)[0]]
751
elif fetch_spec is not None:
752
recipe = fetch_spec.get_recipe()
753
if recipe[0] in ("search", "proxy-search"):
756
raise AssertionError(
757
"Unsupported search result type %s" % recipe[0])
758
args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in
760
if branches is not None:
761
determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store and x[y] != ZERO_SHA]
762
elif fetch_spec is None and revision_id is None:
763
determine_wants = self.determine_wants_all
765
determine_wants = lambda x: [y for y in args if not y in r.object_store and y != ZERO_SHA]
766
wants_recorder = DetermineWantsRecorder(determine_wants)
767
self.fetch_objects(wants_recorder, mapping)
768
return wants_recorder.remote_refs
771
def is_compatible(source, target):
772
"""Be compatible with GitRepository."""
773
return (isinstance(source, GitRepository) and
774
isinstance(target, GitRepository))
776
def get_determine_wants_revids(self, revids, include_tags=False):
778
for revid in set(revids):
779
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
781
return self.get_determine_wants_heads(wants,
782
include_tags=include_tags)
added
removed
fetch.py
