/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/workingtree.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/workingtree.py
17
17
 
18
18
"""An adapter between a Git index and a Bazaar Working Tree"""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
import itertools
23
21
from collections import defaultdict
24
22
import errno
73
71
    BadReferenceTarget,
74
72
    MutableTree,
75
73
    )
76
 
from ..sixish import text_type
77
74
 
78
75
 
79
76
from .dir import (
534
531
                              recurse_nested=False):
535
532
        if from_dir is None:
536
533
            from_dir = u""
537
 
        if not isinstance(from_dir, text_type):
 
534
        if not isinstance(from_dir, str):
538
535
            raise TypeError(from_dir)
539
536
        encoded_from_dir = self.abspath(from_dir).encode(osutils._fs_enc)
540
537
        for (dirpath, dirnames, filenames) in os.walk(encoded_from_dir):