##// END OF EJS Templates
undo-files: factor the vfs map in a repository property...
marmoute -
r51189:f3488731 stable
parent child Browse files
Show More
@@ -1524,6 +1524,10 b' class ilocalrepositorymain(interfaceutil'
1524 1524 """Name of the repoview that is active on this repo."""
1525 1525 )
1526 1526
1527 vfs_map = interfaceutil.Attribute(
1528 """a bytes-key β†’ vfs mapping used by transaction and others"""
1529 )
1530
1527 1531 wvfs = interfaceutil.Attribute(
1528 1532 """VFS used to access the working directory."""
1529 1533 )
@@ -1565,6 +1565,14 b' class localrepository:'
1565 1565
1566 1566 return checksvfs
1567 1567
1568 @property
1569 def vfs_map(self):
1570 return {
1571 b'': self.svfs,
1572 b'plain': self.vfs,
1573 b'store': self.svfs,
1574 }
1575
1568 1576 def close(self):
1569 1577 self._writecaches()
1570 1578
@@ -2415,7 +2423,7 b' class localrepository:'
2415 2423 rp = report
2416 2424 else:
2417 2425 rp = self.ui.warn
2418 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2426 vfsmap = self.vfs_map
2419 2427 # we must avoid cyclic reference between repo and transaction.
2420 2428 reporef = weakref.ref(self)
2421 2429 # Code to track tag movement
@@ -2704,10 +2712,7 b' class localrepository:'
2704 2712 with self.lock():
2705 2713 if self.svfs.exists(b"journal"):
2706 2714 self.ui.status(_(b"rolling back interrupted transaction\n"))
2707 vfsmap = {
2708 b'': self.svfs,
2709 b'plain': self.vfs,
2710 }
2715 vfsmap = self.vfs_map
2711 2716 transaction.rollback(
2712 2717 self.svfs,
2713 2718 vfsmap,
@@ -2775,7 +2780,7 b' class localrepository:'
2775 2780 return 0
2776 2781
2777 2782 self.destroying()
2778 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2783 vfsmap = self.vfs_map
2779 2784 skip_journal_pattern = None
2780 2785 if not parentgone:
2781 2786 skip_journal_pattern = RE_SKIP_DIRSTATE_ROLLBACK
General Comments 0
You need to be logged in to leave comments. Login now