Show More
@@ -325,10 +325,10 b' class revlog:' | |||||
325 | earliest = self.count() |
|
325 | earliest = self.count() | |
326 | while h: |
|
326 | while h: | |
327 | d, n = heapq.heappop(h) |
|
327 | d, n = heapq.heappop(h) | |
328 | r = self.rev(n) |
|
|||
329 | if n not in seen: |
|
328 | if n not in seen: | |
330 | seen[n] = 1 |
|
329 | seen[n] = 1 | |
331 |
|
|
330 | r = self.rev(n) | |
|
331 | yield (-d, r, n) | |||
332 | for p in self.parents(n): |
|
332 | for p in self.parents(n): | |
333 | heapq.heappush(h, (-dist[p], p)) |
|
333 | heapq.heappush(h, (-dist[p], p)) | |
334 |
|
334 | |||
@@ -341,7 +341,7 b' class revlog:' | |||||
341 | # the other, or they match |
|
341 | # the other, or they match | |
342 | while 1: |
|
342 | while 1: | |
343 | if lx == ly: |
|
343 | if lx == ly: | |
344 |
return lx[ |
|
344 | return lx[2] | |
345 | elif lx < ly: |
|
345 | elif lx < ly: | |
346 | ly = y.next() |
|
346 | ly = y.next() | |
347 | elif lx > ly: |
|
347 | elif lx > ly: |
General Comments 0
You need to be logged in to leave comments.
Login now