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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-10 18:53:12 UTC
  • mto: (0.200.1845 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180310185312-fozt67892klzt8zn
Use index for ie data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
857
857
        if kind == 'symlink':
858
858
            ie.symlink_target = self.get_symlink_target(path, file_id)
859
859
        else:
860
 
            data = self.get_file_text(path, file_id)
 
860
            try:
 
861
                data = self.get_file_text(path, file_id)
 
862
            except errors.NoSuchFile:
 
863
                data = None
 
864
            except IOError as e:
 
865
                if e.errno != errno.ENOENT:
 
866
                    raise
 
867
                data = None
 
868
            if data is None:
 
869
                data = self.repository._git.object_store[sha].data
861
870
            ie.text_sha1 = osutils.sha_string(data)
862
871
            ie.text_size = len(data)
863
 
            ie.executable = self.is_executable(path, file_id)
 
872
            ie.executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
864
873
        ie.revision = None
865
874
        return ie
866
875