Show More
@@ -904,17 +904,15 b' class localrepository(object):' | |||
|
904 | 904 | self.destroying() |
|
905 | 905 | transaction.rollback(self.sopener, self.sjoin('undo'), ui.warn) |
|
906 | 906 | if self.vfs.exists('undo.bookmarks'): |
|
907 |
|
|
|
908 | self.join('bookmarks')) | |
|
907 | self.vfs.rename('undo.bookmarks', 'bookmarks') | |
|
909 | 908 | if self.svfs.exists('undo.phaseroots'): |
|
910 |
|
|
|
911 | self.sjoin('phaseroots')) | |
|
909 | self.svfs.rename('undo.phaseroots', 'phaseroots') | |
|
912 | 910 | self.invalidate() |
|
913 | 911 | |
|
914 | 912 | parentgone = (parents[0] not in self.changelog.nodemap or |
|
915 | 913 | parents[1] not in self.changelog.nodemap) |
|
916 | 914 | if parentgone: |
|
917 |
|
|
|
915 | self.vfs.rename('undo.dirstate', 'dirstate') | |
|
918 | 916 | try: |
|
919 | 917 | branch = self.opener.read('undo.branch') |
|
920 | 918 | self.dirstate.setbranch(encoding.tolocal(branch)) |
@@ -254,6 +254,9 b' class abstractvfs(object):' | |||
|
254 | 254 | def readdir(self, path=None, stat=None, skip=None): |
|
255 | 255 | return osutil.listdir(self.join(path), stat, skip) |
|
256 | 256 | |
|
257 | def rename(self, src, dst): | |
|
258 | return util.rename(self.join(src), self.join(dst)) | |
|
259 | ||
|
257 | 260 | def stat(self, path=None): |
|
258 | 261 | return os.stat(self.join(path)) |
|
259 | 262 |
General Comments 0
You need to be logged in to leave comments.
Login now