/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-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/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
 
20
22
import itertools
21
23
from collections import defaultdict
22
24
import errno
69
71
    BadReferenceTarget,
70
72
    MutableTree,
71
73
    )
 
74
from ..sixish import text_type
72
75
 
73
76
 
74
77
from .dir import (
527
530
                              recurse_nested=False):
528
531
        if from_dir is None:
529
532
            from_dir = u""
530
 
        if not isinstance(from_dir, str):
 
533
        if not isinstance(from_dir, text_type):
531
534
            raise TypeError(from_dir)
532
535
        encoded_from_dir = self.abspath(from_dir).encode(osutils._fs_enc)
533
536
        for (dirpath, dirnames, filenames) in os.walk(encoded_from_dir):