/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-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
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
 
19
21
from dulwich.objects import (
20
22
    Commit,
21
23
    Tag,
49
51
    NULL_REVISION,
50
52
    )
51
53
from ..bzr.inventorytree import InventoryRevisionTree
 
54
from ..sixish import text_type
52
55
from ..bzr.testament import (
53
56
    StrictTestament3,
54
57
    )
216
219
    :param lookup_object: Lookup a git object by its SHA1
217
220
    :return: Inventory delta, as list
218
221
    """
219
 
    if not isinstance(path, str):
 
222
    if not isinstance(path, text_type):
220
223
        raise TypeError(path)
221
224
    ret = []
222
225
    for name, mode, hexsha in base_tree.iteritems():