Mercurial > hg

comparison mercurial/transaction.py @ 10282:08a0f04b56bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many, many trivial check-code fixups
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jan 2010 00:05:27 -0600
parents 25e572394f5c
children 5116a077c3da
comparison
equal deleted inserted replaced
10281:e7d3b509af8b 10282:08a0f04b56bd
71 self.file.write(d) 71 self.file.write(d)
72 self.file.flush() 72 self.file.flush()
73 73
74 @active 74 @active
75 def add(self, file, offset, data=None): 75 def add(self, file, offset, data=None):
76 if file in self.map: return 76 if file in self.map:
77 77 return
78 if self._queue: 78 if self._queue:
79 self._queue[-1].append((file, offset, data)) 79 self._queue[-1].append((file, offset, data))
80 return 80 return
81 81
82 self.entries.append((file, offset, data)) 82 self.entries.append((file, offset, data))
145 return 145 return
146 146
147 self.report(_("transaction abort!\n")) 147 self.report(_("transaction abort!\n"))
148 148
149 try: 149 try:
150 _playback(self.journal, self.report, self.opener, self.entries, False) 150 _playback(self.journal, self.report, self.opener,
151 self.entries, False)
151 self.report(_("rollback completed\n")) 152 self.report(_("rollback completed\n"))
152 except: 153 except:
153 self.report(_("rollback failed - please run hg recover\n")) 154 self.report(_("rollback failed - please run hg recover\n"))
154 finally: 155 finally:
155 self.journal = None 156 self.journal = None