##// END OF EJS Templates
transaction: no longer explicitly cache phaseroots...
marmoute -
r51088:ab806355 default
parent child Browse files
Show More
@@ -2688,7 +2688,6 b' class localrepository:'
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'),
2691 (self.svfs, b'journal.phaseroots'),
2692 )
2691 )
2693
2692
2694 def undofiles(self):
2693 def undofiles(self):
@@ -2704,7 +2703,6 b' class localrepository:'
2704 bookmarksvfs.write(
2703 bookmarksvfs.write(
2705 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2704 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2706 )
2705 )
2707 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2708
2706
2709 def recover(self):
2707 def recover(self):
2710 with self.lock():
2708 with self.lock():
@@ -2798,8 +2796,6 b' class localrepository:'
2798 bookmarksvfs.rename(
2796 bookmarksvfs.rename(
2799 b'undo.bookmarks', b'bookmarks', checkambig=True
2797 b'undo.bookmarks', b'bookmarks', checkambig=True
2800 )
2798 )
2801 if self.svfs.exists(b'undo.phaseroots'):
2802 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2803 self.invalidate()
2799 self.invalidate()
2804 self.dirstate.invalidate()
2800 self.dirstate.invalidate()
2805
2801
@@ -107,7 +107,6 b' Non store repo:'
107 .hg/undo.bookmarks
107 .hg/undo.bookmarks
108 .hg/undo.branch
108 .hg/undo.branch
109 .hg/undo.desc
109 .hg/undo.desc
110 .hg/undo.phaseroots
111 .hg/wcache
110 .hg/wcache
112 .hg/wcache/checkisexec (execbit !)
111 .hg/wcache/checkisexec (execbit !)
113 .hg/wcache/checklink (symlink !)
112 .hg/wcache/checklink (symlink !)
@@ -144,7 +143,6 b' Non fncache repo:'
144 .hg/store/requires
143 .hg/store/requires
145 .hg/store/undo
144 .hg/store/undo
146 .hg/store/undo.backupfiles
145 .hg/store/undo.backupfiles
147 .hg/store/undo.phaseroots
148 .hg/undo.bookmarks
146 .hg/undo.bookmarks
149 .hg/undo.branch
147 .hg/undo.branch
150 .hg/undo.desc
148 .hg/undo.desc
@@ -54,7 +54,6 b' Prepare repo r1:'
54 1 r1/.hg/store/undo
54 1 r1/.hg/store/undo
55 1 r1/.hg/store/undo.backup.fncache (repofncache !)
55 1 r1/.hg/store/undo.backup.fncache (repofncache !)
56 1 r1/.hg/store/undo.backupfiles
56 1 r1/.hg/store/undo.backupfiles
57 1 r1/.hg/store/undo.phaseroots
58
57
59
58
60 Create hardlinked clone r2:
59 Create hardlinked clone r2:
@@ -96,7 +95,6 b' Repos r1 and r2 should now contain hardl'
96 1 r1/.hg/store/undo
95 1 r1/.hg/store/undo
97 1 r1/.hg/store/undo.backup.fncache (repofncache !)
96 1 r1/.hg/store/undo.backup.fncache (repofncache !)
98 1 r1/.hg/store/undo.backupfiles
97 1 r1/.hg/store/undo.backupfiles
99 1 r1/.hg/store/undo.phaseroots
100
98
101 $ nlinksdir r2/.hg/store
99 $ nlinksdir r2/.hg/store
102 2 r2/.hg/store/00changelog.i
100 2 r2/.hg/store/00changelog.i
@@ -118,7 +116,6 b' Repo r3 should not be hardlinked:'
118 1 r3/.hg/store/requires
116 1 r3/.hg/store/requires
119 1 r3/.hg/store/undo
117 1 r3/.hg/store/undo
120 1 r3/.hg/store/undo.backupfiles
118 1 r3/.hg/store/undo.backupfiles
121 1 r3/.hg/store/undo.phaseroots
122
119
123
120
124 Create a non-inlined filelog in r3:
121 Create a non-inlined filelog in r3:
@@ -147,7 +144,6 b' Create a non-inlined filelog in r3:'
147 1 r3/.hg/store/undo.backup.fncache (repofncache !)
144 1 r3/.hg/store/undo.backup.fncache (repofncache !)
148 1 r3/.hg/store/undo.backup.phaseroots
145 1 r3/.hg/store/undo.backup.phaseroots
149 1 r3/.hg/store/undo.backupfiles
146 1 r3/.hg/store/undo.backupfiles
150 1 r3/.hg/store/undo.phaseroots
151
147
152 Push to repo r1 should break up most hardlinks in r2:
148 Push to repo r1 should break up most hardlinks in r2:
153
149
@@ -260,7 +256,6 b' r4 has hardlinks in the working dir (not'
260 2 r4/.hg/store/undo.backup.fncache (repofncache !)
256 2 r4/.hg/store/undo.backup.fncache (repofncache !)
261 2 r4/.hg/store/undo.backup.phaseroots
257 2 r4/.hg/store/undo.backup.phaseroots
262 2 r4/.hg/store/undo.backupfiles
258 2 r4/.hg/store/undo.backupfiles
263 2 r4/.hg/store/undo.phaseroots
264 2 r4/\.hg/undo\.backup\.dirstate (re)
259 2 r4/\.hg/undo\.backup\.dirstate (re)
265 2 r4/.hg/undo.bookmarks
260 2 r4/.hg/undo.bookmarks
266 2 r4/.hg/undo.branch
261 2 r4/.hg/undo.branch
@@ -317,7 +312,6 b' Update back to revision 12 in r4 should '
317 2 r4/.hg/store/undo.backup.fncache (repofncache !)
312 2 r4/.hg/store/undo.backup.fncache (repofncache !)
318 2 r4/.hg/store/undo.backup.phaseroots
313 2 r4/.hg/store/undo.backup.phaseroots
319 2 r4/.hg/store/undo.backupfiles
314 2 r4/.hg/store/undo.backupfiles
320 2 r4/.hg/store/undo.phaseroots
321 2 r4/\.hg/undo\.backup\.dirstate (re)
315 2 r4/\.hg/undo\.backup\.dirstate (re)
322 2 r4/.hg/undo.bookmarks
316 2 r4/.hg/undo.bookmarks
323 2 r4/.hg/undo.branch
317 2 r4/.hg/undo.branch
@@ -462,13 +462,11 b' more there after'
462 00manifest.i
462 00manifest.i
463 data
463 data
464 fncache (repofncache !)
464 fncache (repofncache !)
465 journal.phaseroots
466 phaseroots
465 phaseroots
467 requires
466 requires
468 undo
467 undo
469 undo.backup.fncache (repofncache !)
468 undo.backup.fncache (repofncache !)
470 undo.backupfiles
469 undo.backupfiles
471 undo.phaseroots
472
470
473
471
474 precommit hook can prevent commit
472 precommit hook can prevent commit
@@ -94,7 +94,6 b' new directories are setgid'
94 00600 ./.hg/store/requires
94 00600 ./.hg/store/requires
95 00660 ./.hg/store/undo
95 00660 ./.hg/store/undo
96 00660 ./.hg/store/undo.backupfiles
96 00660 ./.hg/store/undo.backupfiles
97 00660 ./.hg/store/undo.phaseroots
98 00660 ./.hg/undo.bookmarks
97 00660 ./.hg/undo.bookmarks
99 00660 ./.hg/undo.branch
98 00660 ./.hg/undo.branch
100 00660 ./.hg/undo.desc
99 00660 ./.hg/undo.desc
@@ -153,7 +152,6 b' group can still write everything'
153 00660 ../push/.hg/store/requires
152 00660 ../push/.hg/store/requires
154 00660 ../push/.hg/store/undo
153 00660 ../push/.hg/store/undo
155 00660 ../push/.hg/store/undo.backupfiles
154 00660 ../push/.hg/store/undo.backupfiles
156 00660 ../push/.hg/store/undo.phaseroots
157 00660 ../push/.hg/undo.bookmarks
155 00660 ../push/.hg/undo.bookmarks
158 00660 ../push/.hg/undo.branch
156 00660 ../push/.hg/undo.branch
159 00660 ../push/.hg/undo.desc
157 00660 ../push/.hg/undo.desc
@@ -90,7 +90,6 b' Making sure store has the required files'
90 requires
90 requires
91 undo
91 undo
92 undo.backupfiles
92 undo.backupfiles
93 undo.phaseroots
94
93
95 Checking that repository has all the required data and not broken
94 Checking that repository has all the required data and not broken
96
95
@@ -844,7 +844,6 b' store directory has files we expect'
844 requires
844 requires
845 undo
845 undo
846 undo.backupfiles
846 undo.backupfiles
847 undo.phaseroots
848
847
849 manifest should be generaldelta
848 manifest should be generaldelta
850
849
@@ -869,7 +868,6 b' old store should be backed up'
869 undo
868 undo
870 undo.backup.fncache
869 undo.backup.fncache
871 undo.backupfiles
870 undo.backupfiles
872 undo.phaseroots
873
871
874 unless --no-backup is passed
872 unless --no-backup is passed
875
873
General Comments 0
You need to be logged in to leave comments. Login now