902 |
902 |
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 self.vfs.exists('undo.bookmarks'): |
906 if self.vfs.exists('undo.bookmarks'): |
907 util.rename(self.join('undo.bookmarks'), |
907 self.vfs.rename('undo.bookmarks', 'bookmarks') |
908 self.join('bookmarks')) |
|
909 if self.svfs.exists('undo.phaseroots'): |
908 if self.svfs.exists('undo.phaseroots'): |
910 util.rename(self.sjoin('undo.phaseroots'), |
909 self.svfs.rename('undo.phaseroots', 'phaseroots') |
911 self.sjoin('phaseroots')) |
|
912 self.invalidate() |
910 self.invalidate() |
913 |
911 |
914 parentgone = (parents[0] not in self.changelog.nodemap or |
912 parentgone = (parents[0] not in self.changelog.nodemap or |
915 parents[1] not in self.changelog.nodemap) |
913 parents[1] not in self.changelog.nodemap) |
916 if parentgone: |
914 if parentgone: |
917 util.rename(self.join('undo.dirstate'), self.join('dirstate')) |
915 self.vfs.rename('undo.dirstate', 'dirstate') |
918 try: |
916 try: |
919 branch = self.opener.read('undo.branch') |
917 branch = self.opener.read('undo.branch') |
920 self.dirstate.setbranch(encoding.tolocal(branch)) |
918 self.dirstate.setbranch(encoding.tolocal(branch)) |
921 except IOError: |
919 except IOError: |
922 ui.warn(_('named branch could not be reset: ' |
920 ui.warn(_('named branch could not be reset: ' |