##// END OF EJS Templates
localrepo: refactor retrieving of journal/undo files paths...
Idan Kamara -
r16236:97efd26e default
parent child Browse files
Show More
@@ -750,8 +750,8 b' class localrepository(repo.repository):'
750 raise error.RepoError(
750 raise error.RepoError(
751 _("abandoned transaction found - run hg recover"))
751 _("abandoned transaction found - run hg recover"))
752
752
753 journalfiles = self._writejournal(desc)
753 self._writejournal(desc)
754 renames = [(x, undoname(x)) for x in journalfiles]
754 renames = [(x, undoname(x)) for x in self._journalfiles()]
755
755
756 tr = transaction.transaction(self.ui.warn, self.sopener,
756 tr = transaction.transaction(self.ui.warn, self.sopener,
757 self.sjoin("journal"),
757 self.sjoin("journal"),
@@ -760,6 +760,15 b' class localrepository(repo.repository):'
760 self._transref = weakref.ref(tr)
760 self._transref = weakref.ref(tr)
761 return tr
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 def _writejournal(self, desc):
772 def _writejournal(self, desc):
764 # save dirstate for rollback
773 # save dirstate for rollback
765 try:
774 try:
@@ -783,11 +792,6 b' class localrepository(repo.repository):'
783 else:
792 else:
784 self.sopener.write('journal.phaseroots', '')
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 def recover(self):
795 def recover(self):
792 lock = self.lock()
796 lock = self.lock()
793 try:
797 try:
General Comments 0
You need to be logged in to leave comments. Login now