2686         return (

  2686         return (

  2687             (self.svfs, b'journal'),

  2687             (self.svfs, b'journal'),

  2688             (self.vfs, b'journal.branch'),

  2688             (self.vfs, b'journal.branch'),

  2689             (self.vfs, b'journal.desc'),

  2689             (self.vfs, b'journal.desc'),

  2690             (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),

  2690             (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),

  2692         )

  2691         )

  2693 

  2692 

  2694     def undofiles(self):

  2693     def undofiles(self):

  2695         return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]

  2694         return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]

  2696 

  2695 

  2702         self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))

  2701         self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))

  2703         bookmarksvfs = bookmarks.bookmarksvfs(self)

  2702         bookmarksvfs = bookmarks.bookmarksvfs(self)

  2704         bookmarksvfs.write(

  2703         bookmarksvfs.write(

  2705             b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")

  2704             b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")

  2706         )

  2705         )

  2708 

  2706 

  2709     def recover(self):

  2707     def recover(self):

  2710         with self.lock():

  2708         with self.lock():

  2711             if self.svfs.exists(b"journal"):

  2709             if self.svfs.exists(b"journal"):

  2712                 self.ui.status(_(b"rolling back interrupted transaction\n"))

  2710                 self.ui.status(_(b"rolling back interrupted transaction\n"))

  2796         bookmarksvfs = bookmarks.bookmarksvfs(self)

  2794         bookmarksvfs = bookmarks.bookmarksvfs(self)

  2797         if bookmarksvfs.exists(b'undo.bookmarks'):

  2795         if bookmarksvfs.exists(b'undo.bookmarks'):

  2798             bookmarksvfs.rename(

  2796             bookmarksvfs.rename(

  2799                 b'undo.bookmarks', b'bookmarks', checkambig=True

  2797                 b'undo.bookmarks', b'bookmarks', checkambig=True

  2800             )

  2798             )

  2803         self.invalidate()

  2799         self.invalidate()

  2804         self.dirstate.invalidate()

  2800         self.dirstate.invalidate()

  2805 

  2801 

  2806         if parentgone:

  2802         if parentgone:

  2807             # replace this with some explicit parent update in the future.

  2803             # replace this with some explicit parent update in the future.