##// END OF EJS Templates
branchmap: remove the droppednodes logic...
Pierre-Yves David -
r19838:23386881 default
parent child Browse files
Show More
@@ -203,15 +203,13 b' class branchcache(dict):'
203 # branch that ceased to exist may not be in newbranches because
203 # branch that ceased to exist may not be in newbranches because
204 # newbranches is the set of candidate heads, which when you strip the
204 # newbranches is the set of candidate heads, which when you strip the
205 # last commit in a branch will be the parent branch.
205 # last commit in a branch will be the parent branch.
206 droppednodes = []
207 for branch in self.keys():
206 for branch in self.keys():
208 nodes = [head for head in self[branch]
207 nodes = [head for head in self[branch]
209 if cl.hasnode(head)]
208 if cl.hasnode(head)]
210 if not nodes:
209 if not nodes:
211 droppednodes.extend(nodes)
212 del self[branch]
210 del self[branch]
213
211
214 if ((not self.validfor(repo)) or (self.tipnode in droppednodes)):
212 if not self.validfor(repo):
215 # cache key are not valid anymore
213 # cache key are not valid anymore
216 self.tipnode = nullid
214 self.tipnode = nullid
217 self.tiprev = nullrev
215 self.tiprev = nullrev
General Comments 0
You need to be logged in to leave comments. Login now