comparison mercurial/graphmod.py @ 24803:e89f909edffa stable 3.4-rc

merge default into stable for 3.4 freeze
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 20:57:51 -0500
parents d8e0c591781c
children 69751804f2f5
comparison
equal deleted inserted replaced
24753:612ed41ae359 24803:e89f909edffa
120 # Heap works with smallest element, we want highest so we invert 120 # Heap works with smallest element, we want highest so we invert
121 if currentrev not in pendingset: 121 if currentrev not in pendingset:
122 heappush(pendingheap, -currentrev) 122 heappush(pendingheap, -currentrev)
123 pendingset.add(currentrev) 123 pendingset.add(currentrev)
124 # iterates on pending rev until after the current rev have been 124 # iterates on pending rev until after the current rev have been
125 # processeed. 125 # processed.
126 rev = None 126 rev = None
127 while rev != currentrev: 127 while rev != currentrev:
128 rev = -heappop(pendingheap) 128 rev = -heappop(pendingheap)
129 pendingset.remove(rev) 129 pendingset.remove(rev)
130 130