Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/transaction.py @ 793:445970ccf57a
Merge with upstream
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 29 Jul 2005 06:43:21 +0100 |
| parents | df8a5a0098d4 46a8dd3145cc |
| children | 8f5637f0a0c0 |
comparison
equal
deleted
inserted
replaced
| 792:49ec802b4a16 | 793:445970ccf57a |
|---|---|
| 48 | 48 |
| 49 def close(self): | 49 def close(self): |
| 50 self.file.close() | 50 self.file.close() |
| 51 self.entries = [] | 51 self.entries = [] |
| 52 if self.after: | 52 if self.after: |
| 53 util.rename(self.journal, self.after) | 53 self.after() |
| 54 else: | 54 else: |
| 55 os.unlink(self.journal) | 55 os.unlink(self.journal) |
| 56 self.journal = None | 56 self.journal = None |
| 57 | 57 |
| 58 def abort(self): | 58 def abort(self): |