mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
convert: differentiate between IOError and OSError on commitctx()
The IOError exception is overloaded to mean 'this file was deleted in the current commit'. Separate the code that handles IOError and file deletion from general OSError exceptions. The latter are real errors, but IOError is not always a throwable error. This solves the accidental marking of files as 'deleted' in commits that try to write for example in .hg/store/data revlogs that the current user has no permission to modify (a normal OSError that should abort the current commit). Changed by pmezard: use getattr() to be on the safe side.
This commit is contained in:
parent
a4d5546600
commit
a74504962c
@ -876,8 +876,12 @@ class localrepository(repo.repository):
|
||||
new[f] = self._filecommit(fctx, m1, m2, linkrev, trp,
|
||||
changed)
|
||||
m1.set(f, fctx.flags())
|
||||
except (OSError, IOError):
|
||||
if error:
|
||||
except OSError, inst:
|
||||
self.ui.warn(_("trouble committing %s!\n") % f)
|
||||
raise
|
||||
except IOError, inst:
|
||||
errcode = getattr(inst, 'errno', errno.ENOENT)
|
||||
if error or errcode and errcode != errno.ENOENT:
|
||||
self.ui.warn(_("trouble committing %s!\n") % f)
|
||||
raise
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user