/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/git/fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-29 20:24:31 UTC
  • mfrom: (6999 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180629202431-2td8kihrsthzuvau
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/fetch.py
55
55
from ...revision import (
56
56
    NULL_REVISION,
57
57
    )
 
58
from ...sixish import text_type
58
59
from ...bzr.inventorytree import InventoryRevisionTree
59
60
from ...testament import (
60
61
    StrictTestament3,
223
224
    :param lookup_object: Lookup a git object by its SHA1
224
225
    :return: Inventory delta, as list
225
226
    """
226
 
    if type(path) is not unicode:
 
227
    if not isinstance(path, text_type):
227
228
        raise TypeError(path)
228
229
    ret = []
229
230
    for name, mode, hexsha in base_tree.iteritems():
375
376
    for t in trees:
376
377
        revid = t.get_revision_id()
377
378
        if not real_inv_vf.get_parent_map([(revid, )]):
378
 
            repo.add_inventory(revid, t.inventory, t.get_parent_ids())
 
379
            repo.add_inventory(revid, t.root_inventory, t.get_parent_ids())
379
380
 
380
381
 
381
382
def import_git_commit(repo, mapping, head, lookup_object,
409
410
            None, rev.revision_id, parent_trees,
410
411
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
411
412
            tree_supplement.lookup_file_id,
412
 
            allow_submodules=getattr(repo._format, "supports_tree_reference",
413
 
                False))
 
413
            allow_submodules=repo._format.supports_tree_reference)
414
414
    if unusual_modes != {}:
415
415
        for path, mode in unusual_modes.iteritems():
416
416
            warn_unusual_mode(rev.foreign_revid, path, mode)
421
421
        basis_id = NULL_REVISION
422
422
        base_bzr_inventory = None
423
423
    else:
424
 
        try:
425
 
            base_bzr_inventory = base_bzr_tree.root_inventory
426
 
        except AttributeError: # bzr < 2.6
427
 
            base_bzr_inventory = base_bzr_tree.inventory
 
424
        base_bzr_inventory = base_bzr_tree.root_inventory
428
425
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
429
426
              inv_delta, rev.revision_id, rev.parent_ids,
430
427
              base_bzr_inventory)