/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/git/fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
16
16
 
17
17
"""Fetching from git into bzr."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
from dulwich.objects import (
22
20
    Commit,
23
21
    Tag,
51
49
    NULL_REVISION,
52
50
    )
53
51
from ..bzr.inventorytree import InventoryRevisionTree
54
 
from ..sixish import text_type
55
52
from ..bzr.testament import (
56
53
    StrictTestament3,
57
54
    )
218
215
    :param lookup_object: Lookup a git object by its SHA1
219
216
    :return: Inventory delta, as list
220
217
    """
221
 
    if not isinstance(path, text_type):
 
218
    if not isinstance(path, str):
222
219
        raise TypeError(path)
223
220
    ret = []
224
221
    for name, mode, hexsha in base_tree.iteritems():