##// END OF EJS Templates
Automatically run "verify" whenever we run "recover"
Matt Mackall -
r1516:0b1b029b default
parent child Browse files
Show More
@@ -1732,7 +1732,9 b' def recover(ui, repo):'
1732 This command tries to fix the repository status after an interrupted
1732 This command tries to fix the repository status after an interrupted
1733 operation. It should only be necessary when Mercurial suggests it.
1733 operation. It should only be necessary when Mercurial suggests it.
1734 """
1734 """
1735 repo.recover()
1735 if repo.recover():
1736 return repo.verify()
1737 return False
1736
1738
1737 def remove(ui, repo, pat, *pats, **opts):
1739 def remove(ui, repo, pat, *pats, **opts):
1738 """remove the specified files on the next commit
1740 """remove the specified files on the next commit
@@ -225,9 +225,11 b' class localrepository:'
225 lock = self.lock()
225 lock = self.lock()
226 if os.path.exists(self.join("journal")):
226 if os.path.exists(self.join("journal")):
227 self.ui.status(_("rolling back interrupted transaction\n"))
227 self.ui.status(_("rolling back interrupted transaction\n"))
228 return transaction.rollback(self.opener, self.join("journal"))
228 transaction.rollback(self.opener, self.join("journal"))
229 return True
229 else:
230 else:
230 self.ui.warn(_("no interrupted transaction available\n"))
231 self.ui.warn(_("no interrupted transaction available\n"))
232 return False
231
233
232 def undo(self):
234 def undo(self):
233 lock = self.lock()
235 lock = self.lock()
General Comments 0
You need to be logged in to leave comments. Login now