Show More
@@ -806,7 +806,7 b' class localrepository(object):' | |||||
806 | return tr.nest() |
|
806 | return tr.nest() | |
807 |
|
807 | |||
808 | # abort here if the journal already exists |
|
808 | # abort here if the journal already exists | |
809 |
if |
|
809 | if self.svfs.exists("journal"): | |
810 | raise error.RepoError( |
|
810 | raise error.RepoError( | |
811 | _("abandoned transaction found - run hg recover")) |
|
811 | _("abandoned transaction found - run hg recover")) | |
812 |
|
812 | |||
@@ -844,7 +844,7 b' class localrepository(object):' | |||||
844 | def recover(self): |
|
844 | def recover(self): | |
845 | lock = self.lock() |
|
845 | lock = self.lock() | |
846 | try: |
|
846 | try: | |
847 |
if |
|
847 | if self.svfs.exists("journal"): | |
848 | self.ui.status(_("rolling back interrupted transaction\n")) |
|
848 | self.ui.status(_("rolling back interrupted transaction\n")) | |
849 | transaction.rollback(self.sopener, self.sjoin("journal"), |
|
849 | transaction.rollback(self.sopener, self.sjoin("journal"), | |
850 | self.ui.warn) |
|
850 | self.ui.warn) | |
@@ -861,7 +861,7 b' class localrepository(object):' | |||||
861 | try: |
|
861 | try: | |
862 | wlock = self.wlock() |
|
862 | wlock = self.wlock() | |
863 | lock = self.lock() |
|
863 | lock = self.lock() | |
864 |
if |
|
864 | if self.svfs.exists("undo"): | |
865 | return self._rollback(dryrun, force) |
|
865 | return self._rollback(dryrun, force) | |
866 | else: |
|
866 | else: | |
867 | self.ui.warn(_("no rollback information available\n")) |
|
867 | self.ui.warn(_("no rollback information available\n")) | |
@@ -903,10 +903,10 b' class localrepository(object):' | |||||
903 | parents = self.dirstate.parents() |
|
903 | parents = self.dirstate.parents() | |
904 | self.destroying() |
|
904 | self.destroying() | |
905 | transaction.rollback(self.sopener, self.sjoin('undo'), ui.warn) |
|
905 | transaction.rollback(self.sopener, self.sjoin('undo'), ui.warn) | |
906 |
if |
|
906 | if self.vfs.exists('undo.bookmarks'): | |
907 | util.rename(self.join('undo.bookmarks'), |
|
907 | util.rename(self.join('undo.bookmarks'), | |
908 | self.join('bookmarks')) |
|
908 | self.join('bookmarks')) | |
909 |
if |
|
909 | if self.svfs.exists('undo.phaseroots'): | |
910 | util.rename(self.sjoin('undo.phaseroots'), |
|
910 | util.rename(self.sjoin('undo.phaseroots'), | |
911 | self.sjoin('phaseroots')) |
|
911 | self.sjoin('phaseroots')) | |
912 | self.invalidate() |
|
912 | self.invalidate() |
General Comments 0
You need to be logged in to leave comments.
Login now