Show More
@@ -750,8 +750,8 b' class localrepository(repo.repository):' | |||
|
750 | 750 | raise error.RepoError( |
|
751 | 751 | _("abandoned transaction found - run hg recover")) |
|
752 | 752 | |
|
753 |
|
|
|
754 | renames = [(x, undoname(x)) for x in journalfiles] | |
|
753 | self._writejournal(desc) | |
|
754 | renames = [(x, undoname(x)) for x in self._journalfiles()] | |
|
755 | 755 | |
|
756 | 756 | tr = transaction.transaction(self.ui.warn, self.sopener, |
|
757 | 757 | self.sjoin("journal"), |
@@ -760,6 +760,15 b' class localrepository(repo.repository):' | |||
|
760 | 760 | self._transref = weakref.ref(tr) |
|
761 | 761 | return tr |
|
762 | 762 | |
|
763 | def _journalfiles(self): | |
|
764 | return (self.sjoin('journal'), self.join('journal.dirstate'), | |
|
765 | self.join('journal.branch'), self.join('journal.desc'), | |
|
766 | self.join('journal.bookmarks'), | |
|
767 | self.sjoin('journal.phaseroots')) | |
|
768 | ||
|
769 | def undofiles(self): | |
|
770 | return [undoname(x) for x in self._journalfiles()] | |
|
771 | ||
|
763 | 772 | def _writejournal(self, desc): |
|
764 | 773 | # save dirstate for rollback |
|
765 | 774 | try: |
@@ -783,11 +792,6 b' class localrepository(repo.repository):' | |||
|
783 | 792 | else: |
|
784 | 793 | self.sopener.write('journal.phaseroots', '') |
|
785 | 794 | |
|
786 | return (self.sjoin('journal'), self.join('journal.dirstate'), | |
|
787 | self.join('journal.branch'), self.join('journal.desc'), | |
|
788 | self.join('journal.bookmarks'), | |
|
789 | self.sjoin('journal.phaseroots')) | |
|
790 | ||
|
791 | 795 | def recover(self): |
|
792 | 796 | lock = self.lock() |
|
793 | 797 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now