Show More
@@ -21,6 +21,9 from . import ( | |||
|
21 | 21 | pycompat, |
|
22 | 22 | util, |
|
23 | 23 | ) |
|
24 | from .utils import ( | |
|
25 | stringutil, | |
|
26 | ) | |
|
24 | 27 | |
|
25 | 28 | version = 2 |
|
26 | 29 | |
@@ -582,8 +585,10 class transaction(util.transactional): | |||
|
582 | 585 | self._vfsmap, self._entries, self._backupentries, |
|
583 | 586 | False, checkambigfiles=self._checkambigfiles) |
|
584 | 587 | self._report(_("rollback completed\n")) |
|
585 | except BaseException: | |
|
588 | except BaseException as exc: | |
|
586 | 589 | self._report(_("rollback failed - please run hg recover\n")) |
|
590 | self._report(_("(failure reason: %s)\n") | |
|
591 | % stringutil.forcebytestr(exc)) | |
|
587 | 592 | finally: |
|
588 | 593 | self._journal = None |
|
589 | 594 | self._releasefn(self, False) # notify failure of transaction |
@@ -51,6 +51,7 | |||
|
51 | 51 | transaction abort! |
|
52 | 52 | failed to truncate data/b.i |
|
53 | 53 | rollback failed - please run hg recover |
|
54 | (failure reason: [Errno 13] Permission denied .hg/store/data/b.i') | |
|
54 | 55 | strip failed, backup bundle |
|
55 | 56 | abort: Permission denied .hg/store/data/b.i |
|
56 | 57 | % after update 0, strip 2 |
@@ -104,6 +105,7 | |||
|
104 | 105 | transaction abort! |
|
105 | 106 | failed to truncate 00manifest.i |
|
106 | 107 | rollback failed - please run hg recover |
|
108 | (failure reason: [Errno 13] Permission denied .hg/store/00manifest.i') | |
|
107 | 109 | strip failed, backup bundle |
|
108 | 110 | abort: Permission denied .hg/store/00manifest.i |
|
109 | 111 | % after update 0, strip 2 |
General Comments 0
You need to be logged in to leave comments.
Login now