/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/plugins/git/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-23 22:25:11 UTC
  • mto: This revision was merged to the branch mainline in revision 7053.
  • Revision ID: jelmer@jelmer.uk-20180723222511-gns8mqohgakwa2b9
Some brz-git fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/workingtree.py
602
602
        except KeyError:
603
603
            return False
604
604
        try:
605
 
            tree_lookup_path(self.store.__getitem__, root_tree, path)
 
605
            tree_lookup_path(self.store.__getitem__, root_tree, path.encode('utf-8'))
606
606
        except KeyError:
607
607
            return False
608
608
        else:
613
613
        try:
614
614
            return self._lstat(path).st_mtime
615
615
        except OSError as e:
616
 
            (num, msg) = e
617
 
            if num == errno.ENOENT:
 
616
            if e.errno == errno.ENOENT:
618
617
                raise errors.NoSuchFile(path)
619
618
            raise
620
619
 
697
696
            try:
698
697
                return osutils.sha_file_by_name(abspath)
699
698
            except OSError as e:
700
 
                (num, msg) = e
701
 
                if num in (errno.EISDIR, errno.ENOENT):
 
699
                if e.errno in (errno.EISDIR, errno.ENOENT):
702
700
                    return None
703
701
                raise
704
702
 
1163
1161
                    else:
1164
1162
                        # Let's at least try to use the working tree file:
1165
1163
                        try:
1166
 
                            st = self._lstat(self.abspath(entry.path))
 
1164
                            st = self._lstat(self.abspath(entry.path.decode('utf-8')))
1167
1165
                        except OSError:
1168
1166
                            # But if it doesn't exist, we'll make something up.
1169
1167
                            obj = self.store[entry.sha]