Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 5865:e7127f669edb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transactions: don't show a backtrace when journal exists Now we simply print a message on how to recover.
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Jan 2008 11:32:25 -0600
parents dd5a501cb97f
children afb7bdf11a61
line wrap: on
line diff
--- a/mercurial/localrepo.py	Wed Jan 16 11:14:51 2008 -0600
+++ b/mercurial/localrepo.py	Wed Jan 16 11:32:25 2008 -0600
@@ -519,6 +519,10 @@
         if self._transref and self._transref():
             return self._transref().nest()
 
+        # abort here if the journal already exists
+        if os.path.exists(self.sjoin("journal")):
+            raise repo.RepoError(_("journal already exists - run hg recover"))
+
         # save dirstate for rollback
         try:
             ds = self.opener("dirstate").read()