/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/bzr/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-22 11:51:56 UTC
  • mfrom: (7356 work)
  • mto: This revision was merged to the branch mainline in revision 7358.
  • Revision ID: jelmer@jelmer.uk-20190622115156-20uwy6b97g94bbv1
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/workingtree_4.py
563
563
            relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
564
564
            try:
565
565
                if self.kind(relpath) == 'tree-reference':
566
 
                    yield relpath, key[2]
 
566
                    yield relpath
567
567
            except errors.NoSuchFile:
568
568
                # path is missing on disk.
569
569
                continue
1785
1785
            raise errors.BzrError('must supply file_id or path')
1786
1786
        if path is not None:
1787
1787
            path = path.encode('utf8')
1788
 
        parent_index = self._get_parent_index()
 
1788
        try:
 
1789
            parent_index = self._get_parent_index()
 
1790
        except ValueError:
 
1791
            raise errors.NoSuchRevisionInTree(self._dirstate, self._revision_id)
1789
1792
        return self._dirstate._get_entry(parent_index, fileid_utf8=file_id,
1790
1793
                                         path_utf8=path)
1791
1794