equal
deleted
inserted
replaced
2531 else: |
2531 else: |
2532 # discard all changes (including ones already written |
2532 # discard all changes (including ones already written |
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 |
2540 tr = transaction.transaction( |
2541 tr = transaction.transaction( |
2541 rp, |
2542 rp, |
2655 def undofiles(self): |
2656 def undofiles(self): |
2656 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
2657 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
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( |
2664 b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
2666 b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
2665 ) |
2667 ) |