##// END OF EJS Templates
dirstate: avoid transaction backup/restore if we do not hold the lock...
marmoute -
r50953:d1215f90 default
parent child Browse files
Show More
@@ -2533,7 +2533,8 b' class localrepository:'
2533 # out) in this transaction
2533 # out) in this transaction
2534 narrowspec.restorebackup(self, b'journal.narrowspec')
2534 narrowspec.restorebackup(self, b'journal.narrowspec')
2535 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2535 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2536 repo.dirstate.restorebackup(None, b'journal.dirstate')
2536 if repo.currentwlock() is not None:
2537 repo.dirstate.restorebackup(None, b'journal.dirstate')
2537
2538
2538 repo.invalidate(clearfilecache=True)
2539 repo.invalidate(clearfilecache=True)
2539
2540
@@ -2657,7 +2658,8 b' class localrepository:'
2657
2658
2658 @unfilteredmethod
2659 @unfilteredmethod
2659 def _writejournal(self, desc):
2660 def _writejournal(self, desc):
2660 self.dirstate.savebackup(None, b'journal.dirstate')
2661 if self.currentwlock() is not None:
2662 self.dirstate.savebackup(None, b'journal.dirstate')
2661 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2663 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2662 narrowspec.savebackup(self, b'journal.narrowspec')
2664 narrowspec.savebackup(self, b'journal.narrowspec')
2663 self.vfs.write(
2665 self.vfs.write(
General Comments 0
You need to be logged in to leave comments. Login now