/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

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):
817
814
                    ie = self._get_file_ie(name, path, value, dir_ids[parent])
818
815
                    yield (posixpath.relpath(path, from_dir), "V", ie.kind, ie)
819
816
                else:
820
 
                    ie = fk_entries[kind]()
 
817
                    try:
 
818
                        ie = fk_entries[kind]()
 
819
                    except KeyError:
 
820
                        # unsupported kind
 
821
                        continue
821
822
                    yield (posixpath.relpath(path, from_dir),
822
823
                           ("I" if self.is_ignored(path) else "?"), kind, ie)
823
824