--- a/mercurial/transaction.py Sat Jan 09 10:47:47 2010 +0100
+++ b/mercurial/transaction.py Mon Jan 11 21:45:28 2010 +0100
@@ -42,8 +42,6 @@
class transaction(object):
def __init__(self, report, opener, journal, after=None, createmode=None):
- self.journal = None
-
self.count = 1
self.report = report
self.opener = opener
@@ -140,14 +138,14 @@
self.count = 0
self.file.close()
- if not self.entries:
- if self.journal:
- os.unlink(self.journal)
- return
+ try:
+ if not self.entries:
+ if self.journal:
+ os.unlink(self.journal)
+ return
- self.report(_("transaction abort!\n"))
+ self.report(_("transaction abort!\n"))
- try:
try:
_playback(self.journal, self.report, self.opener, self.entries, False)
self.report(_("rollback completed\n"))