Show More
@@ -270,7 +270,7 b' class bundlephasecache(phases.phasecache' | |||
|
270 | 270 | raise NotImplementedError |
|
271 | 271 | |
|
272 | 272 | def _updateroots(self, phase, newroots, tr): |
|
273 | self.phaseroots[phase] = newroots | |
|
273 | self._phaseroots[phase] = newroots | |
|
274 | 274 | self.invalidate() |
|
275 | 275 | self.dirty = True |
|
276 | 276 |
@@ -363,7 +363,7 b' class phasecache:' | |||
|
363 | 363 | ): |
|
364 | 364 | if _load: |
|
365 | 365 | # Cheap trick to allow shallow-copy without copy module |
|
366 | self.phaseroots, self.dirty = _readroots(repo, phasedefaults) | |
|
366 | self._phaseroots, self.dirty = _readroots(repo, phasedefaults) | |
|
367 | 367 | self._loadedrevslen = 0 |
|
368 | 368 | self._phasesets = None |
|
369 | 369 | self.filterunknown(repo) |
@@ -377,7 +377,7 b' class phasecache:' | |||
|
377 | 377 | self.invalidate() |
|
378 | 378 | self.loadphaserevs(repo) |
|
379 | 379 | return any( |
|
380 | revs for phase, revs in self.phaseroots.items() if phase != public | |
|
380 | revs for phase, revs in self._phaseroots.items() if phase != public | |
|
381 | 381 | ) |
|
382 | 382 | |
|
383 | 383 | def nonpublicphaseroots( |
@@ -396,7 +396,7 b' class phasecache:' | |||
|
396 | 396 | return set().union( |
|
397 | 397 | *[ |
|
398 | 398 | revs |
|
399 | for phase, revs in self.phaseroots.items() | |
|
399 | for phase, revs in self._phaseroots.items() | |
|
400 | 400 | if phase != public |
|
401 | 401 | ] |
|
402 | 402 | ) |
@@ -464,7 +464,7 b' class phasecache:' | |||
|
464 | 464 | # Shallow copy meant to ensure isolation in |
|
465 | 465 | # advance/retractboundary(), nothing more. |
|
466 | 466 | ph = self.__class__(None, None, _load=False) |
|
467 | ph.phaseroots = self.phaseroots.copy() | |
|
467 | ph._phaseroots = self._phaseroots.copy() | |
|
468 | 468 | ph.dirty = self.dirty |
|
469 | 469 | ph.opener = self.opener |
|
470 | 470 | ph._loadedrevslen = self._loadedrevslen |
@@ -474,7 +474,7 b' class phasecache:' | |||
|
474 | 474 | def replace(self, phcache): |
|
475 | 475 | """replace all values in 'self' with content of phcache""" |
|
476 | 476 | for a in ( |
|
477 | 'phaseroots', | |
|
477 | '_phaseroots', | |
|
478 | 478 | 'dirty', |
|
479 | 479 | 'opener', |
|
480 | 480 | '_loadedrevslen', |
@@ -484,7 +484,7 b' class phasecache:' | |||
|
484 | 484 | |
|
485 | 485 | def _getphaserevsnative(self, repo): |
|
486 | 486 | repo = repo.unfiltered() |
|
487 | return repo.changelog.computephases(self.phaseroots) | |
|
487 | return repo.changelog.computephases(self._phaseroots) | |
|
488 | 488 | |
|
489 | 489 | def _computephaserevspure(self, repo): |
|
490 | 490 | repo = repo.unfiltered() |
@@ -492,7 +492,7 b' class phasecache:' | |||
|
492 | 492 | self._phasesets = {phase: set() for phase in allphases} |
|
493 | 493 | lowerroots = set() |
|
494 | 494 | for phase in reversed(trackedphases): |
|
495 | roots = pycompat.maplist(cl.rev, self.phaseroots[phase]) | |
|
495 | roots = pycompat.maplist(cl.rev, self._phaseroots[phase]) | |
|
496 | 496 | if roots: |
|
497 | 497 | ps = set(cl.descendants(roots)) |
|
498 | 498 | for root in roots: |
@@ -543,13 +543,13 b' class phasecache:' | |||
|
543 | 543 | f.close() |
|
544 | 544 | |
|
545 | 545 | def _write(self, fp): |
|
546 | for phase, roots in self.phaseroots.items(): | |
|
546 | for phase, roots in self._phaseroots.items(): | |
|
547 | 547 | for h in sorted(roots): |
|
548 | 548 | fp.write(b'%i %s\n' % (phase, hex(h))) |
|
549 | 549 | self.dirty = False |
|
550 | 550 | |
|
551 | 551 | def _updateroots(self, phase, newroots, tr): |
|
552 | self.phaseroots[phase] = newroots | |
|
552 | self._phaseroots[phase] = newroots | |
|
553 | 553 | self.invalidate() |
|
554 | 554 | self.dirty = True |
|
555 | 555 | |
@@ -598,7 +598,7 b' class phasecache:' | |||
|
598 | 598 | if not revs: |
|
599 | 599 | break # no roots to move anymore |
|
600 | 600 | |
|
601 | olds = self.phaseroots[phase] | |
|
601 | olds = self._phaseroots[phase] | |
|
602 | 602 | |
|
603 | 603 | affected = repo.revs(b'%ln::%ld', olds, revs) |
|
604 | 604 | changes.update(affected) |
@@ -627,7 +627,7 b' class phasecache:' | |||
|
627 | 627 | def retractboundary(self, repo, tr, targetphase, nodes): |
|
628 | 628 | oldroots = { |
|
629 | 629 | phase: revs |
|
630 | for phase, revs in self.phaseroots.items() | |
|
630 | for phase, revs in self._phaseroots.items() | |
|
631 | 631 | if phase <= targetphase |
|
632 | 632 | } |
|
633 | 633 | if tr is None: |
@@ -641,7 +641,7 b' class phasecache:' | |||
|
641 | 641 | ): |
|
642 | 642 | |
|
643 | 643 | # find the affected revisions |
|
644 | new = self.phaseroots[targetphase] | |
|
644 | new = self._phaseroots[targetphase] | |
|
645 | 645 | old = oldroots[targetphase] |
|
646 | 646 | affected = set(repo.revs(b'(%ln::) - (%ln::)', new, old)) |
|
647 | 647 | |
@@ -675,7 +675,7 b' class phasecache:' | |||
|
675 | 675 | repo = repo.unfiltered() |
|
676 | 676 | torev = repo.changelog.rev |
|
677 | 677 | tonode = repo.changelog.node |
|
678 | currentroots = {torev(node) for node in self.phaseroots[targetphase]} | |
|
678 | currentroots = {torev(node) for node in self._phaseroots[targetphase]} | |
|
679 | 679 | finalroots = oldroots = set(currentroots) |
|
680 | 680 | newroots = [torev(node) for node in nodes] + [r for r in revs] |
|
681 | 681 | newroots = [ |
@@ -714,7 +714,7 b' class phasecache:' | |||
|
714 | 714 | """ |
|
715 | 715 | assert repo.filtername is None |
|
716 | 716 | to_rev = repo.changelog.index.rev |
|
717 | for targetphase, nodes in list(self.phaseroots.items()): | |
|
717 | for targetphase, nodes in list(self._phaseroots.items()): | |
|
718 | 718 | filtered = {n for n in nodes if to_rev(n) >= strip_rev} |
|
719 | 719 | if filtered: |
|
720 | 720 | self._updateroots(targetphase, nodes - filtered, tr) |
@@ -727,7 +727,7 b' class phasecache:' | |||
|
727 | 727 | """ |
|
728 | 728 | filtered = False |
|
729 | 729 | has_node = repo.changelog.index.has_node # to filter unknown nodes |
|
730 | for phase, nodes in self.phaseroots.items(): | |
|
730 | for phase, nodes in self._phaseroots.items(): | |
|
731 | 731 | missing = sorted(node for node in nodes if not has_node(node)) |
|
732 | 732 | if missing: |
|
733 | 733 | for mnode in missing: |
@@ -803,7 +803,7 b' def listphases(repo: "localrepo.localrep' | |||
|
803 | 803 | keys = util.sortdict() |
|
804 | 804 | value = b'%i' % draft |
|
805 | 805 | cl = repo.unfiltered().changelog |
|
806 | for root in repo._phasecache.phaseroots[draft]: | |
|
806 | for root in repo._phasecache._phaseroots[draft]: | |
|
807 | 807 | if repo._phasecache.phase(repo, cl.rev(root)) <= draft: |
|
808 | 808 | keys[hex(root)] = value |
|
809 | 809 | |
@@ -997,7 +997,7 b' def newcommitphase(ui: "uimod.ui") -> in' | |||
|
997 | 997 | |
|
998 | 998 | def hassecret(repo: "localrepo.localrepository") -> bool: |
|
999 | 999 | """utility function that check if a repo have any secret changeset.""" |
|
1000 | return bool(repo._phasecache.phaseroots[secret]) | |
|
1000 | return bool(repo._phasecache._phaseroots[secret]) | |
|
1001 | 1001 | |
|
1002 | 1002 | |
|
1003 | 1003 | def preparehookargs( |
General Comments 0
You need to be logged in to leave comments.
Login now