Mercurial > hg
comparison mercurial/localrepo.py @ 49473:f59e49f6bee4
branching: merge stable into default
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Thu, 01 Sep 2022 16:51:26 +0200 |
| parents | 74fb1842f8b9 0705afae6253 |
| children | 4367c46a89ee |
comparison
equal
deleted
inserted
replaced
| 49463:5acbc550d987 | 49473:f59e49f6bee4 |
|---|---|
| 2617 self._transref = weakref.ref(tr) | 2617 self._transref = weakref.ref(tr) |
| 2618 scmutil.registersummarycallback(self, tr, desc) | 2618 scmutil.registersummarycallback(self, tr, desc) |
| 2619 return tr | 2619 return tr |
| 2620 | 2620 |
| 2621 def _journalfiles(self): | 2621 def _journalfiles(self): |
| 2622 return ( | 2622 first = ( |
| 2623 (self.svfs, b'journal'), | 2623 (self.svfs, b'journal'), |
| 2624 (self.svfs, b'journal.narrowspec'), | 2624 (self.svfs, b'journal.narrowspec'), |
| 2625 (self.vfs, b'journal.narrowspec.dirstate'), | 2625 (self.vfs, b'journal.narrowspec.dirstate'), |
| 2626 (self.vfs, b'journal.dirstate'), | 2626 (self.vfs, b'journal.dirstate'), |
| 2627 ) | |
| 2628 middle = [] | |
| 2629 dirstate_data = self.dirstate.data_backup_filename(b'journal.dirstate') | |
| 2630 if dirstate_data is not None: | |
| 2631 middle.append((self.vfs, dirstate_data)) | |
| 2632 end = ( | |
| 2627 (self.vfs, b'journal.branch'), | 2633 (self.vfs, b'journal.branch'), |
| 2628 (self.vfs, b'journal.desc'), | 2634 (self.vfs, b'journal.desc'), |
| 2629 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), | 2635 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), |
| 2630 (self.svfs, b'journal.phaseroots'), | 2636 (self.svfs, b'journal.phaseroots'), |
| 2631 ) | 2637 ) |
| 2638 return first + tuple(middle) + end | |
| 2632 | 2639 |
| 2633 def undofiles(self): | 2640 def undofiles(self): |
| 2634 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | 2641 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
| 2635 | 2642 |
| 2636 @unfilteredmethod | 2643 @unfilteredmethod |