# HG changeset patch # User Pierre-Yves David # Date 1677088682 -3600 # Node ID ab806355fccb672d3256a369e56e5652a00d2ce3 # Parent 6794f927bc48ecd073a5c9c4b1ed545da4491e46 transaction: no longer explicitly cache phaseroots The transaction file generation is already dealing with the backup for this. So, no need to duplicate such backup. diff -r 6794f927bc48 -r ab806355fccb mercurial/localrepo.py --- a/mercurial/localrepo.py Thu Feb 23 04:28:24 2023 +0100 +++ b/mercurial/localrepo.py Wed Feb 22 18:58:02 2023 +0100 @@ -2688,7 +2688,6 @@ (self.vfs, b'journal.branch'), (self.vfs, b'journal.desc'), (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), - (self.svfs, b'journal.phaseroots'), ) def undofiles(self): @@ -2704,7 +2703,6 @@ bookmarksvfs.write( b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") ) - self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) def recover(self): with self.lock(): @@ -2798,8 +2796,6 @@ bookmarksvfs.rename( b'undo.bookmarks', b'bookmarks', checkambig=True ) - if self.svfs.exists(b'undo.phaseroots'): - self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) self.invalidate() self.dirstate.invalidate() diff -r 6794f927bc48 -r ab806355fccb tests/test-fncache.t --- a/tests/test-fncache.t Thu Feb 23 04:28:24 2023 +0100 +++ b/tests/test-fncache.t Wed Feb 22 18:58:02 2023 +0100 @@ -107,7 +107,6 @@ .hg/undo.bookmarks .hg/undo.branch .hg/undo.desc - .hg/undo.phaseroots .hg/wcache .hg/wcache/checkisexec (execbit !) .hg/wcache/checklink (symlink !) @@ -144,7 +143,6 @@ .hg/store/requires .hg/store/undo .hg/store/undo.backupfiles - .hg/store/undo.phaseroots .hg/undo.bookmarks .hg/undo.branch .hg/undo.desc diff -r 6794f927bc48 -r ab806355fccb tests/test-hardlinks.t --- a/tests/test-hardlinks.t Thu Feb 23 04:28:24 2023 +0100 +++ b/tests/test-hardlinks.t Wed Feb 22 18:58:02 2023 +0100 @@ -54,7 +54,6 @@ 1 r1/.hg/store/undo 1 r1/.hg/store/undo.backup.fncache (repofncache !) 1 r1/.hg/store/undo.backupfiles - 1 r1/.hg/store/undo.phaseroots Create hardlinked clone r2: @@ -96,7 +95,6 @@ 1 r1/.hg/store/undo 1 r1/.hg/store/undo.backup.fncache (repofncache !) 1 r1/.hg/store/undo.backupfiles - 1 r1/.hg/store/undo.phaseroots $ nlinksdir r2/.hg/store 2 r2/.hg/store/00changelog.i @@ -118,7 +116,6 @@ 1 r3/.hg/store/requires 1 r3/.hg/store/undo 1 r3/.hg/store/undo.backupfiles - 1 r3/.hg/store/undo.phaseroots Create a non-inlined filelog in r3: @@ -147,7 +144,6 @@ 1 r3/.hg/store/undo.backup.fncache (repofncache !) 1 r3/.hg/store/undo.backup.phaseroots 1 r3/.hg/store/undo.backupfiles - 1 r3/.hg/store/undo.phaseroots Push to repo r1 should break up most hardlinks in r2: @@ -260,7 +256,6 @@ 2 r4/.hg/store/undo.backup.fncache (repofncache !) 2 r4/.hg/store/undo.backup.phaseroots 2 r4/.hg/store/undo.backupfiles - 2 r4/.hg/store/undo.phaseroots 2 r4/\.hg/undo\.backup\.dirstate (re) 2 r4/.hg/undo.bookmarks 2 r4/.hg/undo.branch @@ -317,7 +312,6 @@ 2 r4/.hg/store/undo.backup.fncache (repofncache !) 2 r4/.hg/store/undo.backup.phaseroots 2 r4/.hg/store/undo.backupfiles - 2 r4/.hg/store/undo.phaseroots 2 r4/\.hg/undo\.backup\.dirstate (re) 2 r4/.hg/undo.bookmarks 2 r4/.hg/undo.branch diff -r 6794f927bc48 -r ab806355fccb tests/test-hook.t --- a/tests/test-hook.t Thu Feb 23 04:28:24 2023 +0100 +++ b/tests/test-hook.t Wed Feb 22 18:58:02 2023 +0100 @@ -462,13 +462,11 @@ 00manifest.i data fncache (repofncache !) - journal.phaseroots phaseroots requires undo undo.backup.fncache (repofncache !) undo.backupfiles - undo.phaseroots precommit hook can prevent commit diff -r 6794f927bc48 -r ab806355fccb tests/test-inherit-mode.t --- a/tests/test-inherit-mode.t Thu Feb 23 04:28:24 2023 +0100 +++ b/tests/test-inherit-mode.t Wed Feb 22 18:58:02 2023 +0100 @@ -94,7 +94,6 @@ 00600 ./.hg/store/requires 00660 ./.hg/store/undo 00660 ./.hg/store/undo.backupfiles - 00660 ./.hg/store/undo.phaseroots 00660 ./.hg/undo.bookmarks 00660 ./.hg/undo.branch 00660 ./.hg/undo.desc @@ -153,7 +152,6 @@ 00660 ../push/.hg/store/requires 00660 ../push/.hg/store/undo 00660 ../push/.hg/store/undo.backupfiles - 00660 ../push/.hg/store/undo.phaseroots 00660 ../push/.hg/undo.bookmarks 00660 ../push/.hg/undo.branch 00660 ../push/.hg/undo.desc diff -r 6794f927bc48 -r ab806355fccb tests/test-narrow-clone-stream.t --- a/tests/test-narrow-clone-stream.t Thu Feb 23 04:28:24 2023 +0100 +++ b/tests/test-narrow-clone-stream.t Wed Feb 22 18:58:02 2023 +0100 @@ -90,7 +90,6 @@ requires undo undo.backupfiles - undo.phaseroots Checking that repository has all the required data and not broken diff -r 6794f927bc48 -r ab806355fccb tests/test-upgrade-repo.t --- a/tests/test-upgrade-repo.t Thu Feb 23 04:28:24 2023 +0100 +++ b/tests/test-upgrade-repo.t Wed Feb 22 18:58:02 2023 +0100 @@ -844,7 +844,6 @@ requires undo undo.backupfiles - undo.phaseroots manifest should be generaldelta @@ -869,7 +868,6 @@ undo undo.backup.fncache undo.backupfiles - undo.phaseroots unless --no-backup is passed