--- a/mercurial/commands.py Tue Nov 08 10:36:23 2005 -0800
+++ b/mercurial/commands.py Tue Nov 08 14:22:03 2005 -0800
@@ -1732,7 +1732,9 @@
This command tries to fix the repository status after an interrupted
operation. It should only be necessary when Mercurial suggests it.
"""
- repo.recover()
+ if repo.recover():
+ return repo.verify()
+ return False
def remove(ui, repo, pat, *pats, **opts):
"""remove the specified files on the next commit
--- a/mercurial/localrepo.py Tue Nov 08 10:36:23 2005 -0800
+++ b/mercurial/localrepo.py Tue Nov 08 14:22:03 2005 -0800
@@ -225,9 +225,11 @@
lock = self.lock()
if os.path.exists(self.join("journal")):
self.ui.status(_("rolling back interrupted transaction\n"))
- return transaction.rollback(self.opener, self.join("journal"))
+ transaction.rollback(self.opener, self.join("journal"))
+ return True
else:
self.ui.warn(_("no interrupted transaction available\n"))
+ return False
def undo(self):
lock = self.lock()