/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-06-15 01:29:36 UTC
  • mfrom: (7490.40.4 work)
  • mto: (7490.40.19 work)
  • mto: This revision was merged to the branch mainline in revision 7516.
  • Revision ID: jelmer@jelmer.uk-20200615012936-1adqbu592y7lzmy8
Merge upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
127
127
            index_path = os.path.join(self.basedir, relpath.decode('utf-8'), '.git', 'index')
128
128
        else:
129
129
            index_path = self.control_transport.local_abspath(
130
 
                posixpath.join('modules', info[1], 'index'))
 
130
                posixpath.join('modules', info[1].decode('utf-8'), 'index'))
131
131
        return Index(index_path)
132
132
 
133
133
    def lock_read(self):
817
817
                    ie = self._get_file_ie(name, path, value, dir_ids[parent])
818
818
                    yield (posixpath.relpath(path, from_dir), "V", ie.kind, ie)
819
819
                else:
820
 
                    ie = fk_entries[kind]()
 
820
                    try:
 
821
                        ie = fk_entries[kind]()
 
822
                    except KeyError:
 
823
                        # unsupported kind
 
824
                        continue
821
825
                    yield (posixpath.relpath(path, from_dir),
822
826
                           ("I" if self.is_ignored(path) else "?"), kind, ie)
823
827