← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-10-03 01:42:16 UTC
  • Revision ID: robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad
integrate in Gustavos x-bit patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
242
242
    def get_file_sha1(self, id):
243
243
        return self.tree.get_file_sha1(id)
244
244
 
 
245
    def is_executable(self, id):
 
246
        return self.tree.is_executable(id)
 
247
 
245
248
    def id2path(self, file_id):
246
249
        return self.tree.id2path(file_id)
247
250
 
273
276
                    outfile = file(path, "wb")
274
277
                    outfile.write(self.tree.get_file(id).read())
275
278
                    assert(bzrlib.osutils.lexists(path))
 
279
                    if self.tree.is_executable(id):
 
280
                        os.chmod(path, 0755)
276
281
                else:
277
282
                    assert kind == "symlink"
278
283
                    path = os.path.join(self.tempdir, "symlinks", id)