Show More
@@ -1732,7 +1732,9 b' def recover(ui, repo):' | |||
|
1732 | 1732 | This command tries to fix the repository status after an interrupted |
|
1733 | 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 | 1739 | def remove(ui, repo, pat, *pats, **opts): |
|
1738 | 1740 | """remove the specified files on the next commit |
@@ -225,9 +225,11 b' class localrepository:' | |||
|
225 | 225 | lock = self.lock() |
|
226 | 226 | if os.path.exists(self.join("journal")): |
|
227 | 227 | self.ui.status(_("rolling back interrupted transaction\n")) |
|
228 |
|
|
|
228 | transaction.rollback(self.opener, self.join("journal")) | |
|
229 | return True | |
|
229 | 230 | else: |
|
230 | 231 | self.ui.warn(_("no interrupted transaction available\n")) |
|
232 | return False | |
|
231 | 233 | |
|
232 | 234 | def undo(self): |
|
233 | 235 | lock = self.lock() |
General Comments 0
You need to be logged in to leave comments.
Login now