Mercurial > hg-stable
changeset 10428:e553a425751d stable
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.
| author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
|---|---|
| date | Thu, 11 Feb 2010 23:15:42 +0200 |
| parents | 58e040c51231 |
| children | 1c50a954a524 64a6a896e5fb |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Feb 11 12:02:48 2010 -0200 +++ b/mercurial/localrepo.py Thu Feb 11 23:15:42 2010 +0200 @@ -876,8 +876,12 @@ 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: