/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
124
124
            index_path = os.path.join(self.basedir, relpath.decode('utf-8'), '.git', 'index')
125
125
        else:
126
126
            index_path = self.control_transport.local_abspath(
127
 
                posixpath.join('modules', info[1], 'index'))
 
127
                posixpath.join('modules', info[1].decode('utf-8'), 'index'))
128
128
        return Index(index_path)
129
129
 
130
130
    def lock_read(self):
814
814
                    ie = self._get_file_ie(name, path, value, dir_ids[parent])
815
815
                    yield (posixpath.relpath(path, from_dir), "V", ie.kind, ie)
816
816
                else:
817
 
                    ie = fk_entries[kind]()
 
817
                    try:
 
818
                        ie = fk_entries[kind]()
 
819
                    except KeyError:
 
820
                        # unsupported kind
 
821
                        continue
818
822
                    yield (posixpath.relpath(path, from_dir),
819
823
                           ("I" if self.is_ignored(path) else "?"), kind, ie)
820
824