/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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
71
73
    BadReferenceTarget,
72
74
    MutableTree,
73
75
    )
 
76
from ..sixish import text_type
74
77
 
75
78
 
76
79
from .dir import (
531
534
                              recurse_nested=False):
532
535
        if from_dir is None:
533
536
            from_dir = u""
534
 
        if not isinstance(from_dir, str):
 
537
        if not isinstance(from_dir, text_type):
535
538
            raise TypeError(from_dir)
536
539
        encoded_from_dir = self.abspath(from_dir).encode(osutils._fs_enc)
537
540
        for (dirpath, dirnames, filenames) in os.walk(encoded_from_dir):