Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
journal: set Abort hint when failing due to an abandoned transaction
authorJohan Bjork <jbjoerk@gmail.com>
Thu, 08 May 2014 14:58:25 +0000
changeset 21274 3b4c75690206
parent 21273 20b8090d8125
child 21275 c7e9fb881a5a
journal: set Abort hint when failing due to an abandoned transaction
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-journal-exists.t file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Thu May 08 16:37:33 2014 -0700
+++ b/mercurial/localrepo.py	Thu May 08 14:58:25 2014 +0000
@@ -857,7 +857,8 @@
         # abort here if the journal already exists
         if self.svfs.exists("journal"):
             raise error.RepoError(
-                _("abandoned transaction found - run hg recover"))
+                _("abandoned transaction found"),
+                hint=_("run 'hg recover' to clean up transaction"))
 
         def onclose():
             self.store.write(tr)
--- a/tests/test-journal-exists.t	Thu May 08 16:37:33 2014 -0700
+++ b/tests/test-journal-exists.t	Thu May 08 14:58:25 2014 +0000
@@ -9,7 +9,8 @@
 
   $ echo foo > a
   $ hg ci -Am0
-  abort: abandoned transaction found - run hg recover!
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
   [255]
 
   $ hg recover
mercurial