--- a/mercurial/transaction.py Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/transaction.py Thu Oct 08 12:55:45 2015 -0700
@@ -71,7 +71,7 @@
except (IOError, OSError) as inst:
if inst.errno != errno.ENOENT:
raise
- except (IOError, OSError, util.Abort) as inst:
+ except (IOError, OSError, error.Abort) as inst:
if not c:
raise
@@ -83,7 +83,7 @@
for f in backupfiles:
if opener.exists(f):
opener.unlink(f)
- except (IOError, OSError, util.Abort) as inst:
+ except (IOError, OSError, error.Abort) as inst:
# only pure backup file remains, it is sage to ignore any error
pass
@@ -417,7 +417,7 @@
if not f and b and vfs.exists(b):
try:
vfs.unlink(b)
- except (IOError, OSError, util.Abort) as inst:
+ except (IOError, OSError, error.Abort) as inst:
if not c:
raise
# Abort may be raise by read only opener
@@ -440,7 +440,7 @@
if b and vfs.exists(b):
try:
vfs.unlink(b)
- except (IOError, OSError, util.Abort) as inst:
+ except (IOError, OSError, error.Abort) as inst:
if not c:
raise
# Abort may be raise by read only opener