Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 50194:8fb391363aad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transaction: no longer explicitly cache bookmarks The transaction file generation is already dealing with the backup for this. So, no need to duplicate such backup.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 23 Feb 2023 04:53:34 +0100
parents ab806355fccb
children 11e6eee4b063
line wrap: on
line diff
--- a/mercurial/localrepo.py	Wed Feb 22 18:58:02 2023 +0100
+++ b/mercurial/localrepo.py	Thu Feb 23 04:53:34 2023 +0100
@@ -2687,7 +2687,6 @@
             (self.svfs, b'journal'),
             (self.vfs, b'journal.branch'),
             (self.vfs, b'journal.desc'),
-            (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
         )
 
     def undofiles(self):
@@ -2699,10 +2698,6 @@
             b"journal.branch", encoding.fromlocal(self.dirstate.branch())
         )
         self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
-        bookmarksvfs = bookmarks.bookmarksvfs(self)
-        bookmarksvfs.write(
-            b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
-        )
 
     def recover(self):
         with self.lock():
@@ -2791,11 +2786,6 @@
             checkambigfiles=_cachedfiles,
             skip_journal_pattern=skip_journal_pattern,
         )
-        bookmarksvfs = bookmarks.bookmarksvfs(self)
-        if bookmarksvfs.exists(b'undo.bookmarks'):
-            bookmarksvfs.rename(
-                b'undo.bookmarks', b'bookmarks', checkambig=True
-            )
         self.invalidate()
         self.dirstate.invalidate()