transaction: nullify journal after close()

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

transaction: nullify journal after close()

This keeps us from trying to cleanup in __del__.

bug spotted by K Thananchayan <[e-mail]>

manifest hash: 1f4c5fa43d2458cdcb6ec0f0a7066b3c3e699f33
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxwQ6ywK+sNU5EO8RAuGhAJ9+BnKILwRCF9EKlPTz2zptiysQ/QCgsB3s
VKIehiStv+ibWQQi15k4mwk=
=nZD1
-----END PGP SIGNATURE-----

mercurial/transaction.py

@@ -1,76 +1,77
 # transaction.py - simple journalling scheme for mercurial
 #
 # This transaction scheme is intended to gracefully handle program
 # errors and interruptions. More serious failures like system crashes
 # can be recovered with an fsck-like tool. As the whole repository is
 # effectively log-structured, this should amount to simply truncating
 # anything that isn't referenced in the changelog.
 #
 # Copyright 2005 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import os
 import util
 
 class transaction:
     def __init__(self, opener, journal, after = None):
         self.journal = None
 
         # abort here if the journal already exists
         if os.path.exists(journal):
             raise "journal already exists - run hg recover"
 
         self.opener = opener
         self.after = after
         self.entries = []
         self.map = {}
         self.journal = journal
 
         self.file = open(self.journal, "w")
 
     def __del__(self):
         if self.journal:
             if self.entries: self.abort()
             self.file.close()
             try: os.unlink(self.journal)
             except: pass
 
     def add(self, file, offset):
         if file in self.map: return
         self.entries.append((file, offset))
         self.map[file] = 1
         # add enough data to the journal to do the truncate
         self.file.write("%s\0%d\n" % (file, offset))
         self.file.flush()
 
     def close(self):
         self.file.close()
         self.entries = []
         if self.after:
             util.rename(self.journal, self.after)
         else:
             os.unlink(self.journal)
+        self.journal = None
 
     def abort(self):
         if not self.entries: return
 
         print "transaction abort!"
 
         for f, o in self.entries:
             try:
                 self.opener(f, "a").truncate(o)
             except:
                 print "failed to truncate", f
 
         self.entries = []
 
         print "rollback completed"
 
 def rollback(opener, file):
     for l in open(file).readlines():
         f, o = l.split('\0')
         opener(f, "a").truncate(int(o))
     os.unlink(file)