##// END OF EJS Templates
clfilter: phases logic should be unfiltered...
Pierre-Yves David -
r18002:9bc5873e default
parent child Browse files
Show More
@@ -139,6 +139,7 b' def _readroots(repo, phasedefaults=None)'
139 Return (roots, dirty) where dirty is true if roots differ from
139 Return (roots, dirty) where dirty is true if roots differ from
140 what is being stored.
140 what is being stored.
141 """
141 """
142 repo = repo.unfiltered()
142 dirty = False
143 dirty = False
143 roots = [set() for i in allphases]
144 roots = [set() for i in allphases]
144 try:
145 try:
@@ -184,6 +185,7 b' class phasecache(object):'
184
185
185 def getphaserevs(self, repo, rebuild=False):
186 def getphaserevs(self, repo, rebuild=False):
186 if rebuild or self._phaserevs is None:
187 if rebuild or self._phaserevs is None:
188 repo = repo.unfiltered()
187 revs = [public] * len(repo.changelog)
189 revs = [public] * len(repo.changelog)
188 for phase in trackedphases:
190 for phase in trackedphases:
189 roots = map(repo.changelog.rev, self.phaseroots[phase])
191 roots = map(repo.changelog.rev, self.phaseroots[phase])
@@ -228,6 +230,7 b' class phasecache(object):'
228 # Be careful to preserve shallow-copied values: do not update
230 # Be careful to preserve shallow-copied values: do not update
229 # phaseroots values, replace them.
231 # phaseroots values, replace them.
230
232
233 repo = repo.unfiltered()
231 delroots = [] # set of root deleted by this path
234 delroots = [] # set of root deleted by this path
232 for phase in xrange(targetphase + 1, len(allphases)):
235 for phase in xrange(targetphase + 1, len(allphases)):
233 # filter nodes that are not in a compatible phase already
236 # filter nodes that are not in a compatible phase already
@@ -251,6 +254,7 b' class phasecache(object):'
251 # Be careful to preserve shallow-copied values: do not update
254 # Be careful to preserve shallow-copied values: do not update
252 # phaseroots values, replace them.
255 # phaseroots values, replace them.
253
256
257 repo = repo.unfiltered()
254 currentroots = self.phaseroots[targetphase]
258 currentroots = self.phaseroots[targetphase]
255 newroots = [n for n in nodes
259 newroots = [n for n in nodes
256 if self.phase(repo, repo[n].rev()) < targetphase]
260 if self.phase(repo, repo[n].rev()) < targetphase]
@@ -316,6 +320,7 b' def listphases(repo):'
316
320
317 def pushphase(repo, nhex, oldphasestr, newphasestr):
321 def pushphase(repo, nhex, oldphasestr, newphasestr):
318 """List phases root for serialization over pushkey"""
322 """List phases root for serialization over pushkey"""
323 repo = repo.unfiltered()
319 lock = repo.lock()
324 lock = repo.lock()
320 try:
325 try:
321 currentphase = repo[nhex].phase()
326 currentphase = repo[nhex].phase()
@@ -340,6 +345,7 b' def analyzeremotephases(repo, subset, ro'
340
345
341 Accept unknown element input
346 Accept unknown element input
342 """
347 """
348 repo = repo.unfiltered()
343 # build list from dictionary
349 # build list from dictionary
344 draftroots = []
350 draftroots = []
345 nodemap = repo.changelog.nodemap # to filter unknown nodes
351 nodemap = repo.changelog.nodemap # to filter unknown nodes
@@ -367,6 +373,7 b' def newheads(repo, heads, roots):'
367
373
368 * `heads`: define the first subset
374 * `heads`: define the first subset
369 * `roots`: define the second we subtract from the first"""
375 * `roots`: define the second we subtract from the first"""
376 repo = repo.unfiltered()
370 revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
377 revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
371 heads, roots, roots, heads)
378 heads, roots, roots, heads)
372 return [c.node() for c in revset]
379 return [c.node() for c in revset]
General Comments 0
You need to be logged in to leave comments. Login now