Mercurial > hg > gitserve

changeset 43:42177b56b949

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Attempt to recover journal automatically
author mpm@selenic.com
date Tue, 10 May 2005 00:32:05 -0800
parents 91f1fa847158
children e825a68d7227
files mercurial/transaction.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/transaction.py	Tue May 10 00:31:00 2005 -0800
+++ b/mercurial/transaction.py	Tue May 10 00:32:05 2005 -0800
@@ -22,7 +22,9 @@
 
         # abort here if the journal already exists
         if os.path.exists(self.journal):
-            raise "Journal already exists!"
+            print "journal already exists, recovering"
+            self.recover()
+
         self.file = open(self.journal, "w")
 
     def __del__(self):
@@ -59,4 +61,5 @@
         for l in open(self.journal).readlines():
             f, o = l.split('\0')
             self.opener(f, "a").truncate(int(o))
+        os.unlink(self.journal)