##// END OF EJS Templates
phases: update the phase set as we go during retract boundary...
marmoute -
r52410:4ee50d98 stable
parent child Browse files
Show More
@@ -869,6 +869,8 b' class phasecache:'
869 start = min(new_revs)
869 start = min(new_revs)
870 end = len(cl)
870 end = len(cl)
871 rev_phases = [None] * (end - start)
871 rev_phases = [None] * (end - start)
872
873 this_phase_set = self._phasesets[targetphase]
872 for r in range(start, end):
874 for r in range(start, end):
873
875
874 # gather information about the current_rev
876 # gather information about the current_rev
@@ -893,6 +895,7 b' class phasecache:'
893 new_roots.add(r)
895 new_roots.add(r)
894 rev_phases[r - start] = targetphase
896 rev_phases[r - start] = targetphase
895 changed_revs[r] = r_phase
897 changed_revs[r] = r_phase
898 this_phase_set.add(r)
896 elif p_phase is None:
899 elif p_phase is None:
897 rev_phases[r - start] = r_phase
900 rev_phases[r - start] = r_phase
898 else:
901 else:
@@ -903,10 +906,10 b' class phasecache:'
903 if p_phase == targetphase:
906 if p_phase == targetphase:
904 if p_phase > r_phase:
907 if p_phase > r_phase:
905 changed_revs[r] = r_phase
908 changed_revs[r] = r_phase
909 this_phase_set.add(r)
906 elif r in currentroots:
910 elif r in currentroots:
907 replaced_roots.add(r)
911 replaced_roots.add(r)
908 sets = self._phasesets
912 sets = self._phasesets
909 sets[targetphase].update(changed_revs)
910 if targetphase > draft:
913 if targetphase > draft:
911 for r, old in changed_revs.items():
914 for r, old in changed_revs.items():
912 if old > public:
915 if old > public:
General Comments 0
You need to be logged in to leave comments. Login now